Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca52a498 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

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: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent aab0de24

drivers/eisa/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ obj-${CONFIG_EISA_VIRTUAL_ROOT} += virtual_root.o 




# 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

drivers/eisa/eisa-bus.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


struct eisa_device_info {

	struct eisa_device_id id;

	char name[DEVICE_NAME_SIZE];

	char name[50];

};



#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)) {

			strlcpy (edev->pretty_name,

				 eisa_table[i].name,

				 DEVICE_NAME_SIZE);

				 sizeof(edev->pretty_name));

			return;

		}

	}

drivers/mca/mca-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static struct mca_bus *mca_root_busses[MAX_MCA_BUSSES]; 


struct mca_device_info {

	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)

drivers/video/aty/aty128fb.c

+1 −1
Original line number Diff line number Diff line
@@ -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 aty128fb_par *par = info->par;

	struct fb_var_screeninfo var;

	char video_card[DEVICE_NAME_SIZE];

	char video_card[50];

	u8 chip_rev;

	u32 dac;

drivers/video/aty/radeonfb.h

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ struct radeonfb_info { 
	struct radeon_regs 	state;

	struct radeon_regs	init_state;



	char			name[DEVICE_NAME_SIZE];

	char			name[50];



	unsigned long		mmio_base_phys;

	unsigned long		fb_base_phys;