kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

driver core: remove DEVICE_NAME_SIZE define

Browse source 
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>
This commit is contained in:
Kay Sievers 2008-05-02 06:02:41 +02:00 committed by Greg Kroah-Hartman
parent aab0de2451
commit ca52a49846
7 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/eisa/Makefile
View file

@ -9,7 +9,7 @@ obj-${CONFIG_EISA_VIRTUAL_ROOT} += virtual_root.o
# Ugly hack to get DEVICE_NAME_SIZE value... # Ugly hack to get DEVICE_NAME_SIZE value...
DEVICE_NAME_SIZE =$(shell awk '$$1=="\#define" && $$2=="DEVICE_NAME_SIZE" {print $$3-1}' $(srctree)/include/linux/device.h) DEVICE_NAME_SIZE = 50
$(obj)/eisa-bus.o: $(obj)/devlist.h $(obj)/eisa-bus.o: $(obj)/devlist.h

4
drivers/eisa/eisa-bus.c
View file

@ -22,7 +22,7 @@
struct eisa_device_info { struct eisa_device_info {
struct eisa_device_id id; struct eisa_device_id id;
char name[DEVICE_NAME_SIZE]; char name[50];
}; };
#ifdef CONFIG_EISA_NAMES #ifdef CONFIG_EISA_NAMES
@ -63,7 +63,7 @@ static void __init eisa_name_device (struct eisa_device *edev)
if (!strcmp (edev->id.sig, eisa_table[i].id.sig)) { if (!strcmp (edev->id.sig, eisa_table[i].id.sig)) {
strlcpy (edev->pretty_name, strlcpy (edev->pretty_name,
eisa_table[i].name, eisa_table[i].name,
DEVICE_NAME_SIZE); sizeof(edev->pretty_name));
return; return;
} }
} }

2
drivers/mca/mca-bus.c
View file

@ -40,7 +40,7 @@ static struct mca_bus *mca_root_busses[MAX_MCA_BUSSES];
struct mca_device_info { struct mca_device_info {
short pos_id; /* the 2 byte pos id for this card */ short pos_id; /* the 2 byte pos id for this card */
char name[DEVICE_NAME_SIZE]; char name[50];
}; };
static int mca_bus_match (struct device *dev, struct device_driver *drv) static int mca_bus_match (struct device *dev, struct device_driver *drv)

2
drivers/video/aty/aty128fb.c
View file

@ -1872,7 +1872,7 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
struct aty128fb_par *par = info->par; struct aty128fb_par *par = info->par;
struct fb_var_screeninfo var; struct fb_var_screeninfo var;
char video_card[DEVICE_NAME_SIZE]; char video_card[50];
u8 chip_rev; u8 chip_rev;
u32 dac; u32 dac;

2
drivers/video/aty/radeonfb.h
View file

@ -289,7 +289,7 @@ struct radeonfb_info {
struct radeon_regs state; struct radeon_regs state;
struct radeon_regs init_state; struct radeon_regs init_state;
char name[DEVICE_NAME_SIZE]; char name[50];
unsigned long mmio_base_phys; unsigned long mmio_base_phys;
unsigned long fb_base_phys; unsigned long fb_base_phys;

3
include/linux/device.h
View file

@ -25,9 +25,6 @@
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/device.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 DEVICE_ID_SIZE 32
#define BUS_ID_SIZE 20 #define BUS_ID_SIZE 20

2
include/linux/eisa.h
View file

@ -40,7 +40,7 @@ struct eisa_device {
u64 dma_mask; u64 dma_mask;
struct device dev; /* generic device */ struct device dev; /* generic device */
#ifdef CONFIG_EISA_NAMES #ifdef CONFIG_EISA_NAMES
char pretty_name[DEVICE_NAME_SIZE]; char pretty_name[50];
#endif #endif
}; };