Skip to content

L
linux
Commit 637704cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux 

Pull i2c __dev* attribute removal from Wolfram Sang:
 "The squashed patches from Bill to get rid of the __dev* annotations in
  the i2c subsystem.  I couldn't include it in my previous pull request
  due to some dependency with the mfd subsystem.  I had this patch in
  linux-next for two days before rc1 and nothing popped up."

* 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux:
  i2c: remove __dev* attributes from subsystem
parents 4ae0a48b 0b255e92
Show whitespace changes
Inline Side-by-side
Showing with 241 additions and 247 deletions
drivers/i2c/busses/i2c-ali1535.c
View file @ 637704cb
...@@ -139,7 +139,7 @@ static unsigned short ali1535_offset; ...@@ -139,7 +139,7 @@ static unsigned short ali1535_offset;
Note the differences between kernels with the old PCI BIOS interface and Note the differences between kernels with the old PCI BIOS interface and
newer kernels with the real PCI interface. In compat.h some things are newer kernels with the real PCI interface. In compat.h some things are
defined to make the transition easier. */ defined to make the transition easier. */
static int __devinit ali1535_setup(struct pci_dev *dev) static int ali1535_setup(struct pci_dev *dev)
{ {
int retval; int retval;
unsigned char temp; unsigned char temp;
...@@ -502,7 +502,7 @@ static DEFINE_PCI_DEVICE_TABLE(ali1535_ids) = { ...@@ -502,7 +502,7 @@ static DEFINE_PCI_DEVICE_TABLE(ali1535_ids) = {
MODULE_DEVICE_TABLE(pci, ali1535_ids); MODULE_DEVICE_TABLE(pci, ali1535_ids);
static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_id *id) static int ali1535_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
if (ali1535_setup(dev)) { if (ali1535_setup(dev)) {
dev_warn(&dev->dev, dev_warn(&dev->dev,
...@@ -518,7 +518,7 @@ static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_ ...@@ -518,7 +518,7 @@ static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_
return i2c_add_adapter(&ali1535_adapter); return i2c_add_adapter(&ali1535_adapter);
} }
static void __devexit ali1535_remove(struct pci_dev *dev) static void ali1535_remove(struct pci_dev *dev)
{ {
i2c_del_adapter(&ali1535_adapter); i2c_del_adapter(&ali1535_adapter);
release_region(ali1535_smba, ALI1535_SMB_IOSIZE); release_region(ali1535_smba, ALI1535_SMB_IOSIZE);
...@@ -528,7 +528,7 @@ static struct pci_driver ali1535_driver = { ...@@ -528,7 +528,7 @@ static struct pci_driver ali1535_driver = {
.name = "ali1535_smbus", .name = "ali1535_smbus",
.id_table = ali1535_ids, .id_table = ali1535_ids,
.probe = ali1535_probe, .probe = ali1535_probe,
.remove = __devexit_p(ali1535_remove), .remove = ali1535_remove,
}; };
module_pci_driver(ali1535_driver); module_pci_driver(ali1535_driver);
......
drivers/i2c/busses/i2c-ali1563.c
View file @ 637704cb
...@@ -326,7 +326,7 @@ static u32 ali1563_func(struct i2c_adapter * a) ...@@ -326,7 +326,7 @@ static u32 ali1563_func(struct i2c_adapter * a)
} }
static int __devinit ali1563_setup(struct pci_dev * dev) static int ali1563_setup(struct pci_dev *dev)
{ {
u16 ctrl; u16 ctrl;
...@@ -390,8 +390,8 @@ static struct i2c_adapter ali1563_adapter = { ...@@ -390,8 +390,8 @@ static struct i2c_adapter ali1563_adapter = {
.algo = &ali1563_algorithm, .algo = &ali1563_algorithm,
}; };
static int __devinit ali1563_probe(struct pci_dev * dev, static int ali1563_probe(struct pci_dev *dev,
const struct pci_device_id * id_table) const struct pci_device_id *id_table)
{ {
int error; int error;
...@@ -411,7 +411,7 @@ static int __devinit ali1563_probe(struct pci_dev * dev, ...@@ -411,7 +411,7 @@ static int __devinit ali1563_probe(struct pci_dev * dev,
return error; return error;
} }
static void __devexit ali1563_remove(struct pci_dev * dev) static void ali1563_remove(struct pci_dev *dev)
{ {
i2c_del_adapter(&ali1563_adapter); i2c_del_adapter(&ali1563_adapter);
ali1563_shutdown(dev); ali1563_shutdown(dev);
...@@ -428,7 +428,7 @@ static struct pci_driver ali1563_pci_driver = { ...@@ -428,7 +428,7 @@ static struct pci_driver ali1563_pci_driver = {
.name = "ali1563_smbus", .name = "ali1563_smbus",
.id_table = ali1563_id_table, .id_table = ali1563_id_table,
.probe = ali1563_probe, .probe = ali1563_probe,
.remove = __devexit_p(ali1563_remove), .remove = ali1563_remove,
}; };
module_pci_driver(ali1563_pci_driver); module_pci_driver(ali1563_pci_driver);
......
drivers/i2c/busses/i2c-ali15x3.c
View file @ 637704cb
...@@ -131,7 +131,7 @@ MODULE_PARM_DESC(force_addr, ...@@ -131,7 +131,7 @@ MODULE_PARM_DESC(force_addr,
static struct pci_driver ali15x3_driver; static struct pci_driver ali15x3_driver;
static unsigned short ali15x3_smba; static unsigned short ali15x3_smba;
static int __devinit ali15x3_setup(struct pci_dev *ALI15X3_dev) static int ali15x3_setup(struct pci_dev *ALI15X3_dev)
{ {
u16 a; u16 a;
unsigned char temp; unsigned char temp;
...@@ -484,7 +484,7 @@ static DEFINE_PCI_DEVICE_TABLE(ali15x3_ids) = { ...@@ -484,7 +484,7 @@ static DEFINE_PCI_DEVICE_TABLE(ali15x3_ids) = {
MODULE_DEVICE_TABLE (pci, ali15x3_ids); MODULE_DEVICE_TABLE (pci, ali15x3_ids);
static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_id *id) static int ali15x3_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
if (ali15x3_setup(dev)) { if (ali15x3_setup(dev)) {
dev_err(&dev->dev, dev_err(&dev->dev,
...@@ -500,7 +500,7 @@ static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_ ...@@ -500,7 +500,7 @@ static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_
return i2c_add_adapter(&ali15x3_adapter); return i2c_add_adapter(&ali15x3_adapter);
} }
static void __devexit ali15x3_remove(struct pci_dev *dev) static void ali15x3_remove(struct pci_dev *dev)
{ {
i2c_del_adapter(&ali15x3_adapter); i2c_del_adapter(&ali15x3_adapter);
release_region(ali15x3_smba, ALI15X3_SMB_IOSIZE); release_region(ali15x3_smba, ALI15X3_SMB_IOSIZE);
...@@ -510,7 +510,7 @@ static struct pci_driver ali15x3_driver = { ...@@ -510,7 +510,7 @@ static struct pci_driver ali15x3_driver = {
.name = "ali15x3_smbus", .name = "ali15x3_smbus",
.id_table = ali15x3_ids, .id_table = ali15x3_ids,
.probe = ali15x3_probe, .probe = ali15x3_probe,
.remove = __devexit_p(ali15x3_remove), .remove = ali15x3_remove,
}; };
module_pci_driver(ali15x3_driver); module_pci_driver(ali15x3_driver);
......
drivers/i2c/busses/i2c-amd756.c
View file @ 637704cb
...@@ -324,8 +324,7 @@ static DEFINE_PCI_DEVICE_TABLE(amd756_ids) = { ...@@ -324,8 +324,7 @@ static DEFINE_PCI_DEVICE_TABLE(amd756_ids) = {
MODULE_DEVICE_TABLE (pci, amd756_ids); MODULE_DEVICE_TABLE (pci, amd756_ids);
static int __devinit amd756_probe(struct pci_dev *pdev, static int amd756_probe(struct pci_dev *pdev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
int nforce = (id->driver_data == NFORCE); int nforce = (id->driver_data == NFORCE);
int error; int error;
...@@ -397,7 +396,7 @@ static int __devinit amd756_probe(struct pci_dev *pdev, ...@@ -397,7 +396,7 @@ static int __devinit amd756_probe(struct pci_dev *pdev,
return error; return error;
} }
static void __devexit amd756_remove(struct pci_dev *dev) static void amd756_remove(struct pci_dev *dev)
{ {
i2c_del_adapter(&amd756_smbus); i2c_del_adapter(&amd756_smbus);
release_region(amd756_ioport, SMB_IOSIZE); release_region(amd756_ioport, SMB_IOSIZE);
...@@ -407,7 +406,7 @@ static struct pci_driver amd756_driver = { ...@@ -407,7 +406,7 @@ static struct pci_driver amd756_driver = {
.name = "amd756_smbus", .name = "amd756_smbus",
.id_table = amd756_ids, .id_table = amd756_ids,
.probe = amd756_probe, .probe = amd756_probe,
.remove = __devexit_p(amd756_remove), .remove = amd756_remove,
}; };
module_pci_driver(amd756_driver); module_pci_driver(amd756_driver);
......
drivers/i2c/busses/i2c-amd8111.c
View file @ 637704cb
...@@ -422,8 +422,7 @@ static DEFINE_PCI_DEVICE_TABLE(amd8111_ids) = { ...@@ -422,8 +422,7 @@ static DEFINE_PCI_DEVICE_TABLE(amd8111_ids) = {
MODULE_DEVICE_TABLE (pci, amd8111_ids); MODULE_DEVICE_TABLE (pci, amd8111_ids);
static int __devinit amd8111_probe(struct pci_dev *dev, static int amd8111_probe(struct pci_dev *dev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
struct amd_smbus *smbus; struct amd_smbus *smbus;
int error; int error;
...@@ -475,7 +474,7 @@ static int __devinit amd8111_probe(struct pci_dev *dev, ...@@ -475,7 +474,7 @@ static int __devinit amd8111_probe(struct pci_dev *dev,
return error; return error;
} }
static void __devexit amd8111_remove(struct pci_dev *dev) static void amd8111_remove(struct pci_dev *dev)
{ {
struct amd_smbus *smbus = pci_get_drvdata(dev); struct amd_smbus *smbus = pci_get_drvdata(dev);
...@@ -488,7 +487,7 @@ static struct pci_driver amd8111_driver = { ...@@ -488,7 +487,7 @@ static struct pci_driver amd8111_driver = {
.name = "amd8111_smbus2", .name = "amd8111_smbus2",
.id_table = amd8111_ids, .id_table = amd8111_ids,
.probe = amd8111_probe, .probe = amd8111_probe,
.remove = __devexit_p(amd8111_remove), .remove = amd8111_remove,
}; };
module_pci_driver(amd8111_driver); module_pci_driver(amd8111_driver);
drivers/i2c/busses/i2c-at91.c
View file @ 637704cb
...@@ -145,7 +145,7 @@ static void at91_init_twi_bus(struct at91_twi_dev *dev) ...@@ -145,7 +145,7 @@ static void at91_init_twi_bus(struct at91_twi_dev *dev)
* Calculate symmetric clock as stated in datasheet: * Calculate symmetric clock as stated in datasheet:
* twi_clk = F_MAIN / (2 * (cdiv * (1 << ckdiv) + offset)) * twi_clk = F_MAIN / (2 * (cdiv * (1 << ckdiv) + offset))
*/ */
static void __devinit at91_calc_twi_clock(struct at91_twi_dev *dev, int twi_clk) static void at91_calc_twi_clock(struct at91_twi_dev *dev, int twi_clk)
{ {
int ckdiv, cdiv, div; int ckdiv, cdiv, div;
struct at91_twi_pdata *pdata = dev->pdata; struct at91_twi_pdata *pdata = dev->pdata;
...@@ -604,7 +604,7 @@ MODULE_DEVICE_TABLE(of, atmel_twi_dt_ids); ...@@ -604,7 +604,7 @@ MODULE_DEVICE_TABLE(of, atmel_twi_dt_ids);
#define atmel_twi_dt_ids NULL #define atmel_twi_dt_ids NULL
#endif #endif
static bool __devinit filter(struct dma_chan *chan, void *slave) static bool filter(struct dma_chan *chan, void *slave)
{ {
struct at_dma_slave *sl = slave; struct at_dma_slave *sl = slave;
...@@ -616,7 +616,7 @@ static bool __devinit filter(struct dma_chan *chan, void *slave) ...@@ -616,7 +616,7 @@ static bool __devinit filter(struct dma_chan *chan, void *slave)
} }
} }
static int __devinit at91_twi_configure_dma(struct at91_twi_dev *dev, u32 phy_addr) static int at91_twi_configure_dma(struct at91_twi_dev *dev, u32 phy_addr)
{ {
int ret = 0; int ret = 0;
struct at_dma_slave *sdata; struct at_dma_slave *sdata;
...@@ -688,7 +688,7 @@ static int __devinit at91_twi_configure_dma(struct at91_twi_dev *dev, u32 phy_ad ...@@ -688,7 +688,7 @@ static int __devinit at91_twi_configure_dma(struct at91_twi_dev *dev, u32 phy_ad
return ret; return ret;
} }
static struct at91_twi_pdata * __devinit at91_twi_get_driver_data( static struct at91_twi_pdata *at91_twi_get_driver_data(
struct platform_device *pdev) struct platform_device *pdev)
{ {
if (pdev->dev.of_node) { if (pdev->dev.of_node) {
...@@ -701,7 +701,7 @@ static struct at91_twi_pdata * __devinit at91_twi_get_driver_data( ...@@ -701,7 +701,7 @@ static struct at91_twi_pdata * __devinit at91_twi_get_driver_data(
return (struct at91_twi_pdata *) platform_get_device_id(pdev)->driver_data; return (struct at91_twi_pdata *) platform_get_device_id(pdev)->driver_data;
} }
static int __devinit at91_twi_probe(struct platform_device *pdev) static int at91_twi_probe(struct platform_device *pdev)
{ {
struct at91_twi_dev *dev; struct at91_twi_dev *dev;
struct resource *mem; struct resource *mem;
...@@ -779,7 +779,7 @@ static int __devinit at91_twi_probe(struct platform_device *pdev) ...@@ -779,7 +779,7 @@ static int __devinit at91_twi_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit at91_twi_remove(struct platform_device *pdev) static int at91_twi_remove(struct platform_device *pdev)
{ {
struct at91_twi_dev *dev = platform_get_drvdata(pdev); struct at91_twi_dev *dev = platform_get_drvdata(pdev);
int rc; int rc;
...@@ -820,7 +820,7 @@ static const struct dev_pm_ops at91_twi_pm = { ...@@ -820,7 +820,7 @@ static const struct dev_pm_ops at91_twi_pm = {
static struct platform_driver at91_twi_driver = { static struct platform_driver at91_twi_driver = {
.probe = at91_twi_probe, .probe = at91_twi_probe,
.remove = __devexit_p(at91_twi_remove), .remove = at91_twi_remove,
.id_table = at91_twi_devtypes, .id_table = at91_twi_devtypes,
.driver = { .driver = {
.name = "at91_i2c", .name = "at91_i2c",
......
drivers/i2c/busses/i2c-au1550.c
View file @ 637704cb
...@@ -313,7 +313,7 @@ static void i2c_au1550_disable(struct i2c_au1550_data *priv) ...@@ -313,7 +313,7 @@ static void i2c_au1550_disable(struct i2c_au1550_data *priv)
* Prior to calling us, the 50MHz clock frequency and routing * Prior to calling us, the 50MHz clock frequency and routing
* must have been set up for the PSC indicated by the adapter. * must have been set up for the PSC indicated by the adapter.
*/ */
static int __devinit static int
i2c_au1550_probe(struct platform_device *pdev) i2c_au1550_probe(struct platform_device *pdev)
{ {
struct i2c_au1550_data *priv; struct i2c_au1550_data *priv;
...@@ -372,7 +372,7 @@ i2c_au1550_probe(struct platform_device *pdev) ...@@ -372,7 +372,7 @@ i2c_au1550_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit i2c_au1550_remove(struct platform_device *pdev) static int i2c_au1550_remove(struct platform_device *pdev)
{ {
struct i2c_au1550_data *priv = platform_get_drvdata(pdev); struct i2c_au1550_data *priv = platform_get_drvdata(pdev);
...@@ -423,7 +423,7 @@ static struct platform_driver au1xpsc_smbus_driver = { ...@@ -423,7 +423,7 @@ static struct platform_driver au1xpsc_smbus_driver = {
.pm = AU1XPSC_SMBUS_PMOPS, .pm = AU1XPSC_SMBUS_PMOPS,
}, },
.probe = i2c_au1550_probe, .probe = i2c_au1550_probe,
.remove = __devexit_p(i2c_au1550_remove), .remove = i2c_au1550_remove,
}; };
module_platform_driver(au1xpsc_smbus_driver); module_platform_driver(au1xpsc_smbus_driver);
......
drivers/i2c/busses/i2c-cpm.c
View file @ 637704cb
...@@ -426,7 +426,7 @@ static const struct i2c_adapter cpm_ops = { ...@@ -426,7 +426,7 @@ static const struct i2c_adapter cpm_ops = {
.algo = &cpm_i2c_algo, .algo = &cpm_i2c_algo,
}; };
static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm) static int cpm_i2c_setup(struct cpm_i2c *cpm)
{ {
struct platform_device *ofdev = cpm->ofdev; struct platform_device *ofdev = cpm->ofdev;
const u32 *data; const u32 *data;
...@@ -634,7 +634,7 @@ static void cpm_i2c_shutdown(struct cpm_i2c *cpm) ...@@ -634,7 +634,7 @@ static void cpm_i2c_shutdown(struct cpm_i2c *cpm)
cpm_muram_free(cpm->i2c_addr); cpm_muram_free(cpm->i2c_addr);
} }
static int __devinit cpm_i2c_probe(struct platform_device *ofdev) static int cpm_i2c_probe(struct platform_device *ofdev)
{ {
int result, len; int result, len;
struct cpm_i2c *cpm; struct cpm_i2c *cpm;
...@@ -688,7 +688,7 @@ static int __devinit cpm_i2c_probe(struct platform_device *ofdev) ...@@ -688,7 +688,7 @@ static int __devinit cpm_i2c_probe(struct platform_device *ofdev)
return result; return result;
} }
static int __devexit cpm_i2c_remove(struct platform_device *ofdev) static int cpm_i2c_remove(struct platform_device *ofdev)
{ {
struct cpm_i2c *cpm = dev_get_drvdata(&ofdev->dev); struct cpm_i2c *cpm = dev_get_drvdata(&ofdev->dev);
...@@ -716,7 +716,7 @@ MODULE_DEVICE_TABLE(of, cpm_i2c_match); ...@@ -716,7 +716,7 @@ MODULE_DEVICE_TABLE(of, cpm_i2c_match);
static struct platform_driver cpm_i2c_driver = { static struct platform_driver cpm_i2c_driver = {
.probe = cpm_i2c_probe, .probe = cpm_i2c_probe,
.remove = __devexit_p(cpm_i2c_remove), .remove = cpm_i2c_remove,
.driver = { .driver = {
.name = "fsl-i2c-cpm", .name = "fsl-i2c-cpm",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/i2c/busses/i2c-designware-pcidrv.c
View file @ 637704cb
...@@ -207,7 +207,7 @@ static u32 i2c_dw_get_clk_rate_khz(struct dw_i2c_dev *dev) ...@@ -207,7 +207,7 @@ static u32 i2c_dw_get_clk_rate_khz(struct dw_i2c_dev *dev)
return dev->controller->clk_khz; return dev->controller->clk_khz;
} }
static int __devinit i2c_dw_pci_probe(struct pci_dev *pdev, static int i2c_dw_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct dw_i2c_dev *dev; struct dw_i2c_dev *dev;
...@@ -328,7 +328,7 @@ const struct pci_device_id *id) ...@@ -328,7 +328,7 @@ const struct pci_device_id *id)
return r; return r;
} }
static void __devexit i2c_dw_pci_remove(struct pci_dev *pdev) static void i2c_dw_pci_remove(struct pci_dev *pdev)
{ {
struct dw_i2c_dev *dev = pci_get_drvdata(pdev); struct dw_i2c_dev *dev = pci_get_drvdata(pdev);
...@@ -368,7 +368,7 @@ static struct pci_driver dw_i2c_driver = { ...@@ -368,7 +368,7 @@ static struct pci_driver dw_i2c_driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.id_table = i2_designware_pci_ids, .id_table = i2_designware_pci_ids,
.probe = i2c_dw_pci_probe, .probe = i2c_dw_pci_probe,
.remove = __devexit_p(i2c_dw_pci_remove), .remove = i2c_dw_pci_remove,
.driver = { .driver = {
.pm = &i2c_dw_pm_ops, .pm = &i2c_dw_pm_ops,
}, },
......
drivers/i2c/busses/i2c-designware-platdrv.c
View file @ 637704cb
...@@ -50,7 +50,7 @@ static u32 i2c_dw_get_clk_rate_khz(struct dw_i2c_dev *dev) ...@@ -50,7 +50,7 @@ static u32 i2c_dw_get_clk_rate_khz(struct dw_i2c_dev *dev)
return clk_get_rate(dev->clk)/1000; return clk_get_rate(dev->clk)/1000;
} }
static int __devinit dw_i2c_probe(struct platform_device *pdev) static int dw_i2c_probe(struct platform_device *pdev)
{ {
struct dw_i2c_dev *dev; struct dw_i2c_dev *dev;
struct i2c_adapter *adap; struct i2c_adapter *adap;
...@@ -169,7 +169,7 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev) ...@@ -169,7 +169,7 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)
return r; return r;
} }
static int __devexit dw_i2c_remove(struct platform_device *pdev) static int dw_i2c_remove(struct platform_device *pdev)
{ {
struct dw_i2c_dev *dev = platform_get_drvdata(pdev); struct dw_i2c_dev *dev = platform_get_drvdata(pdev);
struct resource *mem; struct resource *mem;
...@@ -228,7 +228,7 @@ static SIMPLE_DEV_PM_OPS(dw_i2c_dev_pm_ops, dw_i2c_suspend, dw_i2c_resume); ...@@ -228,7 +228,7 @@ static SIMPLE_DEV_PM_OPS(dw_i2c_dev_pm_ops, dw_i2c_suspend, dw_i2c_resume);
MODULE_ALIAS("platform:i2c_designware"); MODULE_ALIAS("platform:i2c_designware");
static struct platform_driver dw_i2c_driver = { static struct platform_driver dw_i2c_driver = {
.remove = __devexit_p(dw_i2c_remove), .remove = dw_i2c_remove,
.driver = { .driver = {
.name = "i2c_designware", .name = "i2c_designware",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/i2c/busses/i2c-eg20t.c
View file @ 637704cb
...@@ -758,7 +758,7 @@ static void pch_i2c_disbl_int(struct i2c_algo_pch_data *adap) ...@@ -758,7 +758,7 @@ static void pch_i2c_disbl_int(struct i2c_algo_pch_data *adap)
iowrite32(BUFFER_MODE_INTR_DISBL, p + PCH_I2CBUFMSK); iowrite32(BUFFER_MODE_INTR_DISBL, p + PCH_I2CBUFMSK);
} }
static int __devinit pch_i2c_probe(struct pci_dev *pdev, static int pch_i2c_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
void __iomem *base_addr; void __iomem *base_addr;
...@@ -851,7 +851,7 @@ static int __devinit pch_i2c_probe(struct pci_dev *pdev, ...@@ -851,7 +851,7 @@ static int __devinit pch_i2c_probe(struct pci_dev *pdev,
return ret; return ret;
} }
static void __devexit pch_i2c_remove(struct pci_dev *pdev) static void pch_i2c_remove(struct pci_dev *pdev)
{ {
int i; int i;
struct adapter_info *adap_info = pci_get_drvdata(pdev); struct adapter_info *adap_info = pci_get_drvdata(pdev);
...@@ -948,7 +948,7 @@ static struct pci_driver pch_pcidriver = { ...@@ -948,7 +948,7 @@ static struct pci_driver pch_pcidriver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.id_table = pch_pcidev_id, .id_table = pch_pcidev_id,
.probe = pch_i2c_probe, .probe = pch_i2c_probe,
.remove = __devexit_p(pch_i2c_remove), .remove = pch_i2c_remove,
.suspend = pch_i2c_suspend, .suspend = pch_i2c_suspend,
.resume = pch_i2c_resume .resume = pch_i2c_resume
}; };
......
drivers/i2c/busses/i2c-elektor.c
View file @ 637704cb
...@@ -205,7 +205,7 @@ static struct i2c_adapter pcf_isa_ops = { ...@@ -205,7 +205,7 @@ static struct i2c_adapter pcf_isa_ops = {
.name = "i2c-elektor", .name = "i2c-elektor",
}; };
static int __devinit elektor_match(struct device *dev, unsigned int id) static int elektor_match(struct device *dev, unsigned int id)
{ {
#ifdef __alpha__ #ifdef __alpha__
/* check to see we have memory mapped PCF8584 connected to the /* check to see we have memory mapped PCF8584 connected to the
...@@ -264,7 +264,7 @@ static int __devinit elektor_match(struct device *dev, unsigned int id) ...@@ -264,7 +264,7 @@ static int __devinit elektor_match(struct device *dev, unsigned int id)
return 1; return 1;
} }
static int __devinit elektor_probe(struct device *dev, unsigned int id) static int elektor_probe(struct device *dev, unsigned int id)
{ {
init_waitqueue_head(&pcf_wait); init_waitqueue_head(&pcf_wait);
if (pcf_isa_init()) if (pcf_isa_init())
...@@ -293,7 +293,7 @@ static int __devinit elektor_probe(struct device *dev, unsigned int id) ...@@ -293,7 +293,7 @@ static int __devinit elektor_probe(struct device *dev, unsigned int id)
return -ENODEV; return -ENODEV;
} }
static int __devexit elektor_remove(struct device *dev, unsigned int id) static int elektor_remove(struct device *dev, unsigned int id)
{ {
i2c_del_adapter(&pcf_isa_ops); i2c_del_adapter(&pcf_isa_ops);
...@@ -316,7 +316,7 @@ static int __devexit elektor_remove(struct device *dev, unsigned int id) ...@@ -316,7 +316,7 @@ static int __devexit elektor_remove(struct device *dev, unsigned int id)
static struct isa_driver i2c_elektor_driver = { static struct isa_driver i2c_elektor_driver = {
.match = elektor_match, .match = elektor_match,
.probe = elektor_probe, .probe = elektor_probe,
.remove = __devexit_p(elektor_remove), .remove = elektor_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "i2c-elektor", .name = "i2c-elektor",
......
drivers/i2c/busses/i2c-gpio.c
View file @ 637704cb
...@@ -85,7 +85,7 @@ static int i2c_gpio_getscl(void *data) ...@@ -85,7 +85,7 @@ static int i2c_gpio_getscl(void *data)
return gpio_get_value(pdata->scl_pin); return gpio_get_value(pdata->scl_pin);
} }
static int __devinit of_i2c_gpio_probe(struct device_node *np, static int of_i2c_gpio_probe(struct device_node *np,
struct i2c_gpio_platform_data *pdata) struct i2c_gpio_platform_data *pdata)
{ {
u32 reg; u32 reg;
...@@ -117,7 +117,7 @@ static int __devinit of_i2c_gpio_probe(struct device_node *np, ...@@ -117,7 +117,7 @@ static int __devinit of_i2c_gpio_probe(struct device_node *np,
return 0; return 0;
} }
static int __devinit i2c_gpio_probe(struct platform_device *pdev) static int i2c_gpio_probe(struct platform_device *pdev)
{ {
struct i2c_gpio_private_data *priv; struct i2c_gpio_private_data *priv;
struct i2c_gpio_platform_data *pdata; struct i2c_gpio_platform_data *pdata;
...@@ -218,7 +218,7 @@ static int __devinit i2c_gpio_probe(struct platform_device *pdev) ...@@ -218,7 +218,7 @@ static int __devinit i2c_gpio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit i2c_gpio_remove(struct platform_device *pdev) static int i2c_gpio_remove(struct platform_device *pdev)
{ {
struct i2c_gpio_private_data *priv; struct i2c_gpio_private_data *priv;
struct i2c_gpio_platform_data *pdata; struct i2c_gpio_platform_data *pdata;
...@@ -251,7 +251,7 @@ static struct platform_driver i2c_gpio_driver = { ...@@ -251,7 +251,7 @@ static struct platform_driver i2c_gpio_driver = {
.of_match_table = of_match_ptr(i2c_gpio_dt_ids), .of_match_table = of_match_ptr(i2c_gpio_dt_ids),
}, },
.probe = i2c_gpio_probe, .probe = i2c_gpio_probe,
.remove = __devexit_p(i2c_gpio_remove), .remove = i2c_gpio_remove,
}; };
static int __init i2c_gpio_init(void) static int __init i2c_gpio_init(void)
......
drivers/i2c/busses/i2c-highlander.c
View file @ 637704cb
...@@ -356,7 +356,7 @@ static const struct i2c_algorithm highlander_i2c_algo = { ...@@ -356,7 +356,7 @@ static const struct i2c_algorithm highlander_i2c_algo = {
.functionality = highlander_i2c_func, .functionality = highlander_i2c_func,
}; };
static int __devinit highlander_i2c_probe(struct platform_device *pdev) static int highlander_i2c_probe(struct platform_device *pdev)
{ {
struct highlander_i2c_dev *dev; struct highlander_i2c_dev *dev;
struct i2c_adapter *adap; struct i2c_adapter *adap;
...@@ -441,7 +441,7 @@ static int __devinit highlander_i2c_probe(struct platform_device *pdev) ...@@ -441,7 +441,7 @@ static int __devinit highlander_i2c_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit highlander_i2c_remove(struct platform_device *pdev) static int highlander_i2c_remove(struct platform_device *pdev)
{ {
struct highlander_i2c_dev *dev = platform_get_drvdata(pdev); struct highlander_i2c_dev *dev = platform_get_drvdata(pdev);
...@@ -465,7 +465,7 @@ static struct platform_driver highlander_i2c_driver = { ...@@ -465,7 +465,7 @@ static struct platform_driver highlander_i2c_driver = {
}, },
.probe = highlander_i2c_probe, .probe = highlander_i2c_probe,
.remove = __devexit_p(highlander_i2c_remove), .remove = highlander_i2c_remove,
}; };
module_platform_driver(highlander_i2c_driver); module_platform_driver(highlander_i2c_driver);
......
drivers/i2c/busses/i2c-hydra.c
View file @ 637704cb
...@@ -112,7 +112,7 @@ static DEFINE_PCI_DEVICE_TABLE(hydra_ids) = { ...@@ -112,7 +112,7 @@ static DEFINE_PCI_DEVICE_TABLE(hydra_ids) = {
MODULE_DEVICE_TABLE (pci, hydra_ids); MODULE_DEVICE_TABLE (pci, hydra_ids);
static int __devinit hydra_probe(struct pci_dev *dev, static int hydra_probe(struct pci_dev *dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
unsigned long base = pci_resource_start(dev, 0); unsigned long base = pci_resource_start(dev, 0);
...@@ -139,7 +139,7 @@ static int __devinit hydra_probe(struct pci_dev *dev, ...@@ -139,7 +139,7 @@ static int __devinit hydra_probe(struct pci_dev *dev,
return 0; return 0;
} }
static void __devexit hydra_remove(struct pci_dev *dev) static void hydra_remove(struct pci_dev *dev)
{ {
pdregw(hydra_bit_data.data, 0); /* clear SCLK_OE and SDAT_OE */ pdregw(hydra_bit_data.data, 0); /* clear SCLK_OE and SDAT_OE */
i2c_del_adapter(&hydra_adap); i2c_del_adapter(&hydra_adap);
...@@ -153,7 +153,7 @@ static struct pci_driver hydra_driver = { ...@@ -153,7 +153,7 @@ static struct pci_driver hydra_driver = {
.name = "hydra_smbus", .name = "hydra_smbus",
.id_table = hydra_ids, .id_table = hydra_ids,
.probe = hydra_probe, .probe = hydra_probe,
.remove = __devexit_p(hydra_remove), .remove = hydra_remove,
}; };
module_pci_driver(hydra_driver); module_pci_driver(hydra_driver);
......
drivers/i2c/busses/i2c-i801.c
View file @ 637704cb
...@@ -841,13 +841,13 @@ struct dmi_onboard_device_info { ...@@ -841,13 +841,13 @@ struct dmi_onboard_device_info {
const char *i2c_type; const char *i2c_type;
}; };
static struct dmi_onboard_device_info __devinitdata dmi_devices[] = { static const struct dmi_onboard_device_info dmi_devices[] = {
{ "Syleus", DMI_DEV_TYPE_OTHER, 0x73, "fscsyl" }, { "Syleus", DMI_DEV_TYPE_OTHER, 0x73, "fscsyl" },
{ "Hermes", DMI_DEV_TYPE_OTHER, 0x73, "fscher" }, { "Hermes", DMI_DEV_TYPE_OTHER, 0x73, "fscher" },
{ "Hades", DMI_DEV_TYPE_OTHER, 0x73, "fschds" }, { "Hades", DMI_DEV_TYPE_OTHER, 0x73, "fschds" },
}; };
static void __devinit dmi_check_onboard_device(u8 type, const char *name, static void dmi_check_onboard_device(u8 type, const char *name,
struct i2c_adapter *adap) struct i2c_adapter *adap)
{ {
int i; int i;
...@@ -871,8 +871,7 @@ static void __devinit dmi_check_onboard_device(u8 type, const char *name, ...@@ -871,8 +871,7 @@ static void __devinit dmi_check_onboard_device(u8 type, const char *name,
/* We use our own function to check for onboard devices instead of /* We use our own function to check for onboard devices instead of
dmi_find_device() as some buggy BIOS's have the devices we are interested dmi_find_device() as some buggy BIOS's have the devices we are interested
in marked as disabled */ in marked as disabled */
static void __devinit dmi_check_onboard_devices(const struct dmi_header *dm, static void dmi_check_onboard_devices(const struct dmi_header *dm, void *adap)
void *adap)
{ {
int i, count; int i, count;
...@@ -901,7 +900,7 @@ static void __devinit dmi_check_onboard_devices(const struct dmi_header *dm, ...@@ -901,7 +900,7 @@ static void __devinit dmi_check_onboard_devices(const struct dmi_header *dm,
} }
/* Register optional slaves */ /* Register optional slaves */
static void __devinit i801_probe_optional_slaves(struct i801_priv *priv) static void i801_probe_optional_slaves(struct i801_priv *priv)
{ {
/* Only register slaves on main SMBus channel */ /* Only register slaves on main SMBus channel */
if (priv->features & FEATURE_IDF) if (priv->features & FEATURE_IDF)
...@@ -921,7 +920,7 @@ static void __devinit i801_probe_optional_slaves(struct i801_priv *priv) ...@@ -921,7 +920,7 @@ static void __devinit i801_probe_optional_slaves(struct i801_priv *priv)
} }
#else #else
static void __init input_apanel_init(void) {} static void __init input_apanel_init(void) {}
static void __devinit i801_probe_optional_slaves(struct i801_priv *priv) {} static void i801_probe_optional_slaves(struct i801_priv *priv) {}
#endif /* CONFIG_X86 && CONFIG_DMI */ #endif /* CONFIG_X86 && CONFIG_DMI */
#if (defined CONFIG_I2C_MUX_GPIO || defined CONFIG_I2C_MUX_GPIO_MODULE) && \ #if (defined CONFIG_I2C_MUX_GPIO || defined CONFIG_I2C_MUX_GPIO_MODULE) && \
...@@ -944,7 +943,7 @@ static struct i801_mux_config i801_mux_config_asus_z8_d18 = { ...@@ -944,7 +943,7 @@ static struct i801_mux_config i801_mux_config_asus_z8_d18 = {
.n_gpios = 2, .n_gpios = 2,
}; };
static struct dmi_system_id __devinitdata mux_dmi_table[] = { static const struct dmi_system_id mux_dmi_table[] = {
{ {
.matches = { .matches = {
DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
...@@ -1012,7 +1011,7 @@ static struct dmi_system_id __devinitdata mux_dmi_table[] = { ...@@ -1012,7 +1011,7 @@ static struct dmi_system_id __devinitdata mux_dmi_table[] = {
}; };
/* Setup multiplexing if needed */ /* Setup multiplexing if needed */
static int __devinit i801_add_mux(struct i801_priv *priv) static int i801_add_mux(struct i801_priv *priv)
{ {
struct device *dev = &priv->adapter.dev; struct device *dev = &priv->adapter.dev;
const struct i801_mux_config *mux_config; const struct i801_mux_config *mux_config;
...@@ -1048,13 +1047,13 @@ static int __devinit i801_add_mux(struct i801_priv *priv) ...@@ -1048,13 +1047,13 @@ static int __devinit i801_add_mux(struct i801_priv *priv)
return 0; return 0;
} }
static void __devexit i801_del_mux(struct i801_priv *priv) static void i801_del_mux(struct i801_priv *priv)
{ {
if (priv->mux_pdev) if (priv->mux_pdev)
platform_device_unregister(priv->mux_pdev); platform_device_unregister(priv->mux_pdev);
} }
static unsigned int __devinit i801_get_adapter_class(struct i801_priv *priv) static unsigned int i801_get_adapter_class(struct i801_priv *priv)
{ {
const struct dmi_system_id *id; const struct dmi_system_id *id;
const struct i801_mux_config *mux_config; const struct i801_mux_config *mux_config;
...@@ -1084,8 +1083,7 @@ static inline unsigned int i801_get_adapter_class(struct i801_priv *priv) ...@@ -1084,8 +1083,7 @@ static inline unsigned int i801_get_adapter_class(struct i801_priv *priv)
} }
#endif #endif
static int __devinit i801_probe(struct pci_dev *dev, static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
unsigned char temp; unsigned char temp;
int err, i; int err, i;
...@@ -1226,7 +1224,7 @@ static int __devinit i801_probe(struct pci_dev *dev, ...@@ -1226,7 +1224,7 @@ static int __devinit i801_probe(struct pci_dev *dev,
return err; return err;
} }
static void __devexit i801_remove(struct pci_dev *dev) static void i801_remove(struct pci_dev *dev)
{ {
struct i801_priv *priv = pci_get_drvdata(dev); struct i801_priv *priv = pci_get_drvdata(dev);
...@@ -1272,7 +1270,7 @@ static struct pci_driver i801_driver = { ...@@ -1272,7 +1270,7 @@ static struct pci_driver i801_driver = {
.name = "i801_smbus", .name = "i801_smbus",
.id_table = i801_ids, .id_table = i801_ids,
.probe = i801_probe, .probe = i801_probe,
.remove = __devexit_p(i801_remove), .remove = i801_remove,
.suspend = i801_suspend, .suspend = i801_suspend,
.resume = i801_resume, .resume = i801_resume,
}; };
......
drivers/i2c/busses/i2c-ibm_iic.c
View file @ 637704cb
...@@ -660,7 +660,7 @@ static inline u8 iic_clckdiv(unsigned int opb) ...@@ -660,7 +660,7 @@ static inline u8 iic_clckdiv(unsigned int opb)
return (u8)((opb + 9) / 10 - 1); return (u8)((opb + 9) / 10 - 1);
} }
static int __devinit iic_request_irq(struct platform_device *ofdev, static int iic_request_irq(struct platform_device *ofdev,
struct ibm_iic_private *dev) struct ibm_iic_private *dev)
{ {
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;
...@@ -691,7 +691,7 @@ static int __devinit iic_request_irq(struct platform_device *ofdev, ...@@ -691,7 +691,7 @@ static int __devinit iic_request_irq(struct platform_device *ofdev,
/* /*
* Register single IIC interface * Register single IIC interface
*/ */
static int __devinit iic_probe(struct platform_device *ofdev) static int iic_probe(struct platform_device *ofdev)
{ {
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;
struct ibm_iic_private *dev; struct ibm_iic_private *dev;
...@@ -781,7 +781,7 @@ static int __devinit iic_probe(struct platform_device *ofdev) ...@@ -781,7 +781,7 @@ static int __devinit iic_probe(struct platform_device *ofdev)
/* /*
* Cleanup initialized IIC interface * Cleanup initialized IIC interface
*/ */
static int __devexit iic_remove(struct platform_device *ofdev) static int iic_remove(struct platform_device *ofdev)
{ {
struct ibm_iic_private *dev = dev_get_drvdata(&ofdev->dev); struct ibm_iic_private *dev = dev_get_drvdata(&ofdev->dev);
...@@ -812,7 +812,7 @@ static struct platform_driver ibm_iic_driver = { ...@@ -812,7 +812,7 @@ static struct platform_driver ibm_iic_driver = {
.of_match_table = ibm_iic_match, .of_match_table = ibm_iic_match,
}, },
.probe = iic_probe, .probe = iic_probe,
.remove = __devexit_p(iic_remove), .remove = iic_remove,
}; };
module_platform_driver(ibm_iic_driver); module_platform_driver(ibm_iic_driver);
drivers/i2c/busses/i2c-intel-mid.c
View file @ 637704cb
...@@ -947,7 +947,7 @@ static const struct dev_pm_ops intel_mid_i2c_pm_ops = { ...@@ -947,7 +947,7 @@ static const struct dev_pm_ops intel_mid_i2c_pm_ops = {
* 5. Call intel_mid_i2c_hwinit() for hardware initialization * 5. Call intel_mid_i2c_hwinit() for hardware initialization
* 6. Register I2C adapter in i2c-core * 6. Register I2C adapter in i2c-core
*/ */
static int __devinit intel_mid_i2c_probe(struct pci_dev *dev, static int intel_mid_i2c_probe(struct pci_dev *dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct intel_mid_i2c_private *mrst; struct intel_mid_i2c_private *mrst;
...@@ -1079,7 +1079,7 @@ static int __devinit intel_mid_i2c_probe(struct pci_dev *dev, ...@@ -1079,7 +1079,7 @@ static int __devinit intel_mid_i2c_probe(struct pci_dev *dev,
return err; return err;
} }
static void __devexit intel_mid_i2c_remove(struct pci_dev *dev) static void intel_mid_i2c_remove(struct pci_dev *dev)
{ {
struct intel_mid_i2c_private *mrst = pci_get_drvdata(dev); struct intel_mid_i2c_private *mrst = pci_get_drvdata(dev);
intel_mid_i2c_disable(&mrst->adap); intel_mid_i2c_disable(&mrst->adap);
...@@ -1113,7 +1113,7 @@ static struct pci_driver intel_mid_i2c_driver = { ...@@ -1113,7 +1113,7 @@ static struct pci_driver intel_mid_i2c_driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.id_table = intel_mid_i2c_ids, .id_table = intel_mid_i2c_ids,
.probe = intel_mid_i2c_probe, .probe = intel_mid_i2c_probe,
.remove = __devexit_p(intel_mid_i2c_remove), .remove = intel_mid_i2c_remove,
}; };
module_pci_driver(intel_mid_i2c_driver); module_pci_driver(intel_mid_i2c_driver);
......
drivers/i2c/busses/i2c-isch.c
View file @ 637704cb
...@@ -249,7 +249,7 @@ static struct i2c_adapter sch_adapter = { ...@@ -249,7 +249,7 @@ static struct i2c_adapter sch_adapter = {
.algo = &smbus_algorithm, .algo = &smbus_algorithm,
}; };
static int __devinit smbus_sch_probe(struct platform_device *dev) static int smbus_sch_probe(struct platform_device *dev)
{ {
struct resource *res; struct resource *res;
int retval; int retval;
...@@ -284,7 +284,7 @@ static int __devinit smbus_sch_probe(struct platform_device *dev) ...@@ -284,7 +284,7 @@ static int __devinit smbus_sch_probe(struct platform_device *dev)
return retval; return retval;
} }
static int __devexit smbus_sch_remove(struct platform_device *pdev) static int smbus_sch_remove(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
if (sch_smba) { if (sch_smba) {
...@@ -303,7 +303,7 @@ static struct platform_driver smbus_sch_driver = { ...@@ -303,7 +303,7 @@ static struct platform_driver smbus_sch_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = smbus_sch_probe, .probe = smbus_sch_probe,
.remove = __devexit_p(smbus_sch_remove), .remove = smbus_sch_remove,
}; };
module_platform_driver(smbus_sch_driver); module_platform_driver(smbus_sch_driver);
......
drivers/i2c/busses/i2c-mpc.c
View file @ 637704cb
...@@ -175,7 +175,7 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing) ...@@ -175,7 +175,7 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing)
} }
#if defined(CONFIG_PPC_MPC52xx) || defined(CONFIG_PPC_MPC512x) #if defined(CONFIG_PPC_MPC52xx) || defined(CONFIG_PPC_MPC512x)
static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] __devinitconst = { static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] = {
{20, 0x20}, {22, 0x21}, {24, 0x22}, {26, 0x23}, {20, 0x20}, {22, 0x21}, {24, 0x22}, {26, 0x23},
{28, 0x24}, {30, 0x01}, {32, 0x25}, {34, 0x02}, {28, 0x24}, {30, 0x01}, {32, 0x25}, {34, 0x02},
{36, 0x26}, {40, 0x27}, {44, 0x04}, {48, 0x28}, {36, 0x26}, {40, 0x27}, {44, 0x04}, {48, 0x28},
...@@ -196,7 +196,7 @@ static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] __devinitconst = { ...@@ -196,7 +196,7 @@ static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] __devinitconst = {
{10240, 0x9d}, {12288, 0x9e}, {15360, 0x9f} {10240, 0x9d}, {12288, 0x9e}, {15360, 0x9f}
}; };
static int __devinit mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock, static int mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock,
int prescaler, u32 *real_clk) int prescaler, u32 *real_clk)
{ {
const struct mpc_i2c_divider *div = NULL; const struct mpc_i2c_divider *div = NULL;
...@@ -230,7 +230,7 @@ static int __devinit mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock, ...@@ -230,7 +230,7 @@ static int __devinit mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock,
return (int)div->fdr; return (int)div->fdr;
} }
static void __devinit mpc_i2c_setup_52xx(struct device_node *node, static void mpc_i2c_setup_52xx(struct device_node *node,
struct mpc_i2c *i2c, struct mpc_i2c *i2c,
u32 clock, u32 prescaler) u32 clock, u32 prescaler)
{ {
...@@ -252,7 +252,7 @@ static void __devinit mpc_i2c_setup_52xx(struct device_node *node, ...@@ -252,7 +252,7 @@ static void __devinit mpc_i2c_setup_52xx(struct device_node *node,
fdr); fdr);
} }
#else /* !(CONFIG_PPC_MPC52xx || CONFIG_PPC_MPC512x) */ #else /* !(CONFIG_PPC_MPC52xx || CONFIG_PPC_MPC512x) */
static void __devinit mpc_i2c_setup_52xx(struct device_node *node, static void mpc_i2c_setup_52xx(struct device_node *node,
struct mpc_i2c *i2c, struct mpc_i2c *i2c,
u32 clock, u32 prescaler) u32 clock, u32 prescaler)
{ {
...@@ -260,7 +260,7 @@ static void __devinit mpc_i2c_setup_52xx(struct device_node *node, ...@@ -260,7 +260,7 @@ static void __devinit mpc_i2c_setup_52xx(struct device_node *node,
#endif /* CONFIG_PPC_MPC52xx || CONFIG_PPC_MPC512x */ #endif /* CONFIG_PPC_MPC52xx || CONFIG_PPC_MPC512x */
#ifdef CONFIG_PPC_MPC512x #ifdef CONFIG_PPC_MPC512x
static void __devinit mpc_i2c_setup_512x(struct device_node *node, static void mpc_i2c_setup_512x(struct device_node *node,
struct mpc_i2c *i2c, struct mpc_i2c *i2c,
u32 clock, u32 prescaler) u32 clock, u32 prescaler)
{ {
...@@ -288,7 +288,7 @@ static void __devinit mpc_i2c_setup_512x(struct device_node *node, ...@@ -288,7 +288,7 @@ static void __devinit mpc_i2c_setup_512x(struct device_node *node,
mpc_i2c_setup_52xx(node, i2c, clock, prescaler); mpc_i2c_setup_52xx(node, i2c, clock, prescaler);
} }
#else /* CONFIG_PPC_MPC512x */ #else /* CONFIG_PPC_MPC512x */
static void __devinit mpc_i2c_setup_512x(struct device_node *node, static void mpc_i2c_setup_512x(struct device_node *node,
struct mpc_i2c *i2c, struct mpc_i2c *i2c,
u32 clock, u32 prescaler) u32 clock, u32 prescaler)
{ {
...@@ -296,7 +296,7 @@ static void __devinit mpc_i2c_setup_512x(struct device_node *node, ...@@ -296,7 +296,7 @@ static void __devinit mpc_i2c_setup_512x(struct device_node *node,
#endif /* CONFIG_PPC_MPC512x */ #endif /* CONFIG_PPC_MPC512x */
#ifdef CONFIG_FSL_SOC #ifdef CONFIG_FSL_SOC
static const struct mpc_i2c_divider mpc_i2c_dividers_8xxx[] __devinitconst = { static const struct mpc_i2c_divider mpc_i2c_dividers_8xxx[] = {
{160, 0x0120}, {192, 0x0121}, {224, 0x0122}, {256, 0x0123}, {160, 0x0120}, {192, 0x0121}, {224, 0x0122}, {256, 0x0123},
{288, 0x0100}, {320, 0x0101}, {352, 0x0601}, {384, 0x0102}, {288, 0x0100}, {320, 0x0101}, {352, 0x0601}, {384, 0x0102},
{416, 0x0602}, {448, 0x0126}, {480, 0x0103}, {512, 0x0127}, {416, 0x0602}, {448, 0x0126}, {480, 0x0103}, {512, 0x0127},
...@@ -316,7 +316,7 @@ static const struct mpc_i2c_divider mpc_i2c_dividers_8xxx[] __devinitconst = { ...@@ -316,7 +316,7 @@ static const struct mpc_i2c_divider mpc_i2c_dividers_8xxx[] __devinitconst = {
{49152, 0x011e}, {61440, 0x011f} {49152, 0x011e}, {61440, 0x011f}
}; };
static u32 __devinit mpc_i2c_get_sec_cfg_8xxx(void) static u32 mpc_i2c_get_sec_cfg_8xxx(void)
{ {
struct device_node *node = NULL; struct device_node *node = NULL;
u32 __iomem *reg; u32 __iomem *reg;
...@@ -345,7 +345,7 @@ static u32 __devinit mpc_i2c_get_sec_cfg_8xxx(void) ...@@ -345,7 +345,7 @@ static u32 __devinit mpc_i2c_get_sec_cfg_8xxx(void)
return val; return val;
} }
static int __devinit mpc_i2c_get_fdr_8xxx(struct device_node *node, u32 clock, static int mpc_i2c_get_fdr_8xxx(struct device_node *node, u32 clock,
u32 prescaler, u32 *real_clk) u32 prescaler, u32 *real_clk)
{ {
const struct mpc_i2c_divider *div = NULL; const struct mpc_i2c_divider *div = NULL;
...@@ -383,7 +383,7 @@ static int __devinit mpc_i2c_get_fdr_8xxx(struct device_node *node, u32 clock, ...@@ -383,7 +383,7 @@ static int __devinit mpc_i2c_get_fdr_8xxx(struct device_node *node, u32 clock,
return div ? (int)div->fdr : -EINVAL; return div ? (int)div->fdr : -EINVAL;
} }
static void __devinit mpc_i2c_setup_8xxx(struct device_node *node, static void mpc_i2c_setup_8xxx(struct device_node *node,
struct mpc_i2c *i2c, struct mpc_i2c *i2c,
u32 clock, u32 prescaler) u32 clock, u32 prescaler)
{ {
...@@ -408,7 +408,7 @@ static void __devinit mpc_i2c_setup_8xxx(struct device_node *node, ...@@ -408,7 +408,7 @@ static void __devinit mpc_i2c_setup_8xxx(struct device_node *node,
} }
#else /* !CONFIG_FSL_SOC */ #else /* !CONFIG_FSL_SOC */
static void __devinit mpc_i2c_setup_8xxx(struct device_node *node, static void mpc_i2c_setup_8xxx(struct device_node *node,
struct mpc_i2c *i2c, struct mpc_i2c *i2c,
u32 clock, u32 prescaler) u32 clock, u32 prescaler)
{ {
...@@ -615,7 +615,7 @@ static struct i2c_adapter mpc_ops = { ...@@ -615,7 +615,7 @@ static struct i2c_adapter mpc_ops = {
}; };
static const struct of_device_id mpc_i2c_of_match[]; static const struct of_device_id mpc_i2c_of_match[];
static int __devinit fsl_i2c_probe(struct platform_device *op) static int fsl_i2c_probe(struct platform_device *op)
{ {
const struct of_device_id *match; const struct of_device_id *match;
struct mpc_i2c *i2c; struct mpc_i2c *i2c;
...@@ -706,7 +706,7 @@ static int __devinit fsl_i2c_probe(struct platform_device *op) ...@@ -706,7 +706,7 @@ static int __devinit fsl_i2c_probe(struct platform_device *op)
return result; return result;
}; };
static int __devexit fsl_i2c_remove(struct platform_device *op) static int fsl_i2c_remove(struct platform_device *op)
{ {
struct mpc_i2c *i2c = dev_get_drvdata(&op->dev); struct mpc_i2c *i2c = dev_get_drvdata(&op->dev);
...@@ -746,24 +746,24 @@ static int mpc_i2c_resume(struct device *dev) ...@@ -746,24 +746,24 @@ static int mpc_i2c_resume(struct device *dev)
SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume); SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume);
#endif #endif
static const struct mpc_i2c_data mpc_i2c_data_512x __devinitdata = { static const struct mpc_i2c_data mpc_i2c_data_512x = {
.setup = mpc_i2c_setup_512x, .setup = mpc_i2c_setup_512x,
}; };
static const struct mpc_i2c_data mpc_i2c_data_52xx __devinitdata = { static const struct mpc_i2c_data mpc_i2c_data_52xx = {
.setup = mpc_i2c_setup_52xx, .setup = mpc_i2c_setup_52xx,
}; };
static const struct mpc_i2c_data mpc_i2c_data_8313 __devinitdata = { static const struct mpc_i2c_data mpc_i2c_data_8313 = {
.setup = mpc_i2c_setup_8xxx, .setup = mpc_i2c_setup_8xxx,
}; };
static const struct mpc_i2c_data mpc_i2c_data_8543 __devinitdata = { static const struct mpc_i2c_data mpc_i2c_data_8543 = {
.setup = mpc_i2c_setup_8xxx, .setup = mpc_i2c_setup_8xxx,
.prescaler = 2, .prescaler = 2,
}; };
static const struct mpc_i2c_data mpc_i2c_data_8544 __devinitdata = { static const struct mpc_i2c_data mpc_i2c_data_8544 = {
.setup = mpc_i2c_setup_8xxx, .setup = mpc_i2c_setup_8xxx,
.prescaler = 3, .prescaler = 3,
}; };
...@@ -785,7 +785,7 @@ MODULE_DEVICE_TABLE(of, mpc_i2c_of_match); ...@@ -785,7 +785,7 @@ MODULE_DEVICE_TABLE(of, mpc_i2c_of_match);
/* Structure for a device driver */ /* Structure for a device driver */
static struct platform_driver mpc_i2c_driver = { static struct platform_driver mpc_i2c_driver = {
.probe = fsl_i2c_probe, .probe = fsl_i2c_probe,
.remove = __devexit_p(fsl_i2c_remove), .remove = fsl_i2c_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
......
drivers/i2c/busses/i2c-mv64xxx.c
View file @ 637704cb
...@@ -495,7 +495,7 @@ static const struct i2c_algorithm mv64xxx_i2c_algo = { ...@@ -495,7 +495,7 @@ static const struct i2c_algorithm mv64xxx_i2c_algo = {
* *
***************************************************************************** *****************************************************************************
*/ */
static int __devinit static int
mv64xxx_i2c_map_regs(struct platform_device *pd, mv64xxx_i2c_map_regs(struct platform_device *pd,
struct mv64xxx_i2c_data *drv_data) struct mv64xxx_i2c_data *drv_data)
{ {
...@@ -530,13 +530,13 @@ mv64xxx_i2c_unmap_regs(struct mv64xxx_i2c_data *drv_data) ...@@ -530,13 +530,13 @@ mv64xxx_i2c_unmap_regs(struct mv64xxx_i2c_data *drv_data)
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
static int __devinit static int
mv64xxx_calc_freq(const int tclk, const int n, const int m) mv64xxx_calc_freq(const int tclk, const int n, const int m)
{ {
return tclk / (10 * (m + 1) * (2 << n)); return tclk / (10 * (m + 1) * (2 << n));
} }
static bool __devinit static bool
mv64xxx_find_baud_factors(const u32 req_freq, const u32 tclk, u32 *best_n, mv64xxx_find_baud_factors(const u32 req_freq, const u32 tclk, u32 *best_n,
u32 *best_m) u32 *best_m)
{ {
...@@ -560,7 +560,7 @@ mv64xxx_find_baud_factors(const u32 req_freq, const u32 tclk, u32 *best_n, ...@@ -560,7 +560,7 @@ mv64xxx_find_baud_factors(const u32 req_freq, const u32 tclk, u32 *best_n,
return true; return true;
} }
static int __devinit static int
mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
struct device_node *np) struct device_node *np)
{ {
...@@ -597,7 +597,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, ...@@ -597,7 +597,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
#endif #endif
} }
#else /* CONFIG_OF */ #else /* CONFIG_OF */
static int __devinit static int
mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
struct device_node *np) struct device_node *np)
{ {
...@@ -605,7 +605,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, ...@@ -605,7 +605,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
} }
#endif /* CONFIG_OF */ #endif /* CONFIG_OF */
static int __devinit static int
mv64xxx_i2c_probe(struct platform_device *pd) mv64xxx_i2c_probe(struct platform_device *pd)
{ {
struct mv64xxx_i2c_data *drv_data; struct mv64xxx_i2c_data *drv_data;
...@@ -697,7 +697,7 @@ mv64xxx_i2c_probe(struct platform_device *pd) ...@@ -697,7 +697,7 @@ mv64xxx_i2c_probe(struct platform_device *pd)
return rc; return rc;
} }
static int __devexit static int
mv64xxx_i2c_remove(struct platform_device *dev) mv64xxx_i2c_remove(struct platform_device *dev)
{ {
struct mv64xxx_i2c_data *drv_data = platform_get_drvdata(dev); struct mv64xxx_i2c_data *drv_data = platform_get_drvdata(dev);
...@@ -718,7 +718,7 @@ mv64xxx_i2c_remove(struct platform_device *dev) ...@@ -718,7 +718,7 @@ mv64xxx_i2c_remove(struct platform_device *dev)
return rc; return rc;
} }
static const struct of_device_id mv64xxx_i2c_of_match_table[] __devinitdata = { static const struct of_device_id mv64xxx_i2c_of_match_table[] = {
{ .compatible = "marvell,mv64xxx-i2c", }, { .compatible = "marvell,mv64xxx-i2c", },
{} {}
}; };
...@@ -726,7 +726,7 @@ MODULE_DEVICE_TABLE(of, mv64xxx_i2c_of_match_table); ...@@ -726,7 +726,7 @@ MODULE_DEVICE_TABLE(of, mv64xxx_i2c_of_match_table);
static struct platform_driver mv64xxx_i2c_driver = { static struct platform_driver mv64xxx_i2c_driver = {
.probe = mv64xxx_i2c_probe, .probe = mv64xxx_i2c_probe,
.remove = __devexit_p(mv64xxx_i2c_remove), .remove = mv64xxx_i2c_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = MV64XXX_I2C_CTLR_NAME, .name = MV64XXX_I2C_CTLR_NAME,
......
drivers/i2c/busses/i2c-mxs.c
View file @ 637704cb
...@@ -432,7 +432,7 @@ static int mxs_i2c_get_ofdata(struct mxs_i2c_dev *i2c) ...@@ -432,7 +432,7 @@ static int mxs_i2c_get_ofdata(struct mxs_i2c_dev *i2c)
return 0; return 0;
} }
static int __devinit mxs_i2c_probe(struct platform_device *pdev) static int mxs_i2c_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct mxs_i2c_dev *i2c; struct mxs_i2c_dev *i2c;
...@@ -515,7 +515,7 @@ static int __devinit mxs_i2c_probe(struct platform_device *pdev) ...@@ -515,7 +515,7 @@ static int __devinit mxs_i2c_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit mxs_i2c_remove(struct platform_device *pdev) static int mxs_i2c_remove(struct platform_device *pdev)
{ {
struct mxs_i2c_dev *i2c = platform_get_drvdata(pdev); struct mxs_i2c_dev *i2c = platform_get_drvdata(pdev);
int ret; int ret;
...@@ -546,7 +546,7 @@ static struct platform_driver mxs_i2c_driver = { ...@@ -546,7 +546,7 @@ static struct platform_driver mxs_i2c_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = mxs_i2c_dt_ids, .of_match_table = mxs_i2c_dt_ids,
}, },
.remove = __devexit_p(mxs_i2c_remove), .remove = mxs_i2c_remove,
}; };
static int __init mxs_i2c_init(void) static int __init mxs_i2c_init(void)
......
drivers/i2c/busses/i2c-nforce2.c
View file @ 637704cb
...@@ -117,7 +117,7 @@ struct nforce2_smbus { ...@@ -117,7 +117,7 @@ struct nforce2_smbus {
#define MAX_TIMEOUT 100 #define MAX_TIMEOUT 100
/* We disable the second SMBus channel on these boards */ /* We disable the second SMBus channel on these boards */
static struct dmi_system_id __devinitdata nforce2_dmi_blacklist2[] = { static const struct dmi_system_id nforce2_dmi_blacklist2[] = {
{ {
.ident = "DFI Lanparty NF4 Expert", .ident = "DFI Lanparty NF4 Expert",
.matches = { .matches = {
...@@ -330,8 +330,8 @@ static DEFINE_PCI_DEVICE_TABLE(nforce2_ids) = { ...@@ -330,8 +330,8 @@ static DEFINE_PCI_DEVICE_TABLE(nforce2_ids) = {
MODULE_DEVICE_TABLE (pci, nforce2_ids); MODULE_DEVICE_TABLE (pci, nforce2_ids);
static int __devinit nforce2_probe_smb (struct pci_dev *dev, int bar, static int nforce2_probe_smb(struct pci_dev *dev, int bar, int alt_reg,
int alt_reg, struct nforce2_smbus *smbus, const char *name) struct nforce2_smbus *smbus, const char *name)
{ {
int error; int error;
...@@ -382,7 +382,7 @@ static int __devinit nforce2_probe_smb (struct pci_dev *dev, int bar, ...@@ -382,7 +382,7 @@ static int __devinit nforce2_probe_smb (struct pci_dev *dev, int bar,
} }
static int __devinit nforce2_probe(struct pci_dev *dev, const struct pci_device_id *id) static int nforce2_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct nforce2_smbus *smbuses; struct nforce2_smbus *smbuses;
int res1, res2; int res1, res2;
...@@ -430,7 +430,7 @@ static int __devinit nforce2_probe(struct pci_dev *dev, const struct pci_device_ ...@@ -430,7 +430,7 @@ static int __devinit nforce2_probe(struct pci_dev *dev, const struct pci_device_
} }
static void __devexit nforce2_remove(struct pci_dev *dev) static void nforce2_remove(struct pci_dev *dev)
{ {
struct nforce2_smbus *smbuses = pci_get_drvdata(dev); struct nforce2_smbus *smbuses = pci_get_drvdata(dev);
...@@ -450,7 +450,7 @@ static struct pci_driver nforce2_driver = { ...@@ -450,7 +450,7 @@ static struct pci_driver nforce2_driver = {
.name = "nForce2_smbus", .name = "nForce2_smbus",
.id_table = nforce2_ids, .id_table = nforce2_ids,
.probe = nforce2_probe, .probe = nforce2_probe,
.remove = __devexit_p(nforce2_remove), .remove = nforce2_remove,
}; };
module_pci_driver(nforce2_driver); module_pci_driver(nforce2_driver);
drivers/i2c/busses/i2c-nuc900.c
View file @ 637704cb
...@@ -518,7 +518,7 @@ static const struct i2c_algorithm nuc900_i2c_algorithm = { ...@@ -518,7 +518,7 @@ static const struct i2c_algorithm nuc900_i2c_algorithm = {
* called by the bus driver when a suitable device is found * called by the bus driver when a suitable device is found
*/ */
static int __devinit nuc900_i2c_probe(struct platform_device *pdev) static int nuc900_i2c_probe(struct platform_device *pdev)
{ {
struct nuc900_i2c *i2c; struct nuc900_i2c *i2c;
struct nuc900_platform_i2c *pdata; struct nuc900_platform_i2c *pdata;
...@@ -663,7 +663,7 @@ static int __devinit nuc900_i2c_probe(struct platform_device *pdev) ...@@ -663,7 +663,7 @@ static int __devinit nuc900_i2c_probe(struct platform_device *pdev)
* called when device is removed from the bus * called when device is removed from the bus
*/ */
static int __devexit nuc900_i2c_remove(struct platform_device *pdev) static int nuc900_i2c_remove(struct platform_device *pdev)
{ {
struct nuc900_i2c *i2c = platform_get_drvdata(pdev); struct nuc900_i2c *i2c = platform_get_drvdata(pdev);
...@@ -684,7 +684,7 @@ static int __devexit nuc900_i2c_remove(struct platform_device *pdev) ...@@ -684,7 +684,7 @@ static int __devexit nuc900_i2c_remove(struct platform_device *pdev)
static struct platform_driver nuc900_i2c_driver = { static struct platform_driver nuc900_i2c_driver = {
.probe = nuc900_i2c_probe, .probe = nuc900_i2c_probe,
.remove = __devexit_p(nuc900_i2c_remove), .remove = nuc900_i2c_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "nuc900-i2c0", .name = "nuc900-i2c0",
......
drivers/i2c/busses/i2c-ocores.c
View file @ 637704cb
...@@ -343,7 +343,7 @@ static int ocores_i2c_of_probe(struct platform_device *pdev, ...@@ -343,7 +343,7 @@ static int ocores_i2c_of_probe(struct platform_device *pdev,
#define ocores_i2c_of_probe(pdev,i2c) -ENODEV #define ocores_i2c_of_probe(pdev,i2c) -ENODEV
#endif #endif
static int __devinit ocores_i2c_probe(struct platform_device *pdev) static int ocores_i2c_probe(struct platform_device *pdev)
{ {
struct ocores_i2c *i2c; struct ocores_i2c *i2c;
struct ocores_i2c_platform_data *pdata; struct ocores_i2c_platform_data *pdata;
...@@ -441,7 +441,7 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev) ...@@ -441,7 +441,7 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit ocores_i2c_remove(struct platform_device *pdev) static int ocores_i2c_remove(struct platform_device *pdev)
{ {
struct ocores_i2c *i2c = platform_get_drvdata(pdev); struct ocores_i2c *i2c = platform_get_drvdata(pdev);
...@@ -485,7 +485,7 @@ static SIMPLE_DEV_PM_OPS(ocores_i2c_pm, ocores_i2c_suspend, ocores_i2c_resume); ...@@ -485,7 +485,7 @@ static SIMPLE_DEV_PM_OPS(ocores_i2c_pm, ocores_i2c_suspend, ocores_i2c_resume);
static struct platform_driver ocores_i2c_driver = { static struct platform_driver ocores_i2c_driver = {
.probe = ocores_i2c_probe, .probe = ocores_i2c_probe,
.remove = __devexit_p(ocores_i2c_remove), .remove = ocores_i2c_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "ocores-i2c", .name = "ocores-i2c",
......
drivers/i2c/busses/i2c-octeon.c
View file @ 637704cb
...@@ -446,7 +446,7 @@ static struct i2c_adapter octeon_i2c_ops = { ...@@ -446,7 +446,7 @@ static struct i2c_adapter octeon_i2c_ops = {
/** /**
* octeon_i2c_setclock - Calculate and set clock divisors. * octeon_i2c_setclock - Calculate and set clock divisors.
*/ */
static int __devinit octeon_i2c_setclock(struct octeon_i2c *i2c) static int octeon_i2c_setclock(struct octeon_i2c *i2c)
{ {
int tclk, thp_base, inc, thp_idx, mdiv_idx, ndiv_idx, foscl, diff; int tclk, thp_base, inc, thp_idx, mdiv_idx, ndiv_idx, foscl, diff;
int thp = 0x18, mdiv = 2, ndiv = 0, delta_hz = 1000000; int thp = 0x18, mdiv = 2, ndiv = 0, delta_hz = 1000000;
...@@ -489,7 +489,7 @@ static int __devinit octeon_i2c_setclock(struct octeon_i2c *i2c) ...@@ -489,7 +489,7 @@ static int __devinit octeon_i2c_setclock(struct octeon_i2c *i2c)
return 0; return 0;
} }
static int __devinit octeon_i2c_initlowlevel(struct octeon_i2c *i2c) static int octeon_i2c_initlowlevel(struct octeon_i2c *i2c)
{ {
u8 status; u8 status;
int tries; int tries;
...@@ -510,7 +510,7 @@ static int __devinit octeon_i2c_initlowlevel(struct octeon_i2c *i2c) ...@@ -510,7 +510,7 @@ static int __devinit octeon_i2c_initlowlevel(struct octeon_i2c *i2c)
return -EIO; return -EIO;
} }
static int __devinit octeon_i2c_probe(struct platform_device *pdev) static int octeon_i2c_probe(struct platform_device *pdev)
{ {
int irq, result = 0; int irq, result = 0;
struct octeon_i2c *i2c; struct octeon_i2c *i2c;
...@@ -609,7 +609,7 @@ static int __devinit octeon_i2c_probe(struct platform_device *pdev) ...@@ -609,7 +609,7 @@ static int __devinit octeon_i2c_probe(struct platform_device *pdev)
return result; return result;
}; };
static int __devexit octeon_i2c_remove(struct platform_device *pdev) static int octeon_i2c_remove(struct platform_device *pdev)
{ {
struct octeon_i2c *i2c = platform_get_drvdata(pdev); struct octeon_i2c *i2c = platform_get_drvdata(pdev);
...@@ -628,7 +628,7 @@ MODULE_DEVICE_TABLE(of, octeon_i2c_match); ...@@ -628,7 +628,7 @@ MODULE_DEVICE_TABLE(of, octeon_i2c_match);
static struct platform_driver octeon_i2c_driver = { static struct platform_driver octeon_i2c_driver = {
.probe = octeon_i2c_probe, .probe = octeon_i2c_probe,
.remove = __devexit_p(octeon_i2c_remove), .remove = octeon_i2c_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
......
drivers/i2c/busses/i2c-omap.c
View file @ 637704cb
...@@ -1069,7 +1069,7 @@ MODULE_DEVICE_TABLE(of, omap_i2c_of_match); ...@@ -1069,7 +1069,7 @@ MODULE_DEVICE_TABLE(of, omap_i2c_of_match);
#define OMAP_I2C_SCHEME_0 0 #define OMAP_I2C_SCHEME_0 0
#define OMAP_I2C_SCHEME_1 1 #define OMAP_I2C_SCHEME_1 1
static int __devinit static int
omap_i2c_probe(struct platform_device *pdev) omap_i2c_probe(struct platform_device *pdev)
{ {
struct omap_i2c_dev *dev; struct omap_i2c_dev *dev;
...@@ -1267,7 +1267,7 @@ omap_i2c_probe(struct platform_device *pdev) ...@@ -1267,7 +1267,7 @@ omap_i2c_probe(struct platform_device *pdev)
return r; return r;
} }
static int __devexit omap_i2c_remove(struct platform_device *pdev) static int omap_i2c_remove(struct platform_device *pdev)
{ {
struct omap_i2c_dev *dev = platform_get_drvdata(pdev); struct omap_i2c_dev *dev = platform_get_drvdata(pdev);
int ret; int ret;
...@@ -1333,7 +1333,7 @@ static struct dev_pm_ops omap_i2c_pm_ops = { ...@@ -1333,7 +1333,7 @@ static struct dev_pm_ops omap_i2c_pm_ops = {
static struct platform_driver omap_i2c_driver = { static struct platform_driver omap_i2c_driver = {
.probe = omap_i2c_probe, .probe = omap_i2c_probe,
.remove = __devexit_p(omap_i2c_remove), .remove = omap_i2c_remove,
.driver = { .driver = {
.name = "omap_i2c", .name = "omap_i2c",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/i2c/busses/i2c-parport-light.c
View file @ 637704cb
...@@ -135,7 +135,7 @@ static struct lineop parport_ctrl_irq = { ...@@ -135,7 +135,7 @@ static struct lineop parport_ctrl_irq = {
.port = PORT_CTRL, .port = PORT_CTRL,
}; };
static int __devinit i2c_parport_probe(struct platform_device *pdev) static int i2c_parport_probe(struct platform_device *pdev)
{ {
int err; int err;
...@@ -169,7 +169,7 @@ static int __devinit i2c_parport_probe(struct platform_device *pdev) ...@@ -169,7 +169,7 @@ static int __devinit i2c_parport_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit i2c_parport_remove(struct platform_device *pdev) static int i2c_parport_remove(struct platform_device *pdev)
{ {
if (ara) { if (ara) {
line_set(0, &parport_ctrl_irq); line_set(0, &parport_ctrl_irq);
...@@ -191,7 +191,7 @@ static struct platform_driver i2c_parport_driver = { ...@@ -191,7 +191,7 @@ static struct platform_driver i2c_parport_driver = {
.name = DRVNAME, .name = DRVNAME,
}, },
.probe = i2c_parport_probe, .probe = i2c_parport_probe,
.remove = __devexit_p(i2c_parport_remove), .remove = i2c_parport_remove,
}; };
static int __init i2c_parport_device_add(u16 address) static int __init i2c_parport_device_add(u16 address)
......
drivers/i2c/busses/i2c-pasemi.c
View file @ 637704cb
...@@ -340,7 +340,7 @@ static const struct i2c_algorithm smbus_algorithm = { ...@@ -340,7 +340,7 @@ static const struct i2c_algorithm smbus_algorithm = {
.functionality = pasemi_smb_func, .functionality = pasemi_smb_func,
}; };
static int __devinit pasemi_smb_probe(struct pci_dev *dev, static int pasemi_smb_probe(struct pci_dev *dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct pasemi_smbus *smbus; struct pasemi_smbus *smbus;
...@@ -392,7 +392,7 @@ static int __devinit pasemi_smb_probe(struct pci_dev *dev, ...@@ -392,7 +392,7 @@ static int __devinit pasemi_smb_probe(struct pci_dev *dev,
return error; return error;
} }
static void __devexit pasemi_smb_remove(struct pci_dev *dev) static void pasemi_smb_remove(struct pci_dev *dev)
{ {
struct pasemi_smbus *smbus = pci_get_drvdata(dev); struct pasemi_smbus *smbus = pci_get_drvdata(dev);
...@@ -412,7 +412,7 @@ static struct pci_driver pasemi_smb_driver = { ...@@ -412,7 +412,7 @@ static struct pci_driver pasemi_smb_driver = {
.name = "i2c-pasemi", .name = "i2c-pasemi",
.id_table = pasemi_smb_ids, .id_table = pasemi_smb_ids,
.probe = pasemi_smb_probe, .probe = pasemi_smb_probe,
.remove = __devexit_p(pasemi_smb_remove), .remove = pasemi_smb_remove,
}; };
module_pci_driver(pasemi_smb_driver); module_pci_driver(pasemi_smb_driver);
......
drivers/i2c/busses/i2c-pca-isa.c
View file @ 637704cb
...@@ -119,7 +119,7 @@ static struct i2c_adapter pca_isa_ops = { ...@@ -119,7 +119,7 @@ static struct i2c_adapter pca_isa_ops = {
.timeout = HZ, .timeout = HZ,
}; };
static int __devinit pca_isa_match(struct device *dev, unsigned int id) static int pca_isa_match(struct device *dev, unsigned int id)
{ {
int match = base != 0; int match = base != 0;
...@@ -132,7 +132,7 @@ static int __devinit pca_isa_match(struct device *dev, unsigned int id) ...@@ -132,7 +132,7 @@ static int __devinit pca_isa_match(struct device *dev, unsigned int id)
return match; return match;
} }
static int __devinit pca_isa_probe(struct device *dev, unsigned int id) static int pca_isa_probe(struct device *dev, unsigned int id)
{ {
init_waitqueue_head(&pca_wait); init_waitqueue_head(&pca_wait);
...@@ -174,7 +174,7 @@ static int __devinit pca_isa_probe(struct device *dev, unsigned int id) ...@@ -174,7 +174,7 @@ static int __devinit pca_isa_probe(struct device *dev, unsigned int id)
return -ENODEV; return -ENODEV;
} }
static int __devexit pca_isa_remove(struct device *dev, unsigned int id) static int pca_isa_remove(struct device *dev, unsigned int id)
{ {
i2c_del_adapter(&pca_isa_ops); i2c_del_adapter(&pca_isa_ops);
...@@ -190,7 +190,7 @@ static int __devexit pca_isa_remove(struct device *dev, unsigned int id) ...@@ -190,7 +190,7 @@ static int __devexit pca_isa_remove(struct device *dev, unsigned int id)
static struct isa_driver pca_isa_driver = { static struct isa_driver pca_isa_driver = {
.match = pca_isa_match, .match = pca_isa_match,
.probe = pca_isa_probe, .probe = pca_isa_probe,
.remove = __devexit_p(pca_isa_remove), .remove = pca_isa_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = DRIVER, .name = DRIVER,
......
drivers/i2c/busses/i2c-pca-platform.c
View file @ 637704cb
...@@ -131,7 +131,7 @@ static irqreturn_t i2c_pca_pf_handler(int this_irq, void *dev_id) ...@@ -131,7 +131,7 @@ static irqreturn_t i2c_pca_pf_handler(int this_irq, void *dev_id)
} }
static int __devinit i2c_pca_pf_probe(struct platform_device *pdev) static int i2c_pca_pf_probe(struct platform_device *pdev)
{ {
struct i2c_pca_pf_data *i2c; struct i2c_pca_pf_data *i2c;
struct resource *res; struct resource *res;
...@@ -257,7 +257,7 @@ static int __devinit i2c_pca_pf_probe(struct platform_device *pdev) ...@@ -257,7 +257,7 @@ static int __devinit i2c_pca_pf_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit i2c_pca_pf_remove(struct platform_device *pdev) static int i2c_pca_pf_remove(struct platform_device *pdev)
{ {
struct i2c_pca_pf_data *i2c = platform_get_drvdata(pdev); struct i2c_pca_pf_data *i2c = platform_get_drvdata(pdev);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
...@@ -279,7 +279,7 @@ static int __devexit i2c_pca_pf_remove(struct platform_device *pdev) ...@@ -279,7 +279,7 @@ static int __devexit i2c_pca_pf_remove(struct platform_device *pdev)
static struct platform_driver i2c_pca_pf_driver = { static struct platform_driver i2c_pca_pf_driver = {
.probe = i2c_pca_pf_probe, .probe = i2c_pca_pf_probe,
.remove = __devexit_p(i2c_pca_pf_remove), .remove = i2c_pca_pf_remove,
.driver = { .driver = {
.name = "i2c-pca-platform", .name = "i2c-pca-platform",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/i2c/busses/i2c-piix4.c
View file @ 637704cb
...@@ -99,7 +99,7 @@ MODULE_PARM_DESC(force_addr, ...@@ -99,7 +99,7 @@ MODULE_PARM_DESC(force_addr,
static int srvrworks_csb5_delay; static int srvrworks_csb5_delay;
static struct pci_driver piix4_driver; static struct pci_driver piix4_driver;
static struct dmi_system_id __devinitdata piix4_dmi_blacklist[] = { static const struct dmi_system_id piix4_dmi_blacklist[] = {
{ {
.ident = "Sapphire AM2RD790", .ident = "Sapphire AM2RD790",
.matches = { .matches = {
...@@ -119,7 +119,7 @@ static struct dmi_system_id __devinitdata piix4_dmi_blacklist[] = { ...@@ -119,7 +119,7 @@ static struct dmi_system_id __devinitdata piix4_dmi_blacklist[] = {
/* The IBM entry is in a separate table because we only check it /* The IBM entry is in a separate table because we only check it
on Intel-based systems */ on Intel-based systems */
static struct dmi_system_id __devinitdata piix4_dmi_ibm[] = { static const struct dmi_system_id piix4_dmi_ibm[] = {
{ {
.ident = "IBM", .ident = "IBM",
.matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
...@@ -131,7 +131,7 @@ struct i2c_piix4_adapdata { ...@@ -131,7 +131,7 @@ struct i2c_piix4_adapdata {
unsigned short smba; unsigned short smba;
}; };
static int __devinit piix4_setup(struct pci_dev *PIIX4_dev, static int piix4_setup(struct pci_dev *PIIX4_dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
unsigned char temp; unsigned char temp;
...@@ -230,7 +230,7 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev, ...@@ -230,7 +230,7 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,
return piix4_smba; return piix4_smba;
} }
static int __devinit piix4_setup_sb800(struct pci_dev *PIIX4_dev, static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
unsigned short piix4_smba; unsigned short piix4_smba;
...@@ -294,7 +294,7 @@ static int __devinit piix4_setup_sb800(struct pci_dev *PIIX4_dev, ...@@ -294,7 +294,7 @@ static int __devinit piix4_setup_sb800(struct pci_dev *PIIX4_dev,
return piix4_smba; return piix4_smba;
} }
static int __devinit piix4_setup_aux(struct pci_dev *PIIX4_dev, static int piix4_setup_aux(struct pci_dev *PIIX4_dev,
const struct pci_device_id *id, const struct pci_device_id *id,
unsigned short base_reg_addr) unsigned short base_reg_addr)
{ {
...@@ -540,8 +540,7 @@ MODULE_DEVICE_TABLE (pci, piix4_ids); ...@@ -540,8 +540,7 @@ MODULE_DEVICE_TABLE (pci, piix4_ids);
static struct i2c_adapter *piix4_main_adapter; static struct i2c_adapter *piix4_main_adapter;
static struct i2c_adapter *piix4_aux_adapter; static struct i2c_adapter *piix4_aux_adapter;
static int __devinit piix4_add_adapter(struct pci_dev *dev, static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
unsigned short smba,
struct i2c_adapter **padap) struct i2c_adapter **padap)
{ {
struct i2c_adapter *adap; struct i2c_adapter *adap;
...@@ -588,8 +587,7 @@ static int __devinit piix4_add_adapter(struct pci_dev *dev, ...@@ -588,8 +587,7 @@ static int __devinit piix4_add_adapter(struct pci_dev *dev,
return 0; return 0;
} }
static int __devinit piix4_probe(struct pci_dev *dev, static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
int retval; int retval;
...@@ -626,7 +624,7 @@ static int __devinit piix4_probe(struct pci_dev *dev, ...@@ -626,7 +624,7 @@ static int __devinit piix4_probe(struct pci_dev *dev,
return 0; return 0;
} }
static void __devexit piix4_adap_remove(struct i2c_adapter *adap) static void piix4_adap_remove(struct i2c_adapter *adap)
{ {
struct i2c_piix4_adapdata *adapdata = i2c_get_adapdata(adap); struct i2c_piix4_adapdata *adapdata = i2c_get_adapdata(adap);
...@@ -638,7 +636,7 @@ static void __devexit piix4_adap_remove(struct i2c_adapter *adap) ...@@ -638,7 +636,7 @@ static void __devexit piix4_adap_remove(struct i2c_adapter *adap)
} }
} }
static void __devexit piix4_remove(struct pci_dev *dev) static void piix4_remove(struct pci_dev *dev)
{ {
if (piix4_main_adapter) { if (piix4_main_adapter) {
piix4_adap_remove(piix4_main_adapter); piix4_adap_remove(piix4_main_adapter);
...@@ -655,7 +653,7 @@ static struct pci_driver piix4_driver = { ...@@ -655,7 +653,7 @@ static struct pci_driver piix4_driver = {
.name = "piix4_smbus", .name = "piix4_smbus",
.id_table = piix4_ids, .id_table = piix4_ids,
.probe = piix4_probe, .probe = piix4_probe,
.remove = __devexit_p(piix4_remove), .remove = piix4_remove,
}; };
module_pci_driver(piix4_driver); module_pci_driver(piix4_driver);
......
drivers/i2c/busses/i2c-pmcmsp.c
View file @ 637704cb
...@@ -270,7 +270,7 @@ static irqreturn_t pmcmsptwi_interrupt(int irq, void *ptr) ...@@ -270,7 +270,7 @@ static irqreturn_t pmcmsptwi_interrupt(int irq, void *ptr)
/* /*
* Probe for and register the device and return 0 if there is one. * Probe for and register the device and return 0 if there is one.
*/ */
static int __devinit pmcmsptwi_probe(struct platform_device *pldev) static int pmcmsptwi_probe(struct platform_device *pldev)
{ {
struct resource *res; struct resource *res;
int rc = -ENODEV; int rc = -ENODEV;
...@@ -368,7 +368,7 @@ static int __devinit pmcmsptwi_probe(struct platform_device *pldev) ...@@ -368,7 +368,7 @@ static int __devinit pmcmsptwi_probe(struct platform_device *pldev)
/* /*
* Release the device and return 0 if there is one. * Release the device and return 0 if there is one.
*/ */
static int __devexit pmcmsptwi_remove(struct platform_device *pldev) static int pmcmsptwi_remove(struct platform_device *pldev)
{ {
struct resource *res; struct resource *res;
...@@ -628,7 +628,7 @@ static struct i2c_adapter pmcmsptwi_adapter = { ...@@ -628,7 +628,7 @@ static struct i2c_adapter pmcmsptwi_adapter = {
static struct platform_driver pmcmsptwi_driver = { static struct platform_driver pmcmsptwi_driver = {
.probe = pmcmsptwi_probe, .probe = pmcmsptwi_probe,
.remove = __devexit_p(pmcmsptwi_remove), .remove = pmcmsptwi_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/i2c/busses/i2c-pnx.c
View file @ 637704cb
...@@ -619,7 +619,7 @@ static SIMPLE_DEV_PM_OPS(i2c_pnx_pm, ...@@ -619,7 +619,7 @@ static SIMPLE_DEV_PM_OPS(i2c_pnx_pm,
#define PNX_I2C_PM NULL #define PNX_I2C_PM NULL
#endif #endif
static int __devinit i2c_pnx_probe(struct platform_device *pdev) static int i2c_pnx_probe(struct platform_device *pdev)
{ {
unsigned long tmp; unsigned long tmp;
int ret = 0; int ret = 0;
...@@ -765,7 +765,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev) ...@@ -765,7 +765,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit i2c_pnx_remove(struct platform_device *pdev) static int i2c_pnx_remove(struct platform_device *pdev)
{ {
struct i2c_pnx_algo_data *alg_data = platform_get_drvdata(pdev); struct i2c_pnx_algo_data *alg_data = platform_get_drvdata(pdev);
...@@ -797,7 +797,7 @@ static struct platform_driver i2c_pnx_driver = { ...@@ -797,7 +797,7 @@ static struct platform_driver i2c_pnx_driver = {
.pm = PNX_I2C_PM, .pm = PNX_I2C_PM,
}, },
.probe = i2c_pnx_probe, .probe = i2c_pnx_probe,
.remove = __devexit_p(i2c_pnx_remove), .remove = i2c_pnx_remove,
}; };
static int __init i2c_adap_pnx_init(void) static int __init i2c_adap_pnx_init(void)
......
drivers/i2c/busses/i2c-powermac.c
View file @ 637704cb
...@@ -210,7 +210,7 @@ static const struct i2c_algorithm i2c_powermac_algorithm = { ...@@ -210,7 +210,7 @@ static const struct i2c_algorithm i2c_powermac_algorithm = {
}; };
static int __devexit i2c_powermac_remove(struct platform_device *dev) static int i2c_powermac_remove(struct platform_device *dev)
{ {
struct i2c_adapter *adapter = platform_get_drvdata(dev); struct i2c_adapter *adapter = platform_get_drvdata(dev);
int rc; int rc;
...@@ -227,7 +227,7 @@ static int __devexit i2c_powermac_remove(struct platform_device *dev) ...@@ -227,7 +227,7 @@ static int __devexit i2c_powermac_remove(struct platform_device *dev)
return 0; return 0;
} }
static u32 __devinit i2c_powermac_get_addr(struct i2c_adapter *adap, static u32 i2c_powermac_get_addr(struct i2c_adapter *adap,
struct pmac_i2c_bus *bus, struct pmac_i2c_bus *bus,
struct device_node *node) struct device_node *node)
{ {
...@@ -255,7 +255,7 @@ static u32 __devinit i2c_powermac_get_addr(struct i2c_adapter *adap, ...@@ -255,7 +255,7 @@ static u32 __devinit i2c_powermac_get_addr(struct i2c_adapter *adap,
return 0xffffffff; return 0xffffffff;
} }
static void __devinit i2c_powermac_create_one(struct i2c_adapter *adap, static void i2c_powermac_create_one(struct i2c_adapter *adap,
const char *type, const char *type,
u32 addr) u32 addr)
{ {
...@@ -271,7 +271,7 @@ static void __devinit i2c_powermac_create_one(struct i2c_adapter *adap, ...@@ -271,7 +271,7 @@ static void __devinit i2c_powermac_create_one(struct i2c_adapter *adap,
type); type);
} }
static void __devinit i2c_powermac_add_missing(struct i2c_adapter *adap, static void i2c_powermac_add_missing(struct i2c_adapter *adap,
struct pmac_i2c_bus *bus, struct pmac_i2c_bus *bus,
bool found_onyx) bool found_onyx)
{ {
...@@ -297,7 +297,7 @@ static void __devinit i2c_powermac_add_missing(struct i2c_adapter *adap, ...@@ -297,7 +297,7 @@ static void __devinit i2c_powermac_add_missing(struct i2c_adapter *adap,
} }
} }
static bool __devinit i2c_powermac_get_type(struct i2c_adapter *adap, static bool i2c_powermac_get_type(struct i2c_adapter *adap,
struct device_node *node, struct device_node *node,
u32 addr, char *type, int type_size) u32 addr, char *type, int type_size)
{ {
...@@ -336,7 +336,7 @@ static bool __devinit i2c_powermac_get_type(struct i2c_adapter *adap, ...@@ -336,7 +336,7 @@ static bool __devinit i2c_powermac_get_type(struct i2c_adapter *adap,
return false; return false;
} }
static void __devinit i2c_powermac_register_devices(struct i2c_adapter *adap, static void i2c_powermac_register_devices(struct i2c_adapter *adap,
struct pmac_i2c_bus *bus) struct pmac_i2c_bus *bus)
{ {
struct i2c_client *newdev; struct i2c_client *newdev;
...@@ -403,7 +403,7 @@ static void __devinit i2c_powermac_register_devices(struct i2c_adapter *adap, ...@@ -403,7 +403,7 @@ static void __devinit i2c_powermac_register_devices(struct i2c_adapter *adap,
i2c_powermac_add_missing(adap, bus, found_onyx); i2c_powermac_add_missing(adap, bus, found_onyx);
} }
static int __devinit i2c_powermac_probe(struct platform_device *dev) static int i2c_powermac_probe(struct platform_device *dev)
{ {
struct pmac_i2c_bus *bus = dev->dev.platform_data; struct pmac_i2c_bus *bus = dev->dev.platform_data;
struct device_node *parent = NULL; struct device_node *parent = NULL;
...@@ -467,7 +467,7 @@ static int __devinit i2c_powermac_probe(struct platform_device *dev) ...@@ -467,7 +467,7 @@ static int __devinit i2c_powermac_probe(struct platform_device *dev)
static struct platform_driver i2c_powermac_driver = { static struct platform_driver i2c_powermac_driver = {
.probe = i2c_powermac_probe, .probe = i2c_powermac_probe,
.remove = __devexit_p(i2c_powermac_remove), .remove = i2c_powermac_remove,
.driver = { .driver = {
.name = "i2c-powermac", .name = "i2c-powermac",
.bus = &platform_bus_type, .bus = &platform_bus_type,
......
drivers/i2c/busses/i2c-puv3.c
View file @ 637704cb
...@@ -184,7 +184,7 @@ static struct i2c_algorithm puv3_i2c_algorithm = { ...@@ -184,7 +184,7 @@ static struct i2c_algorithm puv3_i2c_algorithm = {
/* /*
* Main initialization routine. * Main initialization routine.
*/ */
static int __devinit puv3_i2c_probe(struct platform_device *pdev) static int puv3_i2c_probe(struct platform_device *pdev)
{ {
struct i2c_adapter *adapter; struct i2c_adapter *adapter;
struct resource *mem; struct resource *mem;
...@@ -231,7 +231,7 @@ static int __devinit puv3_i2c_probe(struct platform_device *pdev) ...@@ -231,7 +231,7 @@ static int __devinit puv3_i2c_probe(struct platform_device *pdev)
return rc; return rc;
} }
static int __devexit puv3_i2c_remove(struct platform_device *pdev) static int puv3_i2c_remove(struct platform_device *pdev)
{ {
struct i2c_adapter *adapter = platform_get_drvdata(pdev); struct i2c_adapter *adapter = platform_get_drvdata(pdev);
struct resource *mem; struct resource *mem;
...@@ -276,7 +276,7 @@ static SIMPLE_DEV_PM_OPS(puv3_i2c_pm, puv3_i2c_suspend, NULL); ...@@ -276,7 +276,7 @@ static SIMPLE_DEV_PM_OPS(puv3_i2c_pm, puv3_i2c_suspend, NULL);
static struct platform_driver puv3_i2c_driver = { static struct platform_driver puv3_i2c_driver = {
.probe = puv3_i2c_probe, .probe = puv3_i2c_probe,
.remove = __devexit_p(puv3_i2c_remove), .remove = puv3_i2c_remove,
.driver = { .driver = {
.name = "PKUnity-v3-I2C", .name = "PKUnity-v3-I2C",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/i2c/busses/i2c-pxa-pci.c
View file @ 637704cb
...@@ -94,7 +94,7 @@ static struct platform_device *add_i2c_device(struct pci_dev *dev, int bar) ...@@ -94,7 +94,7 @@ static struct platform_device *add_i2c_device(struct pci_dev *dev, int bar)
return ERR_PTR(ret); return ERR_PTR(ret);
} }
static int __devinit ce4100_i2c_probe(struct pci_dev *dev, static int ce4100_i2c_probe(struct pci_dev *dev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int ret; int ret;
...@@ -135,7 +135,7 @@ static int __devinit ce4100_i2c_probe(struct pci_dev *dev, ...@@ -135,7 +135,7 @@ static int __devinit ce4100_i2c_probe(struct pci_dev *dev,
return ret; return ret;
} }
static void __devexit ce4100_i2c_remove(struct pci_dev *dev) static void ce4100_i2c_remove(struct pci_dev *dev)
{ {
struct ce4100_devices *sds; struct ce4100_devices *sds;
unsigned int i; unsigned int i;
...@@ -160,7 +160,7 @@ static struct pci_driver ce4100_i2c_driver = { ...@@ -160,7 +160,7 @@ static struct pci_driver ce4100_i2c_driver = {
.name = "ce4100_i2c", .name = "ce4100_i2c",
.id_table = ce4100_i2c_devices, .id_table = ce4100_i2c_devices,
.probe = ce4100_i2c_probe, .probe = ce4100_i2c_probe,
.remove = __devexit_p(ce4100_i2c_remove), .remove = ce4100_i2c_remove,
}; };
module_pci_driver(ce4100_i2c_driver); module_pci_driver(ce4100_i2c_driver);
......
drivers/i2c/busses/i2c-rcar.c
View file @ 637704cb
...@@ -613,7 +613,7 @@ static const struct i2c_algorithm rcar_i2c_algo = { ...@@ -613,7 +613,7 @@ static const struct i2c_algorithm rcar_i2c_algo = {
.functionality = rcar_i2c_func, .functionality = rcar_i2c_func,
}; };
static int __devinit rcar_i2c_probe(struct platform_device *pdev) static int rcar_i2c_probe(struct platform_device *pdev)
{ {
struct i2c_rcar_platform_data *pdata = pdev->dev.platform_data; struct i2c_rcar_platform_data *pdata = pdev->dev.platform_data;
struct rcar_i2c_priv *priv; struct rcar_i2c_priv *priv;
...@@ -682,7 +682,7 @@ static int __devinit rcar_i2c_probe(struct platform_device *pdev) ...@@ -682,7 +682,7 @@ static int __devinit rcar_i2c_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit rcar_i2c_remove(struct platform_device *pdev) static int rcar_i2c_remove(struct platform_device *pdev)
{ {
struct rcar_i2c_priv *priv = platform_get_drvdata(pdev); struct rcar_i2c_priv *priv = platform_get_drvdata(pdev);
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
...@@ -699,7 +699,7 @@ static struct platform_driver rcar_i2c_driver = { ...@@ -699,7 +699,7 @@ static struct platform_driver rcar_i2c_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = rcar_i2c_probe, .probe = rcar_i2c_probe,
.remove = __devexit_p(rcar_i2c_remove), .remove = rcar_i2c_remove,
}; };
module_platform_driver(rcar_i2c_driver); module_platform_driver(rcar_i2c_driver);
......
drivers/i2c/busses/i2c-s6000.c
View file @ 637704cb
...@@ -248,7 +248,7 @@ static struct i2c_algorithm s6i2c_algorithm = { ...@@ -248,7 +248,7 @@ static struct i2c_algorithm s6i2c_algorithm = {
.functionality = s6i2c_functionality, .functionality = s6i2c_functionality,
}; };
static u16 __devinit nanoseconds_on_clk(struct s6i2c_if *iface, u32 ns) static u16 nanoseconds_on_clk(struct s6i2c_if *iface, u32 ns)
{ {
u32 dividend = ((clk_get_rate(iface->clk) / 1000) * ns) / 1000000; u32 dividend = ((clk_get_rate(iface->clk) / 1000) * ns) / 1000000;
if (dividend > 0xffff) if (dividend > 0xffff)
...@@ -256,7 +256,7 @@ static u16 __devinit nanoseconds_on_clk(struct s6i2c_if *iface, u32 ns) ...@@ -256,7 +256,7 @@ static u16 __devinit nanoseconds_on_clk(struct s6i2c_if *iface, u32 ns)
return dividend; return dividend;
} }
static int __devinit s6i2c_probe(struct platform_device *dev) static int s6i2c_probe(struct platform_device *dev)
{ {
struct s6i2c_if *iface = &s6i2c_if; struct s6i2c_if *iface = &s6i2c_if;
struct i2c_adapter *p_adap; struct i2c_adapter *p_adap;
...@@ -361,7 +361,7 @@ static int __devinit s6i2c_probe(struct platform_device *dev) ...@@ -361,7 +361,7 @@ static int __devinit s6i2c_probe(struct platform_device *dev)
return rc; return rc;
} }
static int __devexit s6i2c_remove(struct platform_device *pdev) static int s6i2c_remove(struct platform_device *pdev)
{ {
struct s6i2c_if *iface = platform_get_drvdata(pdev); struct s6i2c_if *iface = platform_get_drvdata(pdev);
i2c_wr16(iface, S6_I2C_ENABLE, 0); i2c_wr16(iface, S6_I2C_ENABLE, 0);
...@@ -378,7 +378,7 @@ static int __devexit s6i2c_remove(struct platform_device *pdev) ...@@ -378,7 +378,7 @@ static int __devexit s6i2c_remove(struct platform_device *pdev)
static struct platform_driver s6i2c_driver = { static struct platform_driver s6i2c_driver = {
.probe = s6i2c_probe, .probe = s6i2c_probe,
.remove = __devexit_p(s6i2c_remove), .remove = s6i2c_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/i2c/busses/i2c-sh7760.c
View file @ 637704cb
...@@ -390,7 +390,7 @@ static const struct i2c_algorithm sh7760_i2c_algo = { ...@@ -390,7 +390,7 @@ static const struct i2c_algorithm sh7760_i2c_algo = {
* iclk = mclk/(CDF + 1). iclk must be < 20MHz. * iclk = mclk/(CDF + 1). iclk must be < 20MHz.
* scl = iclk/(SCGD*8 + 20). * scl = iclk/(SCGD*8 + 20).
*/ */
static int __devinit calc_CCR(unsigned long scl_hz) static int calc_CCR(unsigned long scl_hz)
{ {
struct clk *mclk; struct clk *mclk;
unsigned long mck, m1, dff, odff, iclk; unsigned long mck, m1, dff, odff, iclk;
...@@ -430,7 +430,7 @@ static int __devinit calc_CCR(unsigned long scl_hz) ...@@ -430,7 +430,7 @@ static int __devinit calc_CCR(unsigned long scl_hz)
return ((scgdm << 2) | cdfm); return ((scgdm << 2) | cdfm);
} }
static int __devinit sh7760_i2c_probe(struct platform_device *pdev) static int sh7760_i2c_probe(struct platform_device *pdev)
{ {
struct sh7760_i2c_platdata *pd; struct sh7760_i2c_platdata *pd;
struct resource *res; struct resource *res;
...@@ -536,7 +536,7 @@ static int __devinit sh7760_i2c_probe(struct platform_device *pdev) ...@@ -536,7 +536,7 @@ static int __devinit sh7760_i2c_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit sh7760_i2c_remove(struct platform_device *pdev) static int sh7760_i2c_remove(struct platform_device *pdev)
{ {
struct cami2c *id = platform_get_drvdata(pdev); struct cami2c *id = platform_get_drvdata(pdev);
...@@ -557,7 +557,7 @@ static struct platform_driver sh7760_i2c_drv = { ...@@ -557,7 +557,7 @@ static struct platform_driver sh7760_i2c_drv = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = sh7760_i2c_probe, .probe = sh7760_i2c_probe,
.remove = __devexit_p(sh7760_i2c_remove), .remove = sh7760_i2c_remove,
}; };
module_platform_driver(sh7760_i2c_drv); module_platform_driver(sh7760_i2c_drv);
......
drivers/i2c/busses/i2c-sh_mobile.c
View file @ 637704cb
...@@ -758,7 +758,7 @@ static const struct dev_pm_ops sh_mobile_i2c_dev_pm_ops = { ...@@ -758,7 +758,7 @@ static const struct dev_pm_ops sh_mobile_i2c_dev_pm_ops = {
.runtime_resume = sh_mobile_i2c_runtime_nop, .runtime_resume = sh_mobile_i2c_runtime_nop,
}; };
static const struct of_device_id sh_mobile_i2c_dt_ids[] __devinitconst = { static const struct of_device_id sh_mobile_i2c_dt_ids[] = {
{ .compatible = "renesas,rmobile-iic", }, { .compatible = "renesas,rmobile-iic", },
{}, {},
}; };
......
drivers/i2c/busses/i2c-sirf.c
View file @ 637704cb
...@@ -258,7 +258,7 @@ static const struct i2c_algorithm i2c_sirfsoc_algo = { ...@@ -258,7 +258,7 @@ static const struct i2c_algorithm i2c_sirfsoc_algo = {
.functionality = i2c_sirfsoc_func, .functionality = i2c_sirfsoc_func,
}; };
static int __devinit i2c_sirfsoc_probe(struct platform_device *pdev) static int i2c_sirfsoc_probe(struct platform_device *pdev)
{ {
struct sirfsoc_i2c *siic; struct sirfsoc_i2c *siic;
struct i2c_adapter *adap; struct i2c_adapter *adap;
...@@ -385,7 +385,7 @@ static int __devinit i2c_sirfsoc_probe(struct platform_device *pdev) ...@@ -385,7 +385,7 @@ static int __devinit i2c_sirfsoc_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit i2c_sirfsoc_remove(struct platform_device *pdev) static int i2c_sirfsoc_remove(struct platform_device *pdev)
{ {
struct i2c_adapter *adapter = platform_get_drvdata(pdev); struct i2c_adapter *adapter = platform_get_drvdata(pdev);
struct sirfsoc_i2c *siic = adapter->algo_data; struct sirfsoc_i2c *siic = adapter->algo_data;
...@@ -433,7 +433,7 @@ static const struct dev_pm_ops i2c_sirfsoc_pm_ops = { ...@@ -433,7 +433,7 @@ static const struct dev_pm_ops i2c_sirfsoc_pm_ops = {
}; };
#endif #endif
static const struct of_device_id sirfsoc_i2c_of_match[] __devinitconst = { static const struct of_device_id sirfsoc_i2c_of_match[] = {
{ .compatible = "sirf,prima2-i2c", }, { .compatible = "sirf,prima2-i2c", },
{}, {},
}; };
...@@ -449,7 +449,7 @@ static struct platform_driver i2c_sirfsoc_driver = { ...@@ -449,7 +449,7 @@ static struct platform_driver i2c_sirfsoc_driver = {
.of_match_table = sirfsoc_i2c_of_match, .of_match_table = sirfsoc_i2c_of_match,
}, },
.probe = i2c_sirfsoc_probe, .probe = i2c_sirfsoc_probe,
.remove = __devexit_p(i2c_sirfsoc_remove), .remove = i2c_sirfsoc_remove,
}; };
module_platform_driver(i2c_sirfsoc_driver); module_platform_driver(i2c_sirfsoc_driver);
......
drivers/i2c/busses/i2c-sis5595.c
View file @ 637704cb
...@@ -142,7 +142,7 @@ static void sis5595_write(u8 reg, u8 data) ...@@ -142,7 +142,7 @@ static void sis5595_write(u8 reg, u8 data)
outb(data, sis5595_base + SMB_DAT); outb(data, sis5595_base + SMB_DAT);
} }
static int __devinit sis5595_setup(struct pci_dev *SIS5595_dev) static int sis5595_setup(struct pci_dev *SIS5595_dev)
{ {
u16 a; u16 a;
u8 val; u8 val;
...@@ -376,7 +376,7 @@ static DEFINE_PCI_DEVICE_TABLE(sis5595_ids) = { ...@@ -376,7 +376,7 @@ static DEFINE_PCI_DEVICE_TABLE(sis5595_ids) = {
MODULE_DEVICE_TABLE (pci, sis5595_ids); MODULE_DEVICE_TABLE (pci, sis5595_ids);
static int __devinit sis5595_probe(struct pci_dev *dev, const struct pci_device_id *id) static int sis5595_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
int err; int err;
......
drivers/i2c/busses/i2c-sis630.c
View file @ 637704cb
...@@ -389,7 +389,7 @@ static u32 sis630_func(struct i2c_adapter *adapter) ...@@ -389,7 +389,7 @@ static u32 sis630_func(struct i2c_adapter *adapter)
I2C_FUNC_SMBUS_BLOCK_DATA; 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; unsigned char b;
struct pci_dev *dummy = NULL; struct pci_dev *dummy = NULL;
...@@ -480,7 +480,7 @@ static DEFINE_PCI_DEVICE_TABLE(sis630_ids) = { ...@@ -480,7 +480,7 @@ static DEFINE_PCI_DEVICE_TABLE(sis630_ids) = {
MODULE_DEVICE_TABLE (pci, 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)) { if (sis630_setup(dev)) {
dev_err(&dev->dev, "SIS630 comp. bus not detected, module not inserted.\n"); 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 ...@@ -496,7 +496,7 @@ static int __devinit sis630_probe(struct pci_dev *dev, const struct pci_device_i
return i2c_add_adapter(&sis630_adapter); 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) { if (acpi_base) {
i2c_del_adapter(&sis630_adapter); i2c_del_adapter(&sis630_adapter);
...@@ -510,7 +510,7 @@ static struct pci_driver sis630_driver = { ...@@ -510,7 +510,7 @@ static struct pci_driver sis630_driver = {
.name = "sis630_smbus", .name = "sis630_smbus",
.id_table = sis630_ids, .id_table = sis630_ids,
.probe = sis630_probe, .probe = sis630_probe,
.remove = __devexit_p(sis630_remove), .remove = sis630_remove,
}; };
module_pci_driver(sis630_driver); module_pci_driver(sis630_driver);
......
drivers/i2c/busses/i2c-sis96x.c
View file @ 637704cb
...@@ -252,7 +252,7 @@ static DEFINE_PCI_DEVICE_TABLE(sis96x_ids) = { ...@@ -252,7 +252,7 @@ static DEFINE_PCI_DEVICE_TABLE(sis96x_ids) = {
MODULE_DEVICE_TABLE (pci, sis96x_ids); MODULE_DEVICE_TABLE (pci, sis96x_ids);
static int __devinit sis96x_probe(struct pci_dev *dev, static int sis96x_probe(struct pci_dev *dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
u16 ww = 0; u16 ww = 0;
...@@ -308,7 +308,7 @@ static int __devinit sis96x_probe(struct pci_dev *dev, ...@@ -308,7 +308,7 @@ static int __devinit sis96x_probe(struct pci_dev *dev,
return retval; return retval;
} }
static void __devexit sis96x_remove(struct pci_dev *dev) static void sis96x_remove(struct pci_dev *dev)
{ {
if (sis96x_smbus_base) { if (sis96x_smbus_base) {
i2c_del_adapter(&sis96x_adapter); i2c_del_adapter(&sis96x_adapter);
...@@ -321,7 +321,7 @@ static struct pci_driver sis96x_driver = { ...@@ -321,7 +321,7 @@ static struct pci_driver sis96x_driver = {
.name = "sis96x_smbus", .name = "sis96x_smbus",
.id_table = sis96x_ids, .id_table = sis96x_ids,
.probe = sis96x_probe, .probe = sis96x_probe,
.remove = __devexit_p(sis96x_remove), .remove = sis96x_remove,
}; };
module_pci_driver(sis96x_driver); module_pci_driver(sis96x_driver);
......
drivers/i2c/busses/i2c-tegra.c
View file @ 637704cb
...@@ -642,7 +642,7 @@ static const struct tegra_i2c_hw_feature tegra30_i2c_hw = { ...@@ -642,7 +642,7 @@ static const struct tegra_i2c_hw_feature tegra30_i2c_hw = {
#if defined(CONFIG_OF) #if defined(CONFIG_OF)
/* Match table for of_platform binding */ /* Match table for of_platform binding */
static const struct of_device_id tegra_i2c_of_match[] __devinitconst = { static const struct of_device_id tegra_i2c_of_match[] = {
{ .compatible = "nvidia,tegra30-i2c", .data = &tegra30_i2c_hw, }, { .compatible = "nvidia,tegra30-i2c", .data = &tegra30_i2c_hw, },
{ .compatible = "nvidia,tegra20-i2c", .data = &tegra20_i2c_hw, }, { .compatible = "nvidia,tegra20-i2c", .data = &tegra20_i2c_hw, },
{ .compatible = "nvidia,tegra20-i2c-dvc", .data = &tegra20_i2c_hw, }, { .compatible = "nvidia,tegra20-i2c-dvc", .data = &tegra20_i2c_hw, },
...@@ -651,7 +651,7 @@ static const struct of_device_id tegra_i2c_of_match[] __devinitconst = { ...@@ -651,7 +651,7 @@ static const struct of_device_id tegra_i2c_of_match[] __devinitconst = {
MODULE_DEVICE_TABLE(of, tegra_i2c_of_match); MODULE_DEVICE_TABLE(of, tegra_i2c_of_match);
#endif #endif
static int __devinit tegra_i2c_probe(struct platform_device *pdev) static int tegra_i2c_probe(struct platform_device *pdev)
{ {
struct tegra_i2c_dev *i2c_dev; struct tegra_i2c_dev *i2c_dev;
struct tegra_i2c_platform_data *pdata = pdev->dev.platform_data; struct tegra_i2c_platform_data *pdata = pdev->dev.platform_data;
...@@ -769,7 +769,7 @@ static int __devinit tegra_i2c_probe(struct platform_device *pdev) ...@@ -769,7 +769,7 @@ static int __devinit tegra_i2c_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit tegra_i2c_remove(struct platform_device *pdev) static int tegra_i2c_remove(struct platform_device *pdev)
{ {
struct tegra_i2c_dev *i2c_dev = platform_get_drvdata(pdev); struct tegra_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
i2c_del_adapter(&i2c_dev->adapter); i2c_del_adapter(&i2c_dev->adapter);
...@@ -817,7 +817,7 @@ static SIMPLE_DEV_PM_OPS(tegra_i2c_pm, tegra_i2c_suspend, tegra_i2c_resume); ...@@ -817,7 +817,7 @@ static SIMPLE_DEV_PM_OPS(tegra_i2c_pm, tegra_i2c_suspend, tegra_i2c_resume);
static struct platform_driver tegra_i2c_driver = { static struct platform_driver tegra_i2c_driver = {
.probe = tegra_i2c_probe, .probe = tegra_i2c_probe,
.remove = __devexit_p(tegra_i2c_remove), .remove = tegra_i2c_remove,
.driver = { .driver = {
.name = "tegra-i2c", .name = "tegra-i2c",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/i2c/busses/i2c-via.c
View file @ 637704cb
...@@ -96,7 +96,7 @@ static DEFINE_PCI_DEVICE_TABLE(vt586b_ids) = { ...@@ -96,7 +96,7 @@ static DEFINE_PCI_DEVICE_TABLE(vt586b_ids) = {
MODULE_DEVICE_TABLE (pci, vt586b_ids); MODULE_DEVICE_TABLE (pci, vt586b_ids);
static int __devinit vt586b_probe(struct pci_dev *dev, const struct pci_device_id *id) static int vt586b_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
u16 base; u16 base;
u8 rev; u8 rev;
...@@ -146,7 +146,7 @@ static int __devinit vt586b_probe(struct pci_dev *dev, const struct pci_device_i ...@@ -146,7 +146,7 @@ static int __devinit vt586b_probe(struct pci_dev *dev, const struct pci_device_i
return 0; return 0;
} }
static void __devexit vt586b_remove(struct pci_dev *dev) static void vt586b_remove(struct pci_dev *dev)
{ {
i2c_del_adapter(&vt586b_adapter); i2c_del_adapter(&vt586b_adapter);
release_region(I2C_DIR, IOSPACE); release_region(I2C_DIR, IOSPACE);
...@@ -158,7 +158,7 @@ static struct pci_driver vt586b_driver = { ...@@ -158,7 +158,7 @@ static struct pci_driver vt586b_driver = {
.name = "vt586b_smbus", .name = "vt586b_smbus",
.id_table = vt586b_ids, .id_table = vt586b_ids,
.probe = vt586b_probe, .probe = vt586b_probe,
.remove = __devexit_p(vt586b_remove), .remove = vt586b_remove,
}; };
module_pci_driver(vt586b_driver); module_pci_driver(vt586b_driver);
......
drivers/i2c/busses/i2c-viapro.c
View file @ 637704cb
...@@ -320,7 +320,7 @@ static struct i2c_adapter vt596_adapter = { ...@@ -320,7 +320,7 @@ static struct i2c_adapter vt596_adapter = {
.algo = &smbus_algorithm, .algo = &smbus_algorithm,
}; };
static int __devinit vt596_probe(struct pci_dev *pdev, static int vt596_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
unsigned char temp; unsigned char temp;
......
drivers/i2c/busses/i2c-viperboard.c
View file @ 637704cb
...@@ -360,7 +360,7 @@ static const struct i2c_algorithm vprbrd_algorithm = { ...@@ -360,7 +360,7 @@ static const struct i2c_algorithm vprbrd_algorithm = {
.functionality = vprbrd_i2c_func, .functionality = vprbrd_i2c_func,
}; };
static int __devinit vprbrd_i2c_probe(struct platform_device *pdev) static int vprbrd_i2c_probe(struct platform_device *pdev)
{ {
struct vprbrd *vb = dev_get_drvdata(pdev->dev.parent); struct vprbrd *vb = dev_get_drvdata(pdev->dev.parent);
struct vprbrd_i2c *vb_i2c; struct vprbrd_i2c *vb_i2c;
...@@ -418,7 +418,7 @@ static int __devinit vprbrd_i2c_probe(struct platform_device *pdev) ...@@ -418,7 +418,7 @@ static int __devinit vprbrd_i2c_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit vprbrd_i2c_remove(struct platform_device *pdev) static int vprbrd_i2c_remove(struct platform_device *pdev)
{ {
struct vprbrd_i2c *vb_i2c = platform_get_drvdata(pdev); struct vprbrd_i2c *vb_i2c = platform_get_drvdata(pdev);
int ret; int ret;
...@@ -432,7 +432,7 @@ static struct platform_driver vprbrd_i2c_driver = { ...@@ -432,7 +432,7 @@ static struct platform_driver vprbrd_i2c_driver = {
.driver.name = "viperboard-i2c", .driver.name = "viperboard-i2c",
.driver.owner = THIS_MODULE, .driver.owner = THIS_MODULE,
.probe = vprbrd_i2c_probe, .probe = vprbrd_i2c_probe,
.remove = __devexit_p(vprbrd_i2c_remove), .remove = vprbrd_i2c_remove,
}; };
static int __init vprbrd_i2c_init(void) static int __init vprbrd_i2c_init(void)
......
drivers/i2c/busses/i2c-xiic.c
View file @ 637704cb
...@@ -689,7 +689,7 @@ static struct i2c_adapter xiic_adapter = { ...@@ -689,7 +689,7 @@ static struct i2c_adapter xiic_adapter = {
}; };
static int __devinit xiic_i2c_probe(struct platform_device *pdev) static int xiic_i2c_probe(struct platform_device *pdev)
{ {
struct xiic_i2c *i2c; struct xiic_i2c *i2c;
struct xiic_i2c_platform_data *pdata; struct xiic_i2c_platform_data *pdata;
...@@ -774,7 +774,7 @@ static int __devinit xiic_i2c_probe(struct platform_device *pdev) ...@@ -774,7 +774,7 @@ static int __devinit xiic_i2c_probe(struct platform_device *pdev)
return -ENOENT; return -ENOENT;
} }
static int __devexit xiic_i2c_remove(struct platform_device* pdev) static int xiic_i2c_remove(struct platform_device *pdev)
{ {
struct xiic_i2c *i2c = platform_get_drvdata(pdev); struct xiic_i2c *i2c = platform_get_drvdata(pdev);
struct resource *res; struct resource *res;
...@@ -800,7 +800,7 @@ static int __devexit xiic_i2c_remove(struct platform_device* pdev) ...@@ -800,7 +800,7 @@ static int __devexit xiic_i2c_remove(struct platform_device* pdev)
} }
#if defined(CONFIG_OF) #if defined(CONFIG_OF)
static const struct of_device_id xiic_of_match[] __devinitconst = { static const struct of_device_id xiic_of_match[] = {
{ .compatible = "xlnx,xps-iic-2.00.a", }, { .compatible = "xlnx,xps-iic-2.00.a", },
{}, {},
}; };
...@@ -809,7 +809,7 @@ MODULE_DEVICE_TABLE(of, xiic_of_match); ...@@ -809,7 +809,7 @@ MODULE_DEVICE_TABLE(of, xiic_of_match);
static struct platform_driver xiic_i2c_driver = { static struct platform_driver xiic_i2c_driver = {
.probe = xiic_i2c_probe, .probe = xiic_i2c_probe,
.remove = __devexit_p(xiic_i2c_remove), .remove = xiic_i2c_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = DRIVER_NAME, .name = DRIVER_NAME,
......
drivers/i2c/busses/i2c-xlr.c
View file @ 637704cb
...@@ -214,7 +214,7 @@ static struct i2c_algorithm xlr_i2c_algo = { ...@@ -214,7 +214,7 @@ static struct i2c_algorithm xlr_i2c_algo = {
.functionality = xlr_func, .functionality = xlr_func,
}; };
static int __devinit xlr_i2c_probe(struct platform_device *pdev) static int xlr_i2c_probe(struct platform_device *pdev)
{ {
struct xlr_i2c_private *priv; struct xlr_i2c_private *priv;
struct resource *res; struct resource *res;
...@@ -251,7 +251,7 @@ static int __devinit xlr_i2c_probe(struct platform_device *pdev) ...@@ -251,7 +251,7 @@ static int __devinit xlr_i2c_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit xlr_i2c_remove(struct platform_device *pdev) static int xlr_i2c_remove(struct platform_device *pdev)
{ {
struct xlr_i2c_private *priv; struct xlr_i2c_private *priv;
...@@ -263,7 +263,7 @@ static int __devexit xlr_i2c_remove(struct platform_device *pdev) ...@@ -263,7 +263,7 @@ static int __devexit xlr_i2c_remove(struct platform_device *pdev)
static struct platform_driver xlr_i2c_driver = { static struct platform_driver xlr_i2c_driver = {
.probe = xlr_i2c_probe, .probe = xlr_i2c_probe,
.remove = __devexit_p(xlr_i2c_remove), .remove = xlr_i2c_remove,
.driver = { .driver = {
.name = "xlr-i2cbus", .name = "xlr-i2cbus",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/i2c/busses/scx200_acb.c
View file @ 637704cb
...@@ -389,7 +389,7 @@ static const struct i2c_algorithm scx200_acb_algorithm = { ...@@ -389,7 +389,7 @@ static const struct i2c_algorithm scx200_acb_algorithm = {
static struct scx200_acb_iface *scx200_acb_list; static struct scx200_acb_iface *scx200_acb_list;
static DEFINE_MUTEX(scx200_acb_list_mutex); static DEFINE_MUTEX(scx200_acb_list_mutex);
static __devinit int scx200_acb_probe(struct scx200_acb_iface *iface) static int scx200_acb_probe(struct scx200_acb_iface *iface)
{ {
u8 val; u8 val;
...@@ -424,7 +424,7 @@ static __devinit int scx200_acb_probe(struct scx200_acb_iface *iface) ...@@ -424,7 +424,7 @@ static __devinit int scx200_acb_probe(struct scx200_acb_iface *iface)
return 0; return 0;
} }
static __devinit struct scx200_acb_iface *scx200_create_iface(const char *text, static struct scx200_acb_iface *scx200_create_iface(const char *text,
struct device *dev, int index) struct device *dev, int index)
{ {
struct scx200_acb_iface *iface; struct scx200_acb_iface *iface;
...@@ -449,7 +449,7 @@ static __devinit struct scx200_acb_iface *scx200_create_iface(const char *text, ...@@ -449,7 +449,7 @@ static __devinit struct scx200_acb_iface *scx200_create_iface(const char *text,
return iface; return iface;
} }
static int __devinit scx200_acb_create(struct scx200_acb_iface *iface) static int scx200_acb_create(struct scx200_acb_iface *iface)
{ {
struct i2c_adapter *adapter; struct i2c_adapter *adapter;
int rc; int rc;
...@@ -480,7 +480,7 @@ static int __devinit scx200_acb_create(struct scx200_acb_iface *iface) ...@@ -480,7 +480,7 @@ static int __devinit scx200_acb_create(struct scx200_acb_iface *iface)
return 0; return 0;
} }
static struct scx200_acb_iface * __devinit scx200_create_dev(const char *text, static struct scx200_acb_iface *scx200_create_dev(const char *text,
unsigned long base, int index, struct device *dev) unsigned long base, int index, struct device *dev)
{ {
struct scx200_acb_iface *iface; struct scx200_acb_iface *iface;
...@@ -508,7 +508,7 @@ static struct scx200_acb_iface * __devinit scx200_create_dev(const char *text, ...@@ -508,7 +508,7 @@ static struct scx200_acb_iface * __devinit scx200_create_dev(const char *text,
return NULL; return NULL;
} }
static int __devinit scx200_probe(struct platform_device *pdev) static int scx200_probe(struct platform_device *pdev)
{ {
struct scx200_acb_iface *iface; struct scx200_acb_iface *iface;
struct resource *res; struct resource *res;
...@@ -530,14 +530,14 @@ static int __devinit scx200_probe(struct platform_device *pdev) ...@@ -530,14 +530,14 @@ static int __devinit scx200_probe(struct platform_device *pdev)
return 0; return 0;
} }
static void __devexit scx200_cleanup_iface(struct scx200_acb_iface *iface) static void scx200_cleanup_iface(struct scx200_acb_iface *iface)
{ {
i2c_del_adapter(&iface->adapter); i2c_del_adapter(&iface->adapter);
release_region(iface->base, 8); release_region(iface->base, 8);
kfree(iface); kfree(iface);
} }
static int __devexit scx200_remove(struct platform_device *pdev) static int scx200_remove(struct platform_device *pdev)
{ {
struct scx200_acb_iface *iface; struct scx200_acb_iface *iface;
...@@ -554,7 +554,7 @@ static struct platform_driver scx200_pci_driver = { ...@@ -554,7 +554,7 @@ static struct platform_driver scx200_pci_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = scx200_probe, .probe = scx200_probe,
.remove = __devexit_p(scx200_remove), .remove = scx200_remove,
}; };
static DEFINE_PCI_DEVICE_TABLE(scx200_isa) = { static DEFINE_PCI_DEVICE_TABLE(scx200_isa) = {
......
drivers/i2c/muxes/i2c-mux-gpio.c
View file @ 637704cb
...@@ -53,14 +53,14 @@ static int i2c_mux_gpio_deselect(struct i2c_adapter *adap, void *data, u32 chan) ...@@ -53,14 +53,14 @@ static int i2c_mux_gpio_deselect(struct i2c_adapter *adap, void *data, u32 chan)
return 0; return 0;
} }
static int __devinit match_gpio_chip_by_label(struct gpio_chip *chip, static int match_gpio_chip_by_label(struct gpio_chip *chip,
void *data) void *data)
{ {
return !strcmp(chip->label, data); return !strcmp(chip->label, data);
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
static int __devinit i2c_mux_gpio_probe_dt(struct gpiomux *mux, static int i2c_mux_gpio_probe_dt(struct gpiomux *mux,
struct platform_device *pdev) struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
...@@ -125,14 +125,14 @@ static int __devinit i2c_mux_gpio_probe_dt(struct gpiomux *mux, ...@@ -125,14 +125,14 @@ static int __devinit i2c_mux_gpio_probe_dt(struct gpiomux *mux,
return 0; return 0;
} }
#else #else
static int __devinit i2c_mux_gpio_probe_dt(struct gpiomux *mux, static int i2c_mux_gpio_probe_dt(struct gpiomux *mux,
struct platform_device *pdev) struct platform_device *pdev)
{ {
return 0; return 0;
} }
#endif #endif
static int __devinit i2c_mux_gpio_probe(struct platform_device *pdev) static int i2c_mux_gpio_probe(struct platform_device *pdev)
{ {
struct gpiomux *mux; struct gpiomux *mux;
struct i2c_adapter *parent; struct i2c_adapter *parent;
...@@ -239,7 +239,7 @@ static int __devinit i2c_mux_gpio_probe(struct platform_device *pdev) ...@@ -239,7 +239,7 @@ static int __devinit i2c_mux_gpio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit i2c_mux_gpio_remove(struct platform_device *pdev) static int i2c_mux_gpio_remove(struct platform_device *pdev)
{ {
struct gpiomux *mux = platform_get_drvdata(pdev); struct gpiomux *mux = platform_get_drvdata(pdev);
int i; int i;
...@@ -256,7 +256,7 @@ static int __devexit i2c_mux_gpio_remove(struct platform_device *pdev) ...@@ -256,7 +256,7 @@ static int __devexit i2c_mux_gpio_remove(struct platform_device *pdev)
return 0; return 0;
} }
static const struct of_device_id i2c_mux_gpio_of_match[] __devinitconst = { static const struct of_device_id i2c_mux_gpio_of_match[] = {
{ .compatible = "i2c-mux-gpio", }, { .compatible = "i2c-mux-gpio", },
{}, {},
}; };
...@@ -264,7 +264,7 @@ MODULE_DEVICE_TABLE(of, i2c_mux_gpio_of_match); ...@@ -264,7 +264,7 @@ MODULE_DEVICE_TABLE(of, i2c_mux_gpio_of_match);
static struct platform_driver i2c_mux_gpio_driver = { static struct platform_driver i2c_mux_gpio_driver = {
.probe = i2c_mux_gpio_probe, .probe = i2c_mux_gpio_probe,
.remove = __devexit_p(i2c_mux_gpio_remove), .remove = i2c_mux_gpio_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "i2c-mux-gpio", .name = "i2c-mux-gpio",
......
drivers/i2c/muxes/i2c-mux-pinctrl.c
View file @ 637704cb
...@@ -129,7 +129,7 @@ static inline int i2c_mux_pinctrl_parse_dt(struct i2c_mux_pinctrl *mux, ...@@ -129,7 +129,7 @@ static inline int i2c_mux_pinctrl_parse_dt(struct i2c_mux_pinctrl *mux,
} }
#endif #endif
static int __devinit i2c_mux_pinctrl_probe(struct platform_device *pdev) static int i2c_mux_pinctrl_probe(struct platform_device *pdev)
{ {
struct i2c_mux_pinctrl *mux; struct i2c_mux_pinctrl *mux;
int (*deselect)(struct i2c_adapter *, void *, u32); int (*deselect)(struct i2c_adapter *, void *, u32);
...@@ -241,7 +241,7 @@ static int __devinit i2c_mux_pinctrl_probe(struct platform_device *pdev) ...@@ -241,7 +241,7 @@ static int __devinit i2c_mux_pinctrl_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit i2c_mux_pinctrl_remove(struct platform_device *pdev) static int i2c_mux_pinctrl_remove(struct platform_device *pdev)
{ {
struct i2c_mux_pinctrl *mux = platform_get_drvdata(pdev); struct i2c_mux_pinctrl *mux = platform_get_drvdata(pdev);
int i; int i;
...@@ -255,7 +255,7 @@ static int __devexit i2c_mux_pinctrl_remove(struct platform_device *pdev) ...@@ -255,7 +255,7 @@ static int __devexit i2c_mux_pinctrl_remove(struct platform_device *pdev)
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id i2c_mux_pinctrl_of_match[] __devinitconst = { static const struct of_device_id i2c_mux_pinctrl_of_match[] = {
{ .compatible = "i2c-mux-pinctrl", }, { .compatible = "i2c-mux-pinctrl", },
{}, {},
}; };
...@@ -269,7 +269,7 @@ static struct platform_driver i2c_mux_pinctrl_driver = { ...@@ -269,7 +269,7 @@ static struct platform_driver i2c_mux_pinctrl_driver = {
.of_match_table = of_match_ptr(i2c_mux_pinctrl_of_match), .of_match_table = of_match_ptr(i2c_mux_pinctrl_of_match),
}, },
.probe = i2c_mux_pinctrl_probe, .probe = i2c_mux_pinctrl_probe,
.remove = __devexit_p(i2c_mux_pinctrl_remove), .remove = i2c_mux_pinctrl_remove,
}; };
module_platform_driver(i2c_mux_pinctrl_driver); module_platform_driver(i2c_mux_pinctrl_driver);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7