Re: [PATCH 9/9] HID: add compat support

[Sam Ravnborg]

On Sun, May 11, 2008 at 10:00:43PM +0200, Jiri Slaby wrote:
> Add compat option to hid code to allow loading of all modules on
> systems which don't allow autoloading because of old userspace.
> 
> Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
> ---
>  drivers/hid/Kconfig        |   11 +++++++++++
>  drivers/hid/Makefile       |   22 ++++++++++++++++++++++
>  drivers/hid/hid-apple.c    |    2 ++
>  drivers/hid/hid-core.c     |   12 ++++++++++++
>  drivers/hid/hid-dummy.c    |   11 +++++++++++
>  drivers/hid/hid-logitech.c |    2 ++
>  include/linux/hid.h        |   13 +++++++++++--
>  7 files changed, 71 insertions(+), 2 deletions(-)
>  create mode 100644 drivers/hid/hid-dummy.c
> 
> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
> index 9a9fd7d..ba9ca39 100644
> --- a/drivers/hid/Kconfig
> +++ b/drivers/hid/Kconfig
> @@ -70,6 +70,17 @@ source "drivers/hid/usbhid/Kconfig"
>  menu "Special HID drivers"
>  	depends on HID
>  
> +config HID_COMPAT
> +	bool "Load all HID drivers on hid core load"
> +	---help---
> +	Compatible option for older userspace. If you have system without udev
> +	support of module loading through aliases and also old
> +	module-init-tools which can't handle hid bus, choose Y here. Otherwise
> +	say N. If you say N and your userspace is old enough, the only
> +	functionality you loose is modules autoloading.
> +
> +	If unsure, say N.
> +
>  config HID_LOGITECH
>  	tristate "Logitech"
>  	default m
> diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
> index 8a5cbbe..c5bca8f 100644
> --- a/drivers/hid/Makefile
> +++ b/drivers/hid/Makefile
> @@ -15,3 +15,25 @@ obj-$(CONFIG_USB_HID)		+= usbhid/
>  obj-$(CONFIG_USB_MOUSE)		+= usbhid/
>  obj-$(CONFIG_USB_KBD)		+= usbhid/
>  
> +targets := hid-dummy.h
> +
> +ifdef CONFIG_HID_COMPAT
> +
> +obj-m		+= hid-dummy.o
> +
> +$(srctree)/$(src)/hid-dummy.c: $(obj)/hid-dummy.h
> +
> +$(obj)/hid-dummy.h: $(filter-out $(srctree)/drivers/hid/hid-dummy.c,$(wildcard $(srctree)/drivers/hid/*.c))
> +	@echo -e 'static void __always_inline hid_dummy_load(void)\n{' > $@
> +	@FUNS=`grep -h 'HID_COMPAT_LOAD_DRIVER(' $(srctree)/drivers/hid/*.c | \
> +	sed -e 's/HID_COMPAT_LOAD_DRIVER( *\([^ ]*\) *) *;/\1/'`; \
> +	for FUN in $$FUNS; do \
> +		echo -e "\textern void hid_compat_$$FUN(void);"; \
> +	done >> $@; \
> +	echo >> $@; \
> +	for FUN in $$FUNS; do \
> +		echo -e "\thid_compat_$$FUN();"; \
> +	done >> $@
> +	@echo "}" >> $@

I would prefer to see this done explicit in favour of some magic
makefile fragment as the above.
It is much simpler to understand if done explicit.
And it is not like we are talking 10 or 50 files here.


	Sam
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/