i2c: i2c-pxa-pci; make explicitly non-modular (ff3a98be) · Commits · 戴 / test

The Kconfig currently controlling compilation of this code is: drivers/i2c/busses/Kconfig:config I2C_PXA_PCI drivers/i2c/busses/Kconfig: def_bool I2C_PXA && X86_32 && PCI && OF ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. We explicitly disallow a driver unbind, since that doesn't have a sensible use case anyway, and it allows us to drop the ".remove" code for non-modular drivers. Since module_pci_driver() uses the same init level priority as builtin_pci_driver() the init ordering remains unchanged with this commit. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments. Signed-off-by:

Paul Gortmaker <paul.gortmaker@windriver.com> Acked-by:

Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by:

Wolfram Sang <wsa@the-dreams.de>

drivers/i2c/busses/i2c-pxa-pci.c

+9 −23

Original line number	Diff line number	Diff line
		/*
		* CE4100 PCI-I2C glue code for PXA's driver
		* Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
		* License: GPL v2
		*
		* The CE4100's I2C device is more or less the same one as found on PXA.
		* It does not support slave mode, the register slightly moved. This PCI
		* device provides three bars, every contains a single I2C controller.
		*/
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/pci.h>
		#include <linux/platform_device.h>
		#include <linux/i2c/pxa-i2c.h>
		@@ -134,35 +138,17 @@ err_mem:
		return ret;
		}

		static void ce4100_i2c_remove(struct pci_dev *dev)
		{
		struct ce4100_devices *sds;
		unsigned int i;

		sds = pci_get_drvdata(dev);

		for (i = 0; i < ARRAY_SIZE(sds->pdev); i++)
		platform_device_unregister(sds->pdev[i]);

		pci_disable_device(dev);
		kfree(sds);
		}

		static const struct pci_device_id ce4100_i2c_devices[] = {
		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2e68)},
		{ },
		};
		MODULE_DEVICE_TABLE(pci, ce4100_i2c_devices);

		static struct pci_driver ce4100_i2c_driver = {
		.driver = {
		.suppress_bind_attrs = true,
		},
		.name = "ce4100_i2c",
		.id_table = ce4100_i2c_devices,
		.probe = ce4100_i2c_probe,
		.remove = ce4100_i2c_remove,
		};

		module_pci_driver(ce4100_i2c_driver);

		MODULE_DESCRIPTION("CE4100 PCI-I2C glue code for PXA's driver");
		MODULE_LICENSE("GPL v2");
		MODULE_AUTHOR("Sebastian Andrzej Siewior <bigeasy@linutronix.de>");
		builtin_pci_driver(ce4100_i2c_driver);

Admin message