Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

HID: stop drivers from selecting CONFIG_HID

There is a mix of drivers using either 'depends on HID' or 'select HID',
which causes both circular dependencies and missed dependencies for
a 'select':

WARNING: unment direct dependencies for HID
Depends on [m]: HID_SUPPORT [=y] && INPUT [=m]
Selected by [y]:
- AMD_SFH_HID [=y] && HID_SUPPORT [=y] && (X86_64 || COMPILE_TEST [=y]) && PCI [=y]
Selected by [m]:
- I2C_HID_CORE [=m] && HID_SUPPORT [=y]

WARNING: unmet direct dependencies detected for INPUT_FF_MEMLESS
Depends on [m]: INPUT [=m]
Selected by [y]:
- DRAGONRISE_FF [=y] && HID_SUPPORT [=y] && HID [=y] && HID_DRAGONRISE [=y]
- HID_MICROSOFT [=y] && HID_SUPPORT [=y] && HID [=y]
- GREENASIA_FF [=y] && HID_SUPPORT [=y] && HID [=y] && HID_GREENASIA [=y]
Selected by [m]:
- INPUT_ARIZONA_HAPTICS [=m] && INPUT [=m] && INPUT_MISC [=y] && MFD_ARIZONA [=y] && SND_SOC [=m]
- INPUT_PM8XXX_VIBRATOR [=m] && INPUT [=m] && INPUT_MISC [=y] && (MFD_PM8XXX [=m] || MFD_SPMI_PMIC [=n])
- INPUT_MAX8997_HAPTIC [=m] && INPUT [=m] && INPUT_MISC [=y] && PWM [=y] && MFD_MAX8997 [=y]
- INPUT_GPIO_VIBRA [=m] && INPUT [=m] && INPUT_MISC [=y] && (GPIOLIB [=y] || COMPILE_TEST [=y])
- INPUT_REGULATOR_HAPTIC [=m] && INPUT [=m] && INPUT_MISC [=y] && REGULATOR [=y]
- INPUT_TWL6040_VIBRA [=m] && INPUT [=m] && INPUT_MISC [=y] && TWL6040_CORE [=y]
- INPUT_PWM_VIBRA [=m] && INPUT [=m] && INPUT_MISC [=y] && PWM [=y]
- INPUT_DRV260X_HAPTICS [=m] && INPUT_MISC [=y] && INPUT [=m] && I2C [=y] && (GPIOLIB [=y] || COMPILE_TEST [=y])
- INPUT_DRV2665_HAPTICS [=m] && INPUT_MISC [=y] && INPUT [=m] && I2C [=y]
- INPUT_DRV2667_HAPTICS [=m] && INPUT_MISC [=y] && INPUT [=m] && I2C [=y]
- INPUT_SC27XX_VIBRA [=m] && INPUT [=m] && INPUT_MISC [=y] && (MFD_SC27XX_PMIC [=y] || COMPILE_TEST [=y])
- HID_MAYFLASH [=m] && HID_SUPPORT [=y] && HID [=y]

Avoid this by changing all HID client drivers to use 'depends on HID'.
For I2C_HID, this requires a larger rework of the Kconfig description,
but it hopefully becomes easier to understand without the complex
I2C_HID_CORE definition.

Fixes: 25621bcc8976 ("HID: Kconfig: split HID support and hid-core compilation")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

authored by

Arnd Bergmann and committed by
Jiri Kosina
bf7660da e9d48abb

+18 -17
+1 -1
drivers/hid/amd-sfh-hid/Kconfig
··· 5 5 6 6 config AMD_SFH_HID 7 7 tristate "AMD Sensor Fusion Hub" 8 - select HID 8 + depends on HID 9 9 help 10 10 If you say yes to this option, support will be included for the 11 11 AMD Sensor Fusion Hub.
+16 -15
drivers/hid/i2c-hid/Kconfig
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 - menu "I2C HID support" 3 - depends on I2C 2 + menuconfig I2C_HID 3 + tristate "I2C HID support" 4 + default y 5 + depends on I2C && INPUT && HID 6 + 7 + if I2C_HID 4 8 5 9 config I2C_HID_ACPI 6 10 tristate "HID over I2C transport layer ACPI driver" 7 - default n 8 - depends on I2C && INPUT && ACPI 11 + depends on ACPI 12 + select I2C_HID_CORE 9 13 help 10 14 Say Y here if you use a keyboard, a touchpad, a touchscreen, or any 11 15 other HID based devices which is connected to your computer via I2C. ··· 23 19 24 20 config I2C_HID_OF 25 21 tristate "HID over I2C transport layer Open Firmware driver" 26 - default n 27 - depends on I2C && INPUT && OF 22 + depends on OF 23 + select I2C_HID_CORE 28 24 help 29 25 Say Y here if you use a keyboard, a touchpad, a touchscreen, or any 30 26 other HID based devices which is connected to your computer via I2C. ··· 38 34 39 35 config I2C_HID_OF_ELAN 40 36 tristate "Driver for Elan hid-i2c based devices on OF systems" 41 - default n 42 - depends on I2C && INPUT && OF 37 + depends on OF 38 + select I2C_HID_CORE 43 39 help 44 40 Say Y here if you want support for Elan i2c devices that use 45 41 the i2c-hid protocol on Open Firmware (Device Tree)-based ··· 53 49 54 50 config I2C_HID_OF_GOODIX 55 51 tristate "Driver for Goodix hid-i2c based devices on OF systems" 56 - default n 57 - depends on I2C && INPUT && OF 52 + depends on OF 53 + select I2C_HID_CORE 58 54 help 59 55 Say Y here if you want support for Goodix i2c devices that use 60 56 the i2c-hid protocol on Open Firmware (Device Tree)-based ··· 66 62 will be called i2c-hid-of-goodix. It will also build/depend on 67 63 the module i2c-hid. 68 64 69 - endmenu 70 - 71 65 config I2C_HID_CORE 72 66 tristate 73 - default y if I2C_HID_ACPI=y || I2C_HID_OF=y || I2C_HID_OF_GOODIX=y 74 - default m if I2C_HID_ACPI=m || I2C_HID_OF=m || I2C_HID_OF_GOODIX=m 75 - select HID 67 + endif 68 +
+1 -1
drivers/hid/intel-ish-hid/Kconfig
··· 6 6 tristate "Intel Integrated Sensor Hub" 7 7 default n 8 8 depends on X86 9 - select HID 9 + depends on HID 10 10 help 11 11 The Integrated Sensor Hub (ISH) enables the ability to offload 12 12 sensor polling and algorithm processing to a dedicated low power