driver core: remove DEVICE_ID_SIZE define
Greg Kroah-Hartman [Fri, 2 May 2008 04:02:41 +0000 (06:02 +0200)]
There is no such thing as a "device id size" in the driver core, so
remove the define and fix up any users of this odd define in the rest of
the kernel.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/memstick/host/jmb38x_ms.c
include/linux/device.h

index a054668..4e3bfbc 100644 (file)
@@ -51,7 +51,7 @@ struct jmb38x_ms_host {
        void __iomem            *addr;
        spinlock_t              lock;
        int                     id;
-       char                    host_id[DEVICE_ID_SIZE];
+       char                    host_id[32];
        int                     irq;
        unsigned int            block_pos;
        unsigned long           timeout_jiffies;
@@ -781,7 +781,7 @@ static struct memstick_host *jmb38x_ms_alloc_host(struct jmb38x_ms *jm, int cnt)
 
        spin_lock_init(&host->lock);
        host->id = cnt;
-       snprintf(host->host_id, DEVICE_ID_SIZE, DRIVER_NAME ":slot%d",
+       snprintf(host->host_id, sizeof(host->host_id), DRIVER_NAME ":slot%d",
                 host->id);
        host->irq = jm->pdev->irq;
        host->timeout_jiffies = msecs_to_jiffies(1000);
index 894fdb2..d24a47f 100644 (file)
@@ -25,7 +25,6 @@
 #include <asm/atomic.h>
 #include <asm/device.h>
 
-#define DEVICE_ID_SIZE         32
 #define BUS_ID_SIZE            20
 
 struct device;