leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zorro: Refactor conditional handling of Zorro device name database

Browse Source 
Using an empty static inline function in the CONFIG_ZORRO_NAMES=n case
allows to drop compilation of names.c.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Geert Uytterhoeven 2013-05-17 14:01:24 +02:00
parent bd79014cd4
commit 52182c758f
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/zorro/Makefile
View File

@ -2,8 +2,9 @@
# Makefile for the Zorro bus specific drivers. # Makefile for the Zorro bus specific drivers.
# #
obj-$(CONFIG_ZORRO) += zorro.o zorro-driver.o zorro-sysfs.o names.o obj-$(CONFIG_ZORRO) += zorro.o zorro-driver.o zorro-sysfs.o
obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_PROC_FS) += proc.o
obj-$(CONFIG_ZORRO_NAMES) += names.o
hostprogs-y := gen-devlist hostprogs-y := gen-devlist

10
drivers/zorro/names.c
View File

@ -15,8 +15,6 @@
#include <linux/zorro.h> #include <linux/zorro.h>
#ifdef CONFIG_ZORRO_NAMES
struct zorro_prod_info { struct zorro_prod_info {
__u16 prod; __u16 prod;
unsigned short seen; unsigned short seen;
@ -97,11 +95,3 @@ void __init zorro_name_device(struct zorro_dev *dev)
} }
} }
} }
#else
void __init zorro_name_device(struct zorro_dev *dev)
{
}
#endif

5
drivers/zorro/zorro.h
View File

@ -1,4 +1,9 @@
#ifdef CONFIG_ZORRO_NAMES
extern void zorro_name_device(struct zorro_dev *z); extern void zorro_name_device(struct zorro_dev *z);
#else
static inline void zorro_name_device(struct zorro_dev *dev) { }
#endif
extern int zorro_create_sysfs_dev_files(struct zorro_dev *z); extern int zorro_create_sysfs_dev_files(struct zorro_dev *z);