Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1359555e authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

Driver core: Make platform_device.id an int 



While platform_device.id is a u32, platform_device_add() handles "-1"
as a special id value. This has potential for confusion and bugs.
Making it an int instead should prevent problems from happening in
the future.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 44b760a8

drivers/base/platform.c

+4 −3
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static void platform_device_release(struct device *dev) 
 *	Create a platform device object which can have other objects attached

 *	to it, and which will have attached objects freed when it is released.

 */

struct platform_device *platform_device_alloc(const char *name, unsigned int id)

struct platform_device *platform_device_alloc(const char *name, int id)

{

	struct platform_object *pa;
@@ -245,7 +245,8 @@ int platform_device_add(struct platform_device *pdev) 
	pdev->dev.bus = &platform_bus_type;



	if (pdev->id != -1)

		snprintf(pdev->dev.bus_id, BUS_ID_SIZE, "%s.%u", pdev->name, pdev->id);

		snprintf(pdev->dev.bus_id, BUS_ID_SIZE, "%s.%d", pdev->name,

			 pdev->id);

	else

		strlcpy(pdev->dev.bus_id, pdev->name, BUS_ID_SIZE);
@@ -359,7 +360,7 @@ EXPORT_SYMBOL_GPL(platform_device_unregister); 
 *	the Linux driver model.  In particular, when such drivers are built

 *	as modules, they can't be "hotplugged".

 */

struct platform_device *platform_device_register_simple(char *name, unsigned int id,

struct platform_device *platform_device_register_simple(char *name, int id,

							struct resource *res, unsigned int num)

{

	struct platform_device *pdev;

include/linux/platform_device.h

+4 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


struct platform_device {

	const char	* name;

	u32		id;

	int		id;

	struct device	dev;

	u32		num_resources;

	struct resource	* resource;
@@ -35,9 +35,10 @@ extern struct resource *platform_get_resource_byname(struct platform_device *, u 
extern int platform_get_irq_byname(struct platform_device *, char *);

extern int platform_add_devices(struct platform_device **, int);



extern struct platform_device *platform_device_register_simple(char *, unsigned int, struct resource *, unsigned int);

extern struct platform_device *platform_device_register_simple(char *, int id,

					struct resource *, unsigned int);



extern struct platform_device *platform_device_alloc(const char *name, unsigned int id);

extern struct platform_device *platform_device_alloc(const char *name, int id);

extern int platform_device_add_resources(struct platform_device *pdev, 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(struct platform_device *pdev);