lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

driver core: remove DEVICE_ID_SIZE define

Browse Source 
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>
This commit is contained in:
Greg Kroah-Hartman
2008-05-02 06:02:41 +02:00
parent ca52a49846
commit b98cb4b7fe
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/memstick/host/jmb38x_ms.c
View File

@@ -51,7 +51,7 @@ struct jmb38x_ms_host {
void __iomem *addr; void __iomem *addr;
spinlock_t lock; spinlock_t lock;
int id; int id;
char host_id[DEVICE_ID_SIZE]; char host_id[32];
int irq; int irq;
unsigned int block_pos; unsigned int block_pos;
unsigned long timeout_jiffies; 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); spin_lock_init(&host->lock);
host->id = cnt; 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->id);
host->irq = jm->pdev->irq; host->irq = jm->pdev->irq;
host->timeout_jiffies = msecs_to_jiffies(1000); host->timeout_jiffies = msecs_to_jiffies(1000);

1
include/linux/device.h
View File

@@ -25,7 +25,6 @@
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/device.h> #include <asm/device.h>
#define DEVICE_ID_SIZE 32
#define BUS_ID_SIZE 20 #define BUS_ID_SIZE 20
struct device; struct device;