diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2008-05-02 00:02:41 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-22 00:54:53 -0400 |
| commit | ca52a49846f1451163c0dc14c40cd06ff808df3e (patch) | |
| tree | 88a3edfad7c5db3394657c2a5ce943d44e442e05 /include/linux | |
| parent | aab0de245150c09e61c30962feb16aacde508dc3 (diff) | |
driver core: remove DEVICE_NAME_SIZE define
There is no such thing as a "device name size" in the driver core, so
remove the define and fix up any users of this odd define in the rest of
the kernel.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 3 | ||||
| -rw-r--r-- | include/linux/eisa.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index fba1bb0d1758..894fdb2e483a 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
| @@ -25,9 +25,6 @@ | |||
| 25 | #include <asm/atomic.h> | 25 | #include <asm/atomic.h> |
| 26 | #include <asm/device.h> | 26 | #include <asm/device.h> |
| 27 | 27 | ||
| 28 | #define DEVICE_NAME_SIZE 50 | ||
| 29 | /* DEVICE_NAME_HALF is really less than half to accommodate slop */ | ||
| 30 | #define DEVICE_NAME_HALF __stringify(20) | ||
| 31 | #define DEVICE_ID_SIZE 32 | 28 | #define DEVICE_ID_SIZE 32 |
| 32 | #define BUS_ID_SIZE 20 | 29 | #define BUS_ID_SIZE 20 |
| 33 | 30 | ||
diff --git a/include/linux/eisa.h b/include/linux/eisa.h index fe806b6f030d..e61c0be2a459 100644 --- a/include/linux/eisa.h +++ b/include/linux/eisa.h | |||
| @@ -40,7 +40,7 @@ struct eisa_device { | |||
| 40 | u64 dma_mask; | 40 | u64 dma_mask; |
| 41 | struct device dev; /* generic device */ | 41 | struct device dev; /* generic device */ |
| 42 | #ifdef CONFIG_EISA_NAMES | 42 | #ifdef CONFIG_EISA_NAMES |
| 43 | char pretty_name[DEVICE_NAME_SIZE]; | 43 | char pretty_name[50]; |
| 44 | #endif | 44 | #endif |
| 45 | }; | 45 | }; |
| 46 | 46 | ||
