diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2015-01-17 14:14:41 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-25 08:40:31 -0400 |
| commit | bb2b40754ff4b2fffd8015ac96c45269cb54ee79 (patch) | |
| tree | fc90bd5c3971490ff783ffbb1e2c07f997307301 /drivers/base | |
| parent | ba61af6f3e4766c76aec0b5e7f2bb8277e1acdd0 (diff) | |
driver core: use *switch* statement in really_probe()
There are series of comparisons of the 'ret' variable on the failure path of
really_probe(), so the *switch* statement seems more appropriate there.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/dd.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index cdc779cf79a3..bfece0c0dba3 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c | |||
| @@ -320,21 +320,25 @@ probe_failed: | |||
| 320 | dev->driver = NULL; | 320 | dev->driver = NULL; |
| 321 | dev_set_drvdata(dev, NULL); | 321 | dev_set_drvdata(dev, NULL); |
| 322 | 322 | ||
| 323 | if (ret == -EPROBE_DEFER) { | 323 | switch (ret) { |
| 324 | case -EPROBE_DEFER: | ||
| 324 | /* Driver requested deferred probing */ | 325 | /* Driver requested deferred probing */ |
| 325 | dev_info(dev, "Driver %s requests probe deferral\n", drv->name); | 326 | dev_info(dev, "Driver %s requests probe deferral\n", drv->name); |
| 326 | driver_deferred_probe_add(dev); | 327 | driver_deferred_probe_add(dev); |
| 327 | /* Did a trigger occur while probing? Need to re-trigger if yes */ | 328 | /* Did a trigger occur while probing? Need to re-trigger if yes */ |
| 328 | if (local_trigger_count != atomic_read(&deferred_trigger_count)) | 329 | if (local_trigger_count != atomic_read(&deferred_trigger_count)) |
| 329 | driver_deferred_probe_trigger(); | 330 | driver_deferred_probe_trigger(); |
| 330 | } else if (ret != -ENODEV && ret != -ENXIO) { | 331 | break; |
| 332 | case -ENODEV: | ||
| 333 | case -ENXIO: | ||
| 334 | pr_debug("%s: probe of %s rejects match %d\n", | ||
| 335 | drv->name, dev_name(dev), ret); | ||
| 336 | break; | ||
| 337 | default: | ||
| 331 | /* driver matched but the probe failed */ | 338 | /* driver matched but the probe failed */ |
| 332 | printk(KERN_WARNING | 339 | printk(KERN_WARNING |
| 333 | "%s: probe of %s failed with error %d\n", | 340 | "%s: probe of %s failed with error %d\n", |
| 334 | drv->name, dev_name(dev), ret); | 341 | drv->name, dev_name(dev), ret); |
| 335 | } else { | ||
| 336 | pr_debug("%s: probe of %s rejects match %d\n", | ||
| 337 | drv->name, dev_name(dev), ret); | ||
| 338 | } | 342 | } |
| 339 | /* | 343 | /* |
| 340 | * Ignore errors returned by ->probe so that the next driver can try | 344 | * Ignore errors returned by ->probe so that the next driver can try |
