aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-03 04:07:45 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-22 20:29:26 -0400
commit4c89e88bfde6a3c179790e21004f24e09a058290 (patch)
tree2895a308d64aeabb5fde776d92572a51444d835b /drivers/char/pcmcia
parent1a53088c101789bfca431de709ff6e45e8c77003 (diff)
pcmcia: deprecate CS_SUCCESS
Instead of using own error or success codes, the PCMCIA code should rely on the generic return values. Therefore, replace all occurrences of CS_SUCCESS with 0. CC: netdev@vger.kernel.org Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/char/pcmcia')
-rw-r--r--drivers/char/pcmcia/cm4040_cs.c4
-rw-r--r--drivers/char/pcmcia/ipwireless/main.c36
2 files changed, 20 insertions, 20 deletions
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index e047bac56f0e..2d7c906435b7 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -567,8 +567,8 @@ static int reader_config(struct pcmcia_device *link, int devno)
567 567
568 link->conf.IntType = 00000002; 568 link->conf.IntType = 00000002;
569 569
570 if ((fail_rc = pcmcia_request_configuration(link,&link->conf)) 570 fail_rc = pcmcia_request_configuration(link, &link->conf);
571 !=CS_SUCCESS) { 571 if (fail_rc != 0) {
572 dev_printk(KERN_INFO, &handle_to_dev(link), 572 dev_printk(KERN_INFO, &handle_to_dev(link),
573 "pcmcia_request_configuration failed 0x%x\n", 573 "pcmcia_request_configuration failed 0x%x\n",
574 fail_rc); 574 fail_rc);
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index 1f520e544d45..24ffe0324e53 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -67,7 +67,7 @@ static void signalled_reboot_work(struct work_struct *work_reboot)
67 struct pcmcia_device *link = ipw->link; 67 struct pcmcia_device *link = ipw->link;
68 int ret = pccard_reset_card(link->socket); 68 int ret = pccard_reset_card(link->socket);
69 69
70 if (ret != CS_SUCCESS) 70 if (ret != 0)
71 cs_error(link, ResetCard, ret); 71 cs_error(link, ResetCard, ret);
72} 72}
73 73
@@ -104,7 +104,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
104 while (ret == 0) { 104 while (ret == 0) {
105 ret = pcmcia_get_tuple_data(link, &tuple); 105 ret = pcmcia_get_tuple_data(link, &tuple);
106 106
107 if (ret != CS_SUCCESS) { 107 if (ret != 0) {
108 cs_error(link, GetTupleData, ret); 108 cs_error(link, GetTupleData, ret);
109 goto exit0; 109 goto exit0;
110 } 110 }
@@ -115,21 +115,21 @@ static int config_ipwireless(struct ipw_dev *ipw)
115 115
116 ret = pcmcia_get_first_tuple(link, &tuple); 116 ret = pcmcia_get_first_tuple(link, &tuple);
117 117
118 if (ret != CS_SUCCESS) { 118 if (ret != 0) {
119 cs_error(link, GetFirstTuple, ret); 119 cs_error(link, GetFirstTuple, ret);
120 goto exit0; 120 goto exit0;
121 } 121 }
122 122
123 ret = pcmcia_get_tuple_data(link, &tuple); 123 ret = pcmcia_get_tuple_data(link, &tuple);
124 124
125 if (ret != CS_SUCCESS) { 125 if (ret != 0) {
126 cs_error(link, GetTupleData, ret); 126 cs_error(link, GetTupleData, ret);
127 goto exit0; 127 goto exit0;
128 } 128 }
129 129
130 ret = pcmcia_parse_tuple(link, &tuple, &parse); 130 ret = pcmcia_parse_tuple(link, &tuple, &parse);
131 131
132 if (ret != CS_SUCCESS) { 132 if (ret != 0) {
133 cs_error(link, ParseTuple, ret); 133 cs_error(link, ParseTuple, ret);
134 goto exit0; 134 goto exit0;
135 } 135 }
@@ -151,21 +151,21 @@ static int config_ipwireless(struct ipw_dev *ipw)
151 151
152 ret = pcmcia_get_first_tuple(link, &tuple); 152 ret = pcmcia_get_first_tuple(link, &tuple);
153 153
154 if (ret != CS_SUCCESS) { 154 if (ret != 0) {
155 cs_error(link, GetFirstTuple, ret); 155 cs_error(link, GetFirstTuple, ret);
156 goto exit0; 156 goto exit0;
157 } 157 }
158 158
159 ret = pcmcia_get_tuple_data(link, &tuple); 159 ret = pcmcia_get_tuple_data(link, &tuple);
160 160
161 if (ret != CS_SUCCESS) { 161 if (ret != 0) {
162 cs_error(link, GetTupleData, ret); 162 cs_error(link, GetTupleData, ret);
163 goto exit0; 163 goto exit0;
164 } 164 }
165 165
166 ret = pcmcia_parse_tuple(link, &tuple, &parse); 166 ret = pcmcia_parse_tuple(link, &tuple, &parse);
167 167
168 if (ret != CS_SUCCESS) { 168 if (ret != 0) {
169 cs_error(link, GetTupleData, ret); 169 cs_error(link, GetTupleData, ret);
170 goto exit0; 170 goto exit0;
171 } 171 }
@@ -180,7 +180,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
180 180
181 ret = pcmcia_request_io(link, &link->io); 181 ret = pcmcia_request_io(link, &link->io);
182 182
183 if (ret != CS_SUCCESS) { 183 if (ret != 0) {
184 cs_error(link, RequestIO, ret); 184 cs_error(link, RequestIO, ret);
185 goto exit0; 185 goto exit0;
186 } 186 }
@@ -194,21 +194,21 @@ static int config_ipwireless(struct ipw_dev *ipw)
194 194
195 ret = pcmcia_get_first_tuple(link, &tuple); 195 ret = pcmcia_get_first_tuple(link, &tuple);
196 196
197 if (ret != CS_SUCCESS) { 197 if (ret != 0) {
198 cs_error(link, GetFirstTuple, ret); 198 cs_error(link, GetFirstTuple, ret);
199 goto exit1; 199 goto exit1;
200 } 200 }
201 201
202 ret = pcmcia_get_tuple_data(link, &tuple); 202 ret = pcmcia_get_tuple_data(link, &tuple);
203 203
204 if (ret != CS_SUCCESS) { 204 if (ret != 0) {
205 cs_error(link, GetTupleData, ret); 205 cs_error(link, GetTupleData, ret);
206 goto exit1; 206 goto exit1;
207 } 207 }
208 208
209 ret = pcmcia_parse_tuple(link, &tuple, &parse); 209 ret = pcmcia_parse_tuple(link, &tuple, &parse);
210 210
211 if (ret != CS_SUCCESS) { 211 if (ret != 0) {
212 cs_error(link, ParseTuple, ret); 212 cs_error(link, ParseTuple, ret);
213 goto exit1; 213 goto exit1;
214 } 214 }
@@ -226,7 +226,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
226 ret = pcmcia_request_window(&link, &ipw->request_common_memory, 226 ret = pcmcia_request_window(&link, &ipw->request_common_memory,
227 &ipw->handle_common_memory); 227 &ipw->handle_common_memory);
228 228
229 if (ret != CS_SUCCESS) { 229 if (ret != 0) {
230 cs_error(link, RequestWindow, ret); 230 cs_error(link, RequestWindow, ret);
231 goto exit1; 231 goto exit1;
232 } 232 }
@@ -238,7 +238,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
238 ret = pcmcia_map_mem_page(ipw->handle_common_memory, 238 ret = pcmcia_map_mem_page(ipw->handle_common_memory,
239 &memreq_common_memory); 239 &memreq_common_memory);
240 240
241 if (ret != CS_SUCCESS) { 241 if (ret != 0) {
242 cs_error(link, MapMemPage, ret); 242 cs_error(link, MapMemPage, ret);
243 goto exit1; 243 goto exit1;
244 } 244 }
@@ -260,7 +260,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
260 ret = pcmcia_request_window(&link, &ipw->request_attr_memory, 260 ret = pcmcia_request_window(&link, &ipw->request_attr_memory,
261 &ipw->handle_attr_memory); 261 &ipw->handle_attr_memory);
262 262
263 if (ret != CS_SUCCESS) { 263 if (ret != 0) {
264 cs_error(link, RequestWindow, ret); 264 cs_error(link, RequestWindow, ret);
265 goto exit2; 265 goto exit2;
266 } 266 }
@@ -271,7 +271,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
271 ret = pcmcia_map_mem_page(ipw->handle_attr_memory, 271 ret = pcmcia_map_mem_page(ipw->handle_attr_memory,
272 &memreq_attr_memory); 272 &memreq_attr_memory);
273 273
274 if (ret != CS_SUCCESS) { 274 if (ret != 0) {
275 cs_error(link, MapMemPage, ret); 275 cs_error(link, MapMemPage, ret);
276 goto exit2; 276 goto exit2;
277 } 277 }
@@ -291,7 +291,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
291 291
292 ret = pcmcia_request_irq(link, &link->irq); 292 ret = pcmcia_request_irq(link, &link->irq);
293 293
294 if (ret != CS_SUCCESS) { 294 if (ret != 0) {
295 cs_error(link, RequestIRQ, ret); 295 cs_error(link, RequestIRQ, ret);
296 goto exit3; 296 goto exit3;
297 } 297 }
@@ -331,7 +331,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
331 */ 331 */
332 ret = pcmcia_request_configuration(link, &link->conf); 332 ret = pcmcia_request_configuration(link, &link->conf);
333 333
334 if (ret != CS_SUCCESS) { 334 if (ret != 0) {
335 cs_error(link, RequestConfiguration, ret); 335 cs_error(link, RequestConfiguration, ret);
336 goto exit4; 336 goto exit4;
337 } 337 }