[PATCH 1/3] Suppress platform device suffixes - take 2

[Dmitry Torokhov]

===================================================================


ChangeSet@xxxxxx, 2004-06-09 23:55:59-05:00, dtor_core@xxxxxxxxxxxxx
  sysfs: Do not add numeric suffix to platform device name if device
         id is set to -1. This can be used when there can be only one
         instance of a device (like i8042).
  
  Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>


 platform.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)


===================================================================



diff -Nru a/drivers/base/platform.c b/drivers/base/platform.c
--- a/drivers/base/platform.c	2004-06-10 01:33:27 -05:00
+++ b/drivers/base/platform.c	2004-06-10 01:33:27 -05:00
@@ -33,7 +33,10 @@
 
 	pdev->dev.bus = &platform_bus_type;
 	
-	snprintf(pdev->dev.bus_id,BUS_ID_SIZE,"%s%u",pdev->name,pdev->id);
+	if (pdev->id != -1)
+		snprintf(pdev->dev.bus_id, BUS_ID_SIZE, "%s%u", pdev->name, pdev->id);
+	else
+		strlcpy(pdev->dev.bus_id, pdev->name, BUS_ID_SIZE);
 
 	pr_debug("Registering platform device '%s'. Parent at %s\n",
 		 pdev->dev.bus_id,pdev->dev.parent->bus_id);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/