Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4c42d6cc245e8d41eb83c724cf38cdb9342ea5ba

Authored by Sachin Kamat
Committed by Chris Ball
1 parent e3af31c6c6
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

mmc: Remove redundant null check before kfree in sdio_bus.c 

kfree on a null pointer is a no-op.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

Showing 1 changed file with 1 additions and 2 deletions Inline Diff

drivers/mmc/core/sdio_bus.c
Diff comments   View file @ 4c42d6c
1 /* 1 /*
2 * linux/drivers/mmc/core/sdio_bus.c 2 * linux/drivers/mmc/core/sdio_bus.c
3 * 3 *
4 * Copyright 2007 Pierre Ossman 4 * Copyright 2007 Pierre Ossman
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or (at 8 * the Free Software Foundation; either version 2 of the License, or (at
9 * your option) any later version. 9 * your option) any later version.
10 * 10 *
11 * SDIO function driver model 11 * SDIO function driver model
12 */ 12 */
13 13
14 #include <linux/device.h> 14 #include <linux/device.h>
15 #include <linux/err.h> 15 #include <linux/err.h>
16 #include <linux/export.h> 16 #include <linux/export.h>
17 #include <linux/slab.h> 17 #include <linux/slab.h>
18 #include <linux/pm_runtime.h> 18 #include <linux/pm_runtime.h>
19 19
20 #include <linux/mmc/card.h> 20 #include <linux/mmc/card.h>
21 #include <linux/mmc/host.h> 21 #include <linux/mmc/host.h>
22 #include <linux/mmc/sdio_func.h> 22 #include <linux/mmc/sdio_func.h>
23 23
24 #include "sdio_cis.h" 24 #include "sdio_cis.h"
25 #include "sdio_bus.h" 25 #include "sdio_bus.h"
26 26
27 /* show configuration fields */ 27 /* show configuration fields */
28 #define sdio_config_attr(field, format_string) \ 28 #define sdio_config_attr(field, format_string) \
29 static ssize_t \ 29 static ssize_t \
30 field##_show(struct device *dev, struct device_attribute *attr, char *buf) \ 30 field##_show(struct device *dev, struct device_attribute *attr, char *buf) \
31 { \ 31 { \
32 struct sdio_func *func; \ 32 struct sdio_func *func; \
33 \ 33 \
34 func = dev_to_sdio_func (dev); \ 34 func = dev_to_sdio_func (dev); \
35 return sprintf (buf, format_string, func->field); \ 35 return sprintf (buf, format_string, func->field); \
36 } 36 }
37 37
38 sdio_config_attr(class, "0x%02x\n"); 38 sdio_config_attr(class, "0x%02x\n");
39 sdio_config_attr(vendor, "0x%04x\n"); 39 sdio_config_attr(vendor, "0x%04x\n");
40 sdio_config_attr(device, "0x%04x\n"); 40 sdio_config_attr(device, "0x%04x\n");
41 41
42 static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf) 42 static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf)
43 { 43 {
44 struct sdio_func *func = dev_to_sdio_func (dev); 44 struct sdio_func *func = dev_to_sdio_func (dev);
45 45
46 return sprintf(buf, "sdio:c%02Xv%04Xd%04X\n", 46 return sprintf(buf, "sdio:c%02Xv%04Xd%04X\n",
47 func->class, func->vendor, func->device); 47 func->class, func->vendor, func->device);
48 } 48 }
49 49
50 static struct device_attribute sdio_dev_attrs[] = { 50 static struct device_attribute sdio_dev_attrs[] = {
51 __ATTR_RO(class), 51 __ATTR_RO(class),
52 __ATTR_RO(vendor), 52 __ATTR_RO(vendor),
53 __ATTR_RO(device), 53 __ATTR_RO(device),
54 __ATTR_RO(modalias), 54 __ATTR_RO(modalias),
55 __ATTR_NULL, 55 __ATTR_NULL,
56 }; 56 };
57 57
58 static const struct sdio_device_id *sdio_match_one(struct sdio_func *func, 58 static const struct sdio_device_id *sdio_match_one(struct sdio_func *func,
59 const struct sdio_device_id *id) 59 const struct sdio_device_id *id)
60 { 60 {
61 if (id->class != (__u8)SDIO_ANY_ID && id->class != func->class) 61 if (id->class != (__u8)SDIO_ANY_ID && id->class != func->class)
62 return NULL; 62 return NULL;
63 if (id->vendor != (__u16)SDIO_ANY_ID && id->vendor != func->vendor) 63 if (id->vendor != (__u16)SDIO_ANY_ID && id->vendor != func->vendor)
64 return NULL; 64 return NULL;
65 if (id->device != (__u16)SDIO_ANY_ID && id->device != func->device) 65 if (id->device != (__u16)SDIO_ANY_ID && id->device != func->device)
66 return NULL; 66 return NULL;
67 return id; 67 return id;
68 } 68 }
69 69
70 static const struct sdio_device_id *sdio_match_device(struct sdio_func *func, 70 static const struct sdio_device_id *sdio_match_device(struct sdio_func *func,
71 struct sdio_driver *sdrv) 71 struct sdio_driver *sdrv)
72 { 72 {
73 const struct sdio_device_id *ids; 73 const struct sdio_device_id *ids;
74 74
75 ids = sdrv->id_table; 75 ids = sdrv->id_table;
76 76
77 if (ids) { 77 if (ids) {
78 while (ids->class || ids->vendor || ids->device) { 78 while (ids->class || ids->vendor || ids->device) {
79 if (sdio_match_one(func, ids)) 79 if (sdio_match_one(func, ids))
80 return ids; 80 return ids;
81 ids++; 81 ids++;
82 } 82 }
83 } 83 }
84 84
85 return NULL; 85 return NULL;
86 } 86 }
87 87
88 static int sdio_bus_match(struct device *dev, struct device_driver *drv) 88 static int sdio_bus_match(struct device *dev, struct device_driver *drv)
89 { 89 {
90 struct sdio_func *func = dev_to_sdio_func(dev); 90 struct sdio_func *func = dev_to_sdio_func(dev);
91 struct sdio_driver *sdrv = to_sdio_driver(drv); 91 struct sdio_driver *sdrv = to_sdio_driver(drv);
92 92
93 if (sdio_match_device(func, sdrv)) 93 if (sdio_match_device(func, sdrv))
94 return 1; 94 return 1;
95 95
96 return 0; 96 return 0;
97 } 97 }
98 98
99 static int 99 static int
100 sdio_bus_uevent(struct device *dev, struct kobj_uevent_env *env) 100 sdio_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
101 { 101 {
102 struct sdio_func *func = dev_to_sdio_func(dev); 102 struct sdio_func *func = dev_to_sdio_func(dev);
103 103
104 if (add_uevent_var(env, 104 if (add_uevent_var(env,
105 "SDIO_CLASS=%02X", func->class)) 105 "SDIO_CLASS=%02X", func->class))
106 return -ENOMEM; 106 return -ENOMEM;
107 107
108 if (add_uevent_var(env, 108 if (add_uevent_var(env,
109 "SDIO_ID=%04X:%04X", func->vendor, func->device)) 109 "SDIO_ID=%04X:%04X", func->vendor, func->device))
110 return -ENOMEM; 110 return -ENOMEM;
111 111
112 if (add_uevent_var(env, 112 if (add_uevent_var(env,
113 "MODALIAS=sdio:c%02Xv%04Xd%04X", 113 "MODALIAS=sdio:c%02Xv%04Xd%04X",
114 func->class, func->vendor, func->device)) 114 func->class, func->vendor, func->device))
115 return -ENOMEM; 115 return -ENOMEM;
116 116
117 return 0; 117 return 0;
118 } 118 }
119 119
120 static int sdio_bus_probe(struct device *dev) 120 static int sdio_bus_probe(struct device *dev)
121 { 121 {
122 struct sdio_driver *drv = to_sdio_driver(dev->driver); 122 struct sdio_driver *drv = to_sdio_driver(dev->driver);
123 struct sdio_func *func = dev_to_sdio_func(dev); 123 struct sdio_func *func = dev_to_sdio_func(dev);
124 const struct sdio_device_id *id; 124 const struct sdio_device_id *id;
125 int ret; 125 int ret;
126 126
127 id = sdio_match_device(func, drv); 127 id = sdio_match_device(func, drv);
128 if (!id) 128 if (!id)
129 return -ENODEV; 129 return -ENODEV;
130 130
131 /* Unbound SDIO functions are always suspended. 131 /* Unbound SDIO functions are always suspended.
132 * During probe, the function is set active and the usage count 132 * During probe, the function is set active and the usage count
133 * is incremented. If the driver supports runtime PM, 133 * is incremented. If the driver supports runtime PM,
134 * it should call pm_runtime_put_noidle() in its probe routine and 134 * it should call pm_runtime_put_noidle() in its probe routine and
135 * pm_runtime_get_noresume() in its remove routine. 135 * pm_runtime_get_noresume() in its remove routine.
136 */ 136 */
137 if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD) { 137 if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD) {
138 ret = pm_runtime_get_sync(dev); 138 ret = pm_runtime_get_sync(dev);
139 if (ret < 0) 139 if (ret < 0)
140 goto out; 140 goto out;
141 } 141 }
142 142
143 /* Set the default block size so the driver is sure it's something 143 /* Set the default block size so the driver is sure it's something
144 * sensible. */ 144 * sensible. */
145 sdio_claim_host(func); 145 sdio_claim_host(func);
146 ret = sdio_set_block_size(func, 0); 146 ret = sdio_set_block_size(func, 0);
147 sdio_release_host(func); 147 sdio_release_host(func);
148 if (ret) 148 if (ret)
149 goto disable_runtimepm; 149 goto disable_runtimepm;
150 150
151 ret = drv->probe(func, id); 151 ret = drv->probe(func, id);
152 if (ret) 152 if (ret)
153 goto disable_runtimepm; 153 goto disable_runtimepm;
154 154
155 return 0; 155 return 0;
156 156
157 disable_runtimepm: 157 disable_runtimepm:
158 if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD) 158 if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD)
159 pm_runtime_put_noidle(dev); 159 pm_runtime_put_noidle(dev);
160 out: 160 out:
161 return ret; 161 return ret;
162 } 162 }
163 163
164 static int sdio_bus_remove(struct device *dev) 164 static int sdio_bus_remove(struct device *dev)
165 { 165 {
166 struct sdio_driver *drv = to_sdio_driver(dev->driver); 166 struct sdio_driver *drv = to_sdio_driver(dev->driver);
167 struct sdio_func *func = dev_to_sdio_func(dev); 167 struct sdio_func *func = dev_to_sdio_func(dev);
168 int ret = 0; 168 int ret = 0;
169 169
170 /* Make sure card is powered before invoking ->remove() */ 170 /* Make sure card is powered before invoking ->remove() */
171 if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD) 171 if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD)
172 pm_runtime_get_sync(dev); 172 pm_runtime_get_sync(dev);
173 173
174 drv->remove(func); 174 drv->remove(func);
175 175
176 if (func->irq_handler) { 176 if (func->irq_handler) {
177 pr_warning("WARNING: driver %s did not remove " 177 pr_warning("WARNING: driver %s did not remove "
178 "its interrupt handler!\n", drv->name); 178 "its interrupt handler!\n", drv->name);
179 sdio_claim_host(func); 179 sdio_claim_host(func);
180 sdio_release_irq(func); 180 sdio_release_irq(func);
181 sdio_release_host(func); 181 sdio_release_host(func);
182 } 182 }
183 183
184 /* First, undo the increment made directly above */ 184 /* First, undo the increment made directly above */
185 if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD) 185 if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD)
186 pm_runtime_put_noidle(dev); 186 pm_runtime_put_noidle(dev);
187 187
188 /* Then undo the runtime PM settings in sdio_bus_probe() */ 188 /* Then undo the runtime PM settings in sdio_bus_probe() */
189 if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD) 189 if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD)
190 pm_runtime_put_sync(dev); 190 pm_runtime_put_sync(dev);
191 191
192 return ret; 192 return ret;
193 } 193 }
194 194
195 #ifdef CONFIG_PM 195 #ifdef CONFIG_PM
196 196
197 #ifdef CONFIG_PM_SLEEP 197 #ifdef CONFIG_PM_SLEEP
198 static int pm_no_operation(struct device *dev) 198 static int pm_no_operation(struct device *dev)
199 { 199 {
200 /* 200 /*
201 * Prevent the PM core from calling SDIO device drivers' suspend 201 * Prevent the PM core from calling SDIO device drivers' suspend
202 * callback routines, which it is not supposed to do, by using this 202 * callback routines, which it is not supposed to do, by using this
203 * empty function as the bus type suspend callaback for SDIO. 203 * empty function as the bus type suspend callaback for SDIO.
204 */ 204 */
205 return 0; 205 return 0;
206 } 206 }
207 #endif 207 #endif
208 208
209 static const struct dev_pm_ops sdio_bus_pm_ops = { 209 static const struct dev_pm_ops sdio_bus_pm_ops = {
210 SET_SYSTEM_SLEEP_PM_OPS(pm_no_operation, pm_no_operation) 210 SET_SYSTEM_SLEEP_PM_OPS(pm_no_operation, pm_no_operation)
211 SET_RUNTIME_PM_OPS( 211 SET_RUNTIME_PM_OPS(
212 pm_generic_runtime_suspend, 212 pm_generic_runtime_suspend,
213 pm_generic_runtime_resume, 213 pm_generic_runtime_resume,
214 pm_generic_runtime_idle 214 pm_generic_runtime_idle
215 ) 215 )
216 }; 216 };
217 217
218 #define SDIO_PM_OPS_PTR (&sdio_bus_pm_ops) 218 #define SDIO_PM_OPS_PTR (&sdio_bus_pm_ops)
219 219
220 #else /* !CONFIG_PM */ 220 #else /* !CONFIG_PM */
221 221
222 #define SDIO_PM_OPS_PTR NULL 222 #define SDIO_PM_OPS_PTR NULL
223 223
224 #endif /* !CONFIG_PM */ 224 #endif /* !CONFIG_PM */
225 225
226 static struct bus_type sdio_bus_type = { 226 static struct bus_type sdio_bus_type = {
227 .name = "sdio", 227 .name = "sdio",
228 .dev_attrs = sdio_dev_attrs, 228 .dev_attrs = sdio_dev_attrs,
229 .match = sdio_bus_match, 229 .match = sdio_bus_match,
230 .uevent = sdio_bus_uevent, 230 .uevent = sdio_bus_uevent,
231 .probe = sdio_bus_probe, 231 .probe = sdio_bus_probe,
232 .remove = sdio_bus_remove, 232 .remove = sdio_bus_remove,
233 .pm = SDIO_PM_OPS_PTR, 233 .pm = SDIO_PM_OPS_PTR,
234 }; 234 };
235 235
236 int sdio_register_bus(void) 236 int sdio_register_bus(void)
237 { 237 {
238 return bus_register(&sdio_bus_type); 238 return bus_register(&sdio_bus_type);
239 } 239 }
240 240
241 void sdio_unregister_bus(void) 241 void sdio_unregister_bus(void)
242 { 242 {
243 bus_unregister(&sdio_bus_type); 243 bus_unregister(&sdio_bus_type);
244 } 244 }
245 245
246 /** 246 /**
247 * sdio_register_driver - register a function driver 247 * sdio_register_driver - register a function driver
248 * @drv: SDIO function driver 248 * @drv: SDIO function driver
249 */ 249 */
250 int sdio_register_driver(struct sdio_driver *drv) 250 int sdio_register_driver(struct sdio_driver *drv)
251 { 251 {
252 drv->drv.name = drv->name; 252 drv->drv.name = drv->name;
253 drv->drv.bus = &sdio_bus_type; 253 drv->drv.bus = &sdio_bus_type;
254 return driver_register(&drv->drv); 254 return driver_register(&drv->drv);
255 } 255 }
256 EXPORT_SYMBOL_GPL(sdio_register_driver); 256 EXPORT_SYMBOL_GPL(sdio_register_driver);
257 257
258 /** 258 /**
259 * sdio_unregister_driver - unregister a function driver 259 * sdio_unregister_driver - unregister a function driver
260 * @drv: SDIO function driver 260 * @drv: SDIO function driver
261 */ 261 */
262 void sdio_unregister_driver(struct sdio_driver *drv) 262 void sdio_unregister_driver(struct sdio_driver *drv)
263 { 263 {
264 drv->drv.bus = &sdio_bus_type; 264 drv->drv.bus = &sdio_bus_type;
265 driver_unregister(&drv->drv); 265 driver_unregister(&drv->drv);
266 } 266 }
267 EXPORT_SYMBOL_GPL(sdio_unregister_driver); 267 EXPORT_SYMBOL_GPL(sdio_unregister_driver);
268 268
269 static void sdio_release_func(struct device *dev) 269 static void sdio_release_func(struct device *dev)
270 { 270 {
271 struct sdio_func *func = dev_to_sdio_func(dev); 271 struct sdio_func *func = dev_to_sdio_func(dev);
272 272
273 sdio_free_func_cis(func); 273 sdio_free_func_cis(func);
274 274
275 if (func->info) 275 kfree(func->info);
276 kfree(func->info);
277 276
278 kfree(func); 277 kfree(func);
279 } 278 }
280 279
281 /* 280 /*
282 * Allocate and initialise a new SDIO function structure. 281 * Allocate and initialise a new SDIO function structure.
283 */ 282 */
284 struct sdio_func *sdio_alloc_func(struct mmc_card *card) 283 struct sdio_func *sdio_alloc_func(struct mmc_card *card)
285 { 284 {
286 struct sdio_func *func; 285 struct sdio_func *func;
287 286
288 func = kzalloc(sizeof(struct sdio_func), GFP_KERNEL); 287 func = kzalloc(sizeof(struct sdio_func), GFP_KERNEL);
289 if (!func) 288 if (!func)
290 return ERR_PTR(-ENOMEM); 289 return ERR_PTR(-ENOMEM);
291 290
292 func->card = card; 291 func->card = card;
293 292
294 device_initialize(&func->dev); 293 device_initialize(&func->dev);
295 294
296 func->dev.parent = &card->dev; 295 func->dev.parent = &card->dev;
297 func->dev.bus = &sdio_bus_type; 296 func->dev.bus = &sdio_bus_type;
298 func->dev.release = sdio_release_func; 297 func->dev.release = sdio_release_func;
299 298
300 return func; 299 return func;
301 } 300 }
302 301
303 /* 302 /*
304 * Register a new SDIO function with the driver model. 303 * Register a new SDIO function with the driver model.
305 */ 304 */
306 int sdio_add_func(struct sdio_func *func) 305 int sdio_add_func(struct sdio_func *func)
307 { 306 {
308 int ret; 307 int ret;
309 308
310 dev_set_name(&func->dev, "%s:%d", mmc_card_id(func->card), func->num); 309 dev_set_name(&func->dev, "%s:%d", mmc_card_id(func->card), func->num);
311 310
312 ret = device_add(&func->dev); 311 ret = device_add(&func->dev);
313 if (ret == 0) 312 if (ret == 0)
314 sdio_func_set_present(func); 313 sdio_func_set_present(func);
315 314
316 return ret; 315 return ret;
317 } 316 }
318 317
319 /* 318 /*
320 * Unregister a SDIO function with the driver model, and 319 * Unregister a SDIO function with the driver model, and
321 * (eventually) free it. 320 * (eventually) free it.
322 * This function can be called through error paths where sdio_add_func() was 321 * This function can be called through error paths where sdio_add_func() was
323 * never executed (because a failure occurred at an earlier point). 322 * never executed (because a failure occurred at an earlier point).
324 */ 323 */
325 void sdio_remove_func(struct sdio_func *func) 324 void sdio_remove_func(struct sdio_func *func)
326 { 325 {
327 if (!sdio_func_present(func)) 326 if (!sdio_func_present(func))
328 return; 327 return;
329 328
330 device_del(&func->dev); 329 device_del(&func->dev);
331 put_device(&func->dev); 330 put_device(&func->dev);
332 } 331 }
333 332
334 333