diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-05-02 06:02:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 21:54:53 -0700 |
| commit | b98cb4b7fe0e83238501b48489e46b3e0dce9aaf (patch) | |
| tree | 236fe1b938c4372520c93a39595fef85937b83c2 | |
| parent | ca52a49846f1451163c0dc14c40cd06ff808df3e (diff) | |
| download | linux-3.10-b98cb4b7fe0e83238501b48489e46b3e0dce9aaf.tar.gz linux-3.10-b98cb4b7fe0e83238501b48489e46b3e0dce9aaf.tar.bz2 linux-3.10-b98cb4b7fe0e83238501b48489e46b3e0dce9aaf.zip | |
driver core: remove DEVICE_ID_SIZE define
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>
| -rw-r--r-- | drivers/memstick/host/jmb38x_ms.c | 4 | ||||
| -rw-r--r-- | include/linux/device.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c index a054668eda1..4e3bfbcdf15 100644 --- a/drivers/memstick/host/jmb38x_ms.c +++ b/drivers/memstick/host/jmb38x_ms.c @@ -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); diff --git a/include/linux/device.h b/include/linux/device.h index 894fdb2e483..d24a47f80f9 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -25,7 +25,6 @@ #include <asm/atomic.h> #include <asm/device.h> -#define DEVICE_ID_SIZE 32 #define BUS_ID_SIZE 20 struct device; |