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

Commit 8eacfceb authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files

i2c-i801: Don't depend on other kernel driver config options 



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: default avatarJean Delvare <khali@linux-fr.org>
Cc: David Woodhouse <david.woodhouse@intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>
parent 6aa1464d

drivers/i2c/busses/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ config I2C_AMD8111 
config I2C_I801

	tristate "Intel 82801 (ICH/PCH)"

	depends on PCI

	select CHECK_SIGNATURE if X86 && DMI

	help

	  If you say yes to this option, support will be included for the Intel

	  801 family of mainboard I2C interfaces.  Specifically, the following

drivers/i2c/busses/i2c-i801.c

+6 −10
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ static const struct pci_device_id i801_ids[] = { 


MODULE_DEVICE_TABLE(pci, i801_ids);



#if defined CONFIG_INPUT_APANEL || defined CONFIG_INPUT_APANEL_MODULE

#if defined CONFIG_X86 && defined CONFIG_DMI

static unsigned char apanel_addr;



/* Scan the system ROM for the signature "FJKEYINF" */
@@ -668,11 +668,7 @@ static void __init input_apanel_init(void) 
	}

	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,7 +734,6 @@ static void __devinit dmi_check_onboard_devices(const struct dmi_header *dm, 
		dmi_check_onboard_device(type, name, adap);

	}

}

#endif



/* Register optional slaves */

static void __devinit i801_probe_optional_slaves(struct i801_priv *priv)
@@ -747,7 +742,6 @@ static void __devinit i801_probe_optional_slaves(struct i801_priv *priv) 
	if (priv->features & FEATURE_IDF)

		return;



#if defined CONFIG_INPUT_APANEL || defined CONFIG_INPUT_APANEL_MODULE

	if (apanel_addr) {

		struct i2c_board_info info;
@@ -756,12 +750,14 @@ static void __devinit i801_probe_optional_slaves(struct i801_priv *priv) 
		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

}

#else

static void __init input_apanel_init(void) {}

static void __devinit i801_probe_optional_slaves(struct i801_priv *priv) {}

#endif	/* CONFIG_X86 && CONFIG_DMI */



static int __devinit i801_probe(struct pci_dev *dev,

				const struct pci_device_id *id)