aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2011-07-13 10:54:57 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2011-07-29 11:55:13 -0400
commit7594549e8acec8123c45e26750b7820d9e938760 (patch)
treef6c374eb939831b2db5db283e36374c6f3e0c7b3
parenta747ce835e69069f9bccfb7791008127012cbf32 (diff)
pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.
Now the are optional, let us get rid of the ones that don't have any content. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
-rw-r--r--drivers/pcmcia/pxa2xx_balloon3.c10
-rw-r--r--drivers/pcmcia/pxa2xx_cm_x255.c11
-rw-r--r--drivers/pcmcia/pxa2xx_cm_x270.c11
-rw-r--r--drivers/pcmcia/pxa2xx_colibri.c11
-rw-r--r--drivers/pcmcia/pxa2xx_mainstone.c10
-rw-r--r--drivers/pcmcia/pxa2xx_palmld.c11
-rw-r--r--drivers/pcmcia/pxa2xx_palmtc.c11
-rw-r--r--drivers/pcmcia/pxa2xx_palmtx.c11
-rw-r--r--drivers/pcmcia/pxa2xx_viper.c10
9 files changed, 0 insertions, 96 deletions
diff --git a/drivers/pcmcia/pxa2xx_balloon3.c b/drivers/pcmcia/pxa2xx_balloon3.c
index 4c3e94c0ae85..f56d7de7c751 100644
--- a/drivers/pcmcia/pxa2xx_balloon3.c
+++ b/drivers/pcmcia/pxa2xx_balloon3.c
@@ -103,22 +103,12 @@ static int balloon3_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
103 return 0; 103 return 0;
104} 104}
105 105
106static void balloon3_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
107{
108}
109
110static void balloon3_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
111{
112}
113
114static struct pcmcia_low_level balloon3_pcmcia_ops = { 106static struct pcmcia_low_level balloon3_pcmcia_ops = {
115 .owner = THIS_MODULE, 107 .owner = THIS_MODULE,
116 .hw_init = balloon3_pcmcia_hw_init, 108 .hw_init = balloon3_pcmcia_hw_init,
117 .hw_shutdown = balloon3_pcmcia_hw_shutdown, 109 .hw_shutdown = balloon3_pcmcia_hw_shutdown,
118 .socket_state = balloon3_pcmcia_socket_state, 110 .socket_state = balloon3_pcmcia_socket_state,
119 .configure_socket = balloon3_pcmcia_configure_socket, 111 .configure_socket = balloon3_pcmcia_configure_socket,
120 .socket_init = balloon3_pcmcia_socket_init,
121 .socket_suspend = balloon3_pcmcia_socket_suspend,
122 .first = 0, 112 .first = 0,
123 .nr = 1, 113 .nr = 1,
124}; 114};
diff --git a/drivers/pcmcia/pxa2xx_cm_x255.c b/drivers/pcmcia/pxa2xx_cm_x255.c
index 05913d0bbdbe..63f4d5211ed2 100644
--- a/drivers/pcmcia/pxa2xx_cm_x255.c
+++ b/drivers/pcmcia/pxa2xx_cm_x255.c
@@ -102,23 +102,12 @@ static int cmx255_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
102 return 0; 102 return 0;
103} 103}
104 104
105static void cmx255_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
106{
107}
108
109static void cmx255_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
110{
111}
112
113
114static struct pcmcia_low_level cmx255_pcmcia_ops __initdata = { 105static struct pcmcia_low_level cmx255_pcmcia_ops __initdata = {
115 .owner = THIS_MODULE, 106 .owner = THIS_MODULE,
116 .hw_init = cmx255_pcmcia_hw_init, 107 .hw_init = cmx255_pcmcia_hw_init,
117 .hw_shutdown = cmx255_pcmcia_shutdown, 108 .hw_shutdown = cmx255_pcmcia_shutdown,
118 .socket_state = cmx255_pcmcia_socket_state, 109 .socket_state = cmx255_pcmcia_socket_state,
119 .configure_socket = cmx255_pcmcia_configure_socket, 110 .configure_socket = cmx255_pcmcia_configure_socket,
120 .socket_init = cmx255_pcmcia_socket_init,
121 .socket_suspend = cmx255_pcmcia_socket_suspend,
122 .nr = 1, 111 .nr = 1,
123}; 112};
124 113
diff --git a/drivers/pcmcia/pxa2xx_cm_x270.c b/drivers/pcmcia/pxa2xx_cm_x270.c
index 5662646b84da..6ee42b4c3e68 100644
--- a/drivers/pcmcia/pxa2xx_cm_x270.c
+++ b/drivers/pcmcia/pxa2xx_cm_x270.c
@@ -82,23 +82,12 @@ static int cmx270_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
82 return 0; 82 return 0;
83} 83}
84 84
85static void cmx270_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
86{
87}
88
89static void cmx270_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
90{
91}
92
93
94static struct pcmcia_low_level cmx270_pcmcia_ops __initdata = { 85static struct pcmcia_low_level cmx270_pcmcia_ops __initdata = {
95 .owner = THIS_MODULE, 86 .owner = THIS_MODULE,
96 .hw_init = cmx270_pcmcia_hw_init, 87 .hw_init = cmx270_pcmcia_hw_init,
97 .hw_shutdown = cmx270_pcmcia_shutdown, 88 .hw_shutdown = cmx270_pcmcia_shutdown,
98 .socket_state = cmx270_pcmcia_socket_state, 89 .socket_state = cmx270_pcmcia_socket_state,
99 .configure_socket = cmx270_pcmcia_configure_socket, 90 .configure_socket = cmx270_pcmcia_configure_socket,
100 .socket_init = cmx270_pcmcia_socket_init,
101 .socket_suspend = cmx270_pcmcia_socket_suspend,
102 .nr = 1, 91 .nr = 1,
103}; 92};
104 93
diff --git a/drivers/pcmcia/pxa2xx_colibri.c b/drivers/pcmcia/pxa2xx_colibri.c
index 443cb7fc872d..c6dec572a05d 100644
--- a/drivers/pcmcia/pxa2xx_colibri.c
+++ b/drivers/pcmcia/pxa2xx_colibri.c
@@ -116,14 +116,6 @@ colibri_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
116 return 0; 116 return 0;
117} 117}
118 118
119static void colibri_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
120{
121}
122
123static void colibri_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
124{
125}
126
127static struct pcmcia_low_level colibri_pcmcia_ops = { 119static struct pcmcia_low_level colibri_pcmcia_ops = {
128 .owner = THIS_MODULE, 120 .owner = THIS_MODULE,
129 121
@@ -135,9 +127,6 @@ static struct pcmcia_low_level colibri_pcmcia_ops = {
135 127
136 .socket_state = colibri_pcmcia_socket_state, 128 .socket_state = colibri_pcmcia_socket_state,
137 .configure_socket = colibri_pcmcia_configure_socket, 129 .configure_socket = colibri_pcmcia_configure_socket,
138
139 .socket_init = colibri_pcmcia_socket_init,
140 .socket_suspend = colibri_pcmcia_socket_suspend,
141}; 130};
142 131
143static struct platform_device *colibri_pcmcia_device; 132static struct platform_device *colibri_pcmcia_device;
diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c
index 92016fe932b4..aded706c0b9f 100644
--- a/drivers/pcmcia/pxa2xx_mainstone.c
+++ b/drivers/pcmcia/pxa2xx_mainstone.c
@@ -128,22 +128,12 @@ static int mst_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
128 return ret; 128 return ret;
129} 129}
130 130
131static void mst_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
132{
133}
134
135static void mst_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
136{
137}
138
139static struct pcmcia_low_level mst_pcmcia_ops __initdata = { 131static struct pcmcia_low_level mst_pcmcia_ops __initdata = {
140 .owner = THIS_MODULE, 132 .owner = THIS_MODULE,
141 .hw_init = mst_pcmcia_hw_init, 133 .hw_init = mst_pcmcia_hw_init,
142 .hw_shutdown = mst_pcmcia_hw_shutdown, 134 .hw_shutdown = mst_pcmcia_hw_shutdown,
143 .socket_state = mst_pcmcia_socket_state, 135 .socket_state = mst_pcmcia_socket_state,
144 .configure_socket = mst_pcmcia_configure_socket, 136 .configure_socket = mst_pcmcia_configure_socket,
145 .socket_init = mst_pcmcia_socket_init,
146 .socket_suspend = mst_pcmcia_socket_suspend,
147 .nr = 2, 137 .nr = 2,
148}; 138};
149 139
diff --git a/drivers/pcmcia/pxa2xx_palmld.c b/drivers/pcmcia/pxa2xx_palmld.c
index 69f73670949a..d589ad1dcd4c 100644
--- a/drivers/pcmcia/pxa2xx_palmld.c
+++ b/drivers/pcmcia/pxa2xx_palmld.c
@@ -65,14 +65,6 @@ static int palmld_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
65 return 0; 65 return 0;
66} 66}
67 67
68static void palmld_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
69{
70}
71
72static void palmld_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
73{
74}
75
76static struct pcmcia_low_level palmld_pcmcia_ops = { 68static struct pcmcia_low_level palmld_pcmcia_ops = {
77 .owner = THIS_MODULE, 69 .owner = THIS_MODULE,
78 70
@@ -84,9 +76,6 @@ static struct pcmcia_low_level palmld_pcmcia_ops = {
84 76
85 .socket_state = palmld_pcmcia_socket_state, 77 .socket_state = palmld_pcmcia_socket_state,
86 .configure_socket = palmld_pcmcia_configure_socket, 78 .configure_socket = palmld_pcmcia_configure_socket,
87
88 .socket_init = palmld_pcmcia_socket_init,
89 .socket_suspend = palmld_pcmcia_socket_suspend,
90}; 79};
91 80
92static struct platform_device *palmld_pcmcia_device; 81static struct platform_device *palmld_pcmcia_device;
diff --git a/drivers/pcmcia/pxa2xx_palmtc.c b/drivers/pcmcia/pxa2xx_palmtc.c
index d0ad6a76bbde..9c6a04b2f71b 100644
--- a/drivers/pcmcia/pxa2xx_palmtc.c
+++ b/drivers/pcmcia/pxa2xx_palmtc.c
@@ -117,14 +117,6 @@ static int palmtc_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
117 return ret; 117 return ret;
118} 118}
119 119
120static void palmtc_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
121{
122}
123
124static void palmtc_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
125{
126}
127
128static struct pcmcia_low_level palmtc_pcmcia_ops = { 120static struct pcmcia_low_level palmtc_pcmcia_ops = {
129 .owner = THIS_MODULE, 121 .owner = THIS_MODULE,
130 122
@@ -136,9 +128,6 @@ static struct pcmcia_low_level palmtc_pcmcia_ops = {
136 128
137 .socket_state = palmtc_pcmcia_socket_state, 129 .socket_state = palmtc_pcmcia_socket_state,
138 .configure_socket = palmtc_pcmcia_configure_socket, 130 .configure_socket = palmtc_pcmcia_configure_socket,
139
140 .socket_init = palmtc_pcmcia_socket_init,
141 .socket_suspend = palmtc_pcmcia_socket_suspend,
142}; 131};
143 132
144static struct platform_device *palmtc_pcmcia_device; 133static struct platform_device *palmtc_pcmcia_device;
diff --git a/drivers/pcmcia/pxa2xx_palmtx.c b/drivers/pcmcia/pxa2xx_palmtx.c
index 1a2580450402..80645a688ee3 100644
--- a/drivers/pcmcia/pxa2xx_palmtx.c
+++ b/drivers/pcmcia/pxa2xx_palmtx.c
@@ -67,14 +67,6 @@ palmtx_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
67 return 0; 67 return 0;
68} 68}
69 69
70static void palmtx_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
71{
72}
73
74static void palmtx_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
75{
76}
77
78static struct pcmcia_low_level palmtx_pcmcia_ops = { 70static struct pcmcia_low_level palmtx_pcmcia_ops = {
79 .owner = THIS_MODULE, 71 .owner = THIS_MODULE,
80 72
@@ -86,9 +78,6 @@ static struct pcmcia_low_level palmtx_pcmcia_ops = {
86 78
87 .socket_state = palmtx_pcmcia_socket_state, 79 .socket_state = palmtx_pcmcia_socket_state,
88 .configure_socket = palmtx_pcmcia_configure_socket, 80 .configure_socket = palmtx_pcmcia_configure_socket,
89
90 .socket_init = palmtx_pcmcia_socket_init,
91 .socket_suspend = palmtx_pcmcia_socket_suspend,
92}; 81};
93 82
94static struct platform_device *palmtx_pcmcia_device; 83static struct platform_device *palmtx_pcmcia_device;
diff --git a/drivers/pcmcia/pxa2xx_viper.c b/drivers/pcmcia/pxa2xx_viper.c
index a51f2077644a..1064b1c2869d 100644
--- a/drivers/pcmcia/pxa2xx_viper.c
+++ b/drivers/pcmcia/pxa2xx_viper.c
@@ -136,22 +136,12 @@ static int viper_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
136 return 0; 136 return 0;
137} 137}
138 138
139static void viper_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
140{
141}
142
143static void viper_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
144{
145}
146
147static struct pcmcia_low_level viper_pcmcia_ops = { 139static struct pcmcia_low_level viper_pcmcia_ops = {
148 .owner = THIS_MODULE, 140 .owner = THIS_MODULE,
149 .hw_init = viper_pcmcia_hw_init, 141 .hw_init = viper_pcmcia_hw_init,
150 .hw_shutdown = viper_pcmcia_hw_shutdown, 142 .hw_shutdown = viper_pcmcia_hw_shutdown,
151 .socket_state = viper_pcmcia_socket_state, 143 .socket_state = viper_pcmcia_socket_state,
152 .configure_socket = viper_pcmcia_configure_socket, 144 .configure_socket = viper_pcmcia_configure_socket,
153 .socket_init = viper_pcmcia_socket_init,
154 .socket_suspend = viper_pcmcia_socket_suspend,
155 .nr = 1, 145 .nr = 1,
156}; 146};
157 147