aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/platform.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index a2e3910196e0..fb5609241482 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -161,7 +161,7 @@ static void platform_device_release(struct device *dev)
161 * Create a platform device object which can have other objects attached 161 * Create a platform device object which can have other objects attached
162 * to it, and which will have attached objects freed when it is released. 162 * to it, and which will have attached objects freed when it is released.
163 */ 163 */
164struct platform_device *platform_device_alloc(const char *name, unsigned int id) 164struct platform_device *platform_device_alloc(const char *name, int id)
165{ 165{
166 struct platform_object *pa; 166 struct platform_object *pa;
167 167
@@ -245,7 +245,8 @@ int platform_device_add(struct platform_device *pdev)
245 pdev->dev.bus = &platform_bus_type; 245 pdev->dev.bus = &platform_bus_type;
246 246
247 if (pdev->id != -1) 247 if (pdev->id != -1)
248 snprintf(pdev->dev.bus_id, BUS_ID_SIZE, "%s.%u", pdev->name, pdev->id); 248 snprintf(pdev->dev.bus_id, BUS_ID_SIZE, "%s.%d", pdev->name,
249 pdev->id);
249 else 250 else
250 strlcpy(pdev->dev.bus_id, pdev->name, BUS_ID_SIZE); 251 strlcpy(pdev->dev.bus_id, pdev->name, BUS_ID_SIZE);
251 252
@@ -359,7 +360,7 @@ EXPORT_SYMBOL_GPL(platform_device_unregister);
359 * the Linux driver model. In particular, when such drivers are built 360 * the Linux driver model. In particular, when such drivers are built
360 * as modules, they can't be "hotplugged". 361 * as modules, they can't be "hotplugged".
361 */ 362 */
362struct platform_device *platform_device_register_simple(char *name, unsigned int id, 363struct platform_device *platform_device_register_simple(char *name, int id,
363 struct resource *res, unsigned int num) 364 struct resource *res, unsigned int num)
364{ 365{
365 struct platform_device *pdev; 366 struct platform_device *pdev;