Commit 0258e182 authored by Fabio Porcedda's avatar Fabio Porcedda Committed by Greg Kroah-Hartman

driver core: platform.c: fix checkpatch errors and warnings

Signed-off-by: default avatarFabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 647c86d0
...@@ -46,8 +46,8 @@ EXPORT_SYMBOL_GPL(platform_bus); ...@@ -46,8 +46,8 @@ EXPORT_SYMBOL_GPL(platform_bus);
* manipulate any relevant information in the pdev_archdata they can do: * manipulate any relevant information in the pdev_archdata they can do:
* *
* platform_device_alloc() * platform_device_alloc()
* ... manipulate ... * ... manipulate ...
* platform_device_add() * platform_device_add()
* *
* And if they don't care they can just call platform_device_register() and * And if they don't care they can just call platform_device_register() and
* everything will just work out. * everything will just work out.
...@@ -326,9 +326,7 @@ int platform_device_add(struct platform_device *pdev) ...@@ -326,9 +326,7 @@ int platform_device_add(struct platform_device *pdev)
} }
if (p && insert_resource(p, r)) { if (p && insert_resource(p, r)) {
printk(KERN_ERR dev_err(&pdev->dev, "failed to claim resource %d\n", i);
"%s: failed to claim resource %d\n",
dev_name(&pdev->dev), i);
ret = -EBUSY; ret = -EBUSY;
goto failed; goto failed;
} }
...@@ -686,7 +684,7 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env) ...@@ -686,7 +684,7 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
int rc; int rc;
/* Some devices have extra OF data and an OF-style MODALIAS */ /* Some devices have extra OF data and an OF-style MODALIAS */
rc = of_device_uevent_modalias(dev,env); rc = of_device_uevent_modalias(dev, env);
if (rc != -ENODEV) if (rc != -ENODEV)
return rc; return rc;
...@@ -1130,8 +1128,8 @@ static int __init early_platform_driver_probe_id(char *class_str, ...@@ -1130,8 +1128,8 @@ static int __init early_platform_driver_probe_id(char *class_str,
switch (match_id) { switch (match_id) {
case EARLY_PLATFORM_ID_ERROR: case EARLY_PLATFORM_ID_ERROR:
pr_warning("%s: unable to parse %s parameter\n", pr_warn("%s: unable to parse %s parameter\n",
class_str, epdrv->pdrv->driver.name); class_str, epdrv->pdrv->driver.name);
/* fall-through */ /* fall-through */
case EARLY_PLATFORM_ID_UNSET: case EARLY_PLATFORM_ID_UNSET:
match = NULL; match = NULL;
...@@ -1162,8 +1160,8 @@ static int __init early_platform_driver_probe_id(char *class_str, ...@@ -1162,8 +1160,8 @@ static int __init early_platform_driver_probe_id(char *class_str,
} }
if (epdrv->pdrv->probe(match)) if (epdrv->pdrv->probe(match))
pr_warning("%s: unable to probe %s early.\n", pr_warn("%s: unable to probe %s early.\n",
class_str, match->name); class_str, match->name);
else else
n++; n++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment