Don't let other driver config options influence us, as it makes the code more complex and fragile for a small benefit. There's nothing wrong with instantiating I2C devices even if they don't have a driver. And we're talking about 835 extra bytes in the binary on x86-64, that's hardly worth arguing about.
Signed-off-by: Jean Delvare <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Hans de Goede <[email protected]> --- David, would this make you feel better? Hans, any objection? drivers/i2c/busses/i2c-i801.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) --- linux-2.6.39-rc7.orig/drivers/i2c/busses/i2c-i801.c 2011-05-12 10:17:45.000000000 +0200 +++ linux-2.6.39-rc7/drivers/i2c/busses/i2c-i801.c 2011-05-12 16:41:33.000000000 +0200 @@ -638,7 +638,7 @@ static const struct pci_device_id i801_i MODULE_DEVICE_TABLE(pci, i801_ids); -#if defined CONFIG_INPUT_APANEL || defined CONFIG_INPUT_APANEL_MODULE +#ifdef CONFIG_X86 static unsigned char apanel_addr; /* Scan the system ROM for the signature "FJKEYINF" */ @@ -668,11 +668,7 @@ static void __init input_apanel_init(voi } iounmap(bios); } -#else -static void __init input_apanel_init(void) {} -#endif -#if defined CONFIG_SENSORS_FSCHMD || defined CONFIG_SENSORS_FSCHMD_MODULE struct dmi_onboard_device_info { const char *name; u8 type; @@ -738,6 +734,8 @@ static void __devinit dmi_check_onboard_ dmi_check_onboard_device(type, name, adap); } } +#else +static void __init input_apanel_init(void) {} #endif /* Register optional slaves */ @@ -747,7 +745,7 @@ static void __devinit i801_probe_optiona if (priv->features & FEATURE_IDF) return; -#if defined CONFIG_INPUT_APANEL || defined CONFIG_INPUT_APANEL_MODULE +#ifdef CONFIG_X86 if (apanel_addr) { struct i2c_board_info info; @@ -756,8 +754,7 @@ static void __devinit i801_probe_optiona strlcpy(info.type, "fujitsu_apanel", I2C_NAME_SIZE); i2c_new_device(&priv->adapter, &info); } -#endif -#if defined CONFIG_SENSORS_FSCHMD || defined CONFIG_SENSORS_FSCHMD_MODULE + if (dmi_name_in_vendors("FUJITSU")) dmi_walk(dmi_check_onboard_devices, &priv->adapter); #endif -- Jean Delvare -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
