|
@@ -46,8 +46,8 @@ EXPORT_SYMBOL_GPL(platform_bus);
|
|
|
* manipulate any relevant information in the pdev_archdata they can do:
|
|
|
*
|
|
|
* platform_device_alloc()
|
|
|
- * ... manipulate ...
|
|
|
- * platform_device_add()
|
|
|
+ * ... manipulate ...
|
|
|
+ * platform_device_add()
|
|
|
*
|
|
|
* And if they don't care they can just call platform_device_register() and
|
|
|
* everything will just work out.
|
|
@@ -326,9 +326,7 @@ int platform_device_add(struct platform_device *pdev)
|
|
|
}
|
|
|
|
|
|
if (p && insert_resource(p, r)) {
|
|
|
- printk(KERN_ERR
|
|
|
- "%s: failed to claim resource %d\n",
|
|
|
- dev_name(&pdev->dev), i);
|
|
|
+ dev_err(&pdev->dev, "failed to claim resource %d\n", i);
|
|
|
ret = -EBUSY;
|
|
|
goto failed;
|
|
|
}
|
|
@@ -686,7 +684,7 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
|
|
|
int rc;
|
|
|
|
|
|
/* 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)
|
|
|
return rc;
|
|
|
|
|
@@ -1130,8 +1128,8 @@ static int __init early_platform_driver_probe_id(char *class_str,
|
|
|
|
|
|
switch (match_id) {
|
|
|
case EARLY_PLATFORM_ID_ERROR:
|
|
|
- pr_warning("%s: unable to parse %s parameter\n",
|
|
|
- class_str, epdrv->pdrv->driver.name);
|
|
|
+ pr_warn("%s: unable to parse %s parameter\n",
|
|
|
+ class_str, epdrv->pdrv->driver.name);
|
|
|
/* fall-through */
|
|
|
case EARLY_PLATFORM_ID_UNSET:
|
|
|
match = NULL;
|
|
@@ -1162,8 +1160,8 @@ static int __init early_platform_driver_probe_id(char *class_str,
|
|
|
}
|
|
|
|
|
|
if (epdrv->pdrv->probe(match))
|
|
|
- pr_warning("%s: unable to probe %s early.\n",
|
|
|
- class_str, match->name);
|
|
|
+ pr_warn("%s: unable to probe %s early.\n",
|
|
|
+ class_str, match->name);
|
|
|
else
|
|
|
n++;
|
|
|
}
|