driver core: documentation and checkpatch complaints
cover driver core: documentation and checkpatch complaints
Hi all,
one patch is to improve documentation about deferred probing and two patches are to fix checkpatch complaints.
Best regards
Fabio Porcedda (3):
driver core: warn that platform_driver_probe can not use deferred
probing
driver core: platform.c: fix checkpatch errors and warnings driver core: platform_device.h: fix checkpatch errors and warnings
drivers/base/platform.c | 24 +++++++++++++----------- include/linux/platform_device.h | 24 ++++++++++++++---------- 2 files changed, 27 insertions(+), 21 deletions(-)
Signature · 1 line
1.8.2
PATCH 1/3 driver core: warn that platform_driver_probe can not use deferred probing
Add documentation that platform_driver_probe() is incompatible with deferred probing.
Signed-off-by Fabio Porcedda <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
--- drivers/base/platform.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/base/platform.c +5 -1
@@ -555,7 +555,8 @@ EXPORT_SYMBOL_GPL(platform_driver_unregister);/** * platform_driver_probe - register driver for non-hotpluggable device * @drv: platform driver structure -* @probe: the driver probe routine, probably from an __init section +* @probe: the driver probe routine, probably from an __init section, +* must not return -EPROBE_DEFER. * * Use this instead of platform_driver_register() when you know the device * is not hotpluggable and has already been registered, and you want to
@@ -566,6 +567,9 @@ EXPORT_SYMBOL_GPL(platform_driver_unregister);* into system-on-chip processors, where the controller devices have been * configured as part of board setup. * +* This is incompatible with deferred probing so probe() must not +* return -EPROBE_DEFER. +* * Returns zero if the driver registered and bound to a device, else returns * a negative error code and with the driver not registered. */
Signature · 1 line
1.8.2
PATCH 2/3 driver core: platform.c: fix checkpatch errors and warnings
In reply to Fabio PorceddaSigned-off-by Fabio Porcedda <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
--- drivers/base/platform.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/base/platform.c +8 -10
@@ -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++; }
Signature · 1 line
1.8.2
PATCH 3/3 driver core: platform_device.h: fix checkpatch errors and warnings
In reply to Fabio PorceddaSigned-off-by Fabio Porcedda <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
--- include/linux/platform_device.h | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
include/linux/platform_device.h +14 -10
@@ -20,12 +20,12 @@struct mfd_cell ;struct platform_device { -const char * name; +const char *name;int id;bool id_auto;struct device dev;u32 num_resources; -struct resource * resource; +struct resource *resource;const struct platform_device_id *id_entry;
@@ -47,9 +47,11 @@ extern struct bus_type platform_bus_type;extern struct device platform_bus;extern void arch_setup_pdev_archdata (struct platform_device *); -extern struct resource *platform_get_resource (struct platform_device *,unsigned int ,unsigned int ); +extern struct resource *platform_get_resource (struct platform_device *, +unsigned int ,unsigned int );extern int platform_get_irq (struct platform_device *,unsigned int ); -extern struct resource *platform_get_resource_byname (struct platform_device *,unsigned int ,const char *); +extern struct resource *platform_get_resource_byname ( +struct platform_device *,unsigned int ,const char *);extern int platform_get_irq_byname (struct platform_device *,const char *);extern int platform_add_devices (struct platform_device **,int );
@@ -161,7 +163,8 @@ extern struct platform_device *platform_device_alloc(const char *name, int id);extern int platform_device_add_resources (struct platform_device *pdev,const struct resource *res,unsigned int num); -extern int platform_device_add_data (struct platform_device *pdev,const void *data,size_t size); +extern int platform_device_add_data (struct platform_device *pdev, +const void *data,size_t size);extern int platform_device_add (struct platform_device *pdev);extern void platform_device_del (struct platform_device *pdev);extern void platform_device_put (struct platform_device *pdev);
@@ -190,7 +193,8 @@ static inline void *platform_get_drvdata(const struct platform_device *pdev)return dev_get_drvdata (&pdev->dev); } -static inline void platform_set_drvdata (struct platform_device *pdev,void *data) +static inline void platform_set_drvdata (struct platform_device *pdev, +void *data) {dev_set_drvdata (&pdev->dev, data); }
@@ -222,10 +226,10 @@ static void __exit __platform_driver##_exit(void) \ } \ module_exit(__platform_driver##_exit); -extern struct platform_device *platform_create_bundle (struct platform_driver *driver, -int (*probe)(struct platform_device *), -struct resource *res,unsigned int n_res, -const void *data,size_t size); +extern struct platform_device *platform_create_bundle ( +struct platform_driver *driver,int (*probe)(struct platform_device *), +struct resource *res,unsigned int n_res, +const void *data,size_t size);/* early platform driver interface */ struct early_platform_driver {
Signature · 1 line
1.8.2