aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-05-02 06:02:41 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-21 21:54:53 -0700
commitca52a49846f1451163c0dc14c40cd06ff808df3e (patch)
tree88a3edfad7c5db3394657c2a5ce943d44e442e05 /include
parentaab0de245150c09e61c30962feb16aacde508dc3 (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')
-rw-r--r--include/linux/device.h3
-rw-r--r--include/linux/eisa.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index fba1bb0d175..894fdb2e483 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -25,9 +25,6 @@
#include <asm/atomic.h>
#include <asm/device.h>
-#define DEVICE_NAME_SIZE 50
-/* DEVICE_NAME_HALF is really less than half to accommodate slop */
-#define DEVICE_NAME_HALF __stringify(20)
#define DEVICE_ID_SIZE 32
#define BUS_ID_SIZE 20
diff --git a/include/linux/eisa.h b/include/linux/eisa.h
index fe806b6f030..e61c0be2a45 100644
--- a/include/linux/eisa.h
+++ b/include/linux/eisa.h
@@ -40,7 +40,7 @@ struct eisa_device {
u64 dma_mask;
struct device dev; /* generic device */
#ifdef CONFIG_EISA_NAMES
- char pretty_name[DEVICE_NAME_SIZE];
+ char pretty_name[50];
#endif
};