i2c: remove __dev* attributes from subsystem
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Acked-by: Peter Korsgaard <peter.korsgaard@barco.com> (for ocores and mux-gpio) Acked-by: Havard Skinnemoen <hskinnemoen@gmail.com> (for i2c-gpio) Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn> (for puf3) Acked-by: Barry Song <baohua.song@csr.com> (for sirf) Reviewed-by: Jean Delvare <khali@linux-fr.org> [wsa: Fixed "foo* bar" flaws while we are here] Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
This commit is contained in:

committed by
Wolfram Sang

parent
a49f0d1ea3
commit
0b255e927d
@@ -389,7 +389,7 @@ static u32 sis630_func(struct i2c_adapter *adapter)
|
||||
I2C_FUNC_SMBUS_BLOCK_DATA;
|
||||
}
|
||||
|
||||
static int __devinit sis630_setup(struct pci_dev *sis630_dev)
|
||||
static int sis630_setup(struct pci_dev *sis630_dev)
|
||||
{
|
||||
unsigned char b;
|
||||
struct pci_dev *dummy = NULL;
|
||||
@@ -480,7 +480,7 @@ static DEFINE_PCI_DEVICE_TABLE(sis630_ids) = {
|
||||
|
||||
MODULE_DEVICE_TABLE (pci, sis630_ids);
|
||||
|
||||
static int __devinit sis630_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
||||
static int sis630_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
||||
{
|
||||
if (sis630_setup(dev)) {
|
||||
dev_err(&dev->dev, "SIS630 comp. bus not detected, module not inserted.\n");
|
||||
@@ -496,7 +496,7 @@ static int __devinit sis630_probe(struct pci_dev *dev, const struct pci_device_i
|
||||
return i2c_add_adapter(&sis630_adapter);
|
||||
}
|
||||
|
||||
static void __devexit sis630_remove(struct pci_dev *dev)
|
||||
static void sis630_remove(struct pci_dev *dev)
|
||||
{
|
||||
if (acpi_base) {
|
||||
i2c_del_adapter(&sis630_adapter);
|
||||
@@ -510,7 +510,7 @@ static struct pci_driver sis630_driver = {
|
||||
.name = "sis630_smbus",
|
||||
.id_table = sis630_ids,
|
||||
.probe = sis630_probe,
|
||||
.remove = __devexit_p(sis630_remove),
|
||||
.remove = sis630_remove,
|
||||
};
|
||||
|
||||
module_pci_driver(sis630_driver);
|
||||
|
Reference in New Issue
Block a user