aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-27 15:59:38 -0500
committerWolfram Sang <w.sang@pengutronix.de>2012-12-22 14:13:45 -0500
commit0b255e927d47b550620dfd3475ee74b0f52e09c8 (patch)
tree79927f5e46b3a196f90c2b93494bb88c35ad06ea /drivers
parenta49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff)
i2c: remove __dev* attributes from subsystem
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Acked-by: Peter Korsgaard <peter.korsgaard@barco.com> (for ocores and mux-gpio) Acked-by: Havard Skinnemoen <hskinnemoen@gmail.com> (for i2c-gpio) Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn> (for puf3) Acked-by: Barry Song <baohua.song@csr.com> (for sirf) Reviewed-by: Jean Delvare <khali@linux-fr.org> [wsa: Fixed "foo* bar" flaws while we are here] Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/busses/i2c-ali1535.c8
-rw-r--r--drivers/i2c/busses/i2c-ali1563.c10
-rw-r--r--drivers/i2c/busses/i2c-ali15x3.c8
-rw-r--r--drivers/i2c/busses/i2c-amd756.c7
-rw-r--r--drivers/i2c/busses/i2c-amd8111.c7
-rw-r--r--drivers/i2c/busses/i2c-at91.c14
-rw-r--r--drivers/i2c/busses/i2c-au1550.c6
-rw-r--r--drivers/i2c/busses/i2c-cpm.c8
-rw-r--r--drivers/i2c/busses/i2c-designware-pcidrv.c6
-rw-r--r--drivers/i2c/busses/i2c-designware-platdrv.c6
-rw-r--r--drivers/i2c/busses/i2c-eg20t.c6
-rw-r--r--drivers/i2c/busses/i2c-elektor.c8
-rw-r--r--drivers/i2c/busses/i2c-gpio.c8
-rw-r--r--drivers/i2c/busses/i2c-highlander.c6
-rw-r--r--drivers/i2c/busses/i2c-hydra.c6
-rw-r--r--drivers/i2c/busses/i2c-i801.c28
-rw-r--r--drivers/i2c/busses/i2c-ibm_iic.c8
-rw-r--r--drivers/i2c/busses/i2c-intel-mid.c6
-rw-r--r--drivers/i2c/busses/i2c-isch.c6
-rw-r--r--drivers/i2c/busses/i2c-mpc.c38
-rw-r--r--drivers/i2c/busses/i2c-mv64xxx.c18
-rw-r--r--drivers/i2c/busses/i2c-mxs.c6
-rw-r--r--drivers/i2c/busses/i2c-nforce2.c12
-rw-r--r--drivers/i2c/busses/i2c-nuc900.c6
-rw-r--r--drivers/i2c/busses/i2c-ocores.c6
-rw-r--r--drivers/i2c/busses/i2c-octeon.c10
-rw-r--r--drivers/i2c/busses/i2c-omap.c6
-rw-r--r--drivers/i2c/busses/i2c-parport-light.c6
-rw-r--r--drivers/i2c/busses/i2c-pasemi.c6
-rw-r--r--drivers/i2c/busses/i2c-pca-isa.c8
-rw-r--r--drivers/i2c/busses/i2c-pca-platform.c6
-rw-r--r--drivers/i2c/busses/i2c-piix4.c32
-rw-r--r--drivers/i2c/busses/i2c-pmcmsp.c6
-rw-r--r--drivers/i2c/busses/i2c-pnx.c6
-rw-r--r--drivers/i2c/busses/i2c-powermac.c16
-rw-r--r--drivers/i2c/busses/i2c-puv3.c6
-rw-r--r--drivers/i2c/busses/i2c-pxa-pci.c6
-rw-r--r--drivers/i2c/busses/i2c-rcar.c6
-rw-r--r--drivers/i2c/busses/i2c-s6000.c8
-rw-r--r--drivers/i2c/busses/i2c-sh7760.c8
-rw-r--r--drivers/i2c/busses/i2c-sh_mobile.c2
-rw-r--r--drivers/i2c/busses/i2c-sirf.c8
-rw-r--r--drivers/i2c/busses/i2c-sis5595.c4
-rw-r--r--drivers/i2c/busses/i2c-sis630.c8
-rw-r--r--drivers/i2c/busses/i2c-sis96x.c6
-rw-r--r--drivers/i2c/busses/i2c-tegra.c8
-rw-r--r--drivers/i2c/busses/i2c-via.c6
-rw-r--r--drivers/i2c/busses/i2c-viapro.c4
-rw-r--r--drivers/i2c/busses/i2c-viperboard.c6
-rw-r--r--drivers/i2c/busses/i2c-xiic.c8
-rw-r--r--drivers/i2c/busses/i2c-xlr.c6
-rw-r--r--drivers/i2c/busses/scx200_acb.c16
-rw-r--r--drivers/i2c/muxes/i2c-mux-gpio.c14
-rw-r--r--drivers/i2c/muxes/i2c-mux-pinctrl.c8
54 files changed, 241 insertions, 247 deletions
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index 125cd8e0ad25..3f491815e2c4 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -139,7 +139,7 @@ static unsigned short ali1535_offset;
139 Note the differences between kernels with the old PCI BIOS interface and 139 Note the differences between kernels with the old PCI BIOS interface and
140 newer kernels with the real PCI interface. In compat.h some things are 140 newer kernels with the real PCI interface. In compat.h some things are
141 defined to make the transition easier. */ 141 defined to make the transition easier. */
142static int __devinit ali1535_setup(struct pci_dev *dev) 142static int ali1535_setup(struct pci_dev *dev)
143{ 143{
144 int retval; 144 int retval;
145 unsigned char temp; 145 unsigned char temp;
@@ -502,7 +502,7 @@ static DEFINE_PCI_DEVICE_TABLE(ali1535_ids) = {
502 502
503MODULE_DEVICE_TABLE(pci, ali1535_ids); 503MODULE_DEVICE_TABLE(pci, ali1535_ids);
504 504
505static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_id *id) 505static int ali1535_probe(struct pci_dev *dev, const struct pci_device_id *id)
506{ 506{
507 if (ali1535_setup(dev)) { 507 if (ali1535_setup(dev)) {
508 dev_warn(&dev->dev, 508 dev_warn(&dev->dev,
@@ -518,7 +518,7 @@ static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_
518 return i2c_add_adapter(&ali1535_adapter); 518 return i2c_add_adapter(&ali1535_adapter);
519} 519}
520 520
521static void __devexit ali1535_remove(struct pci_dev *dev) 521static void ali1535_remove(struct pci_dev *dev)
522{ 522{
523 i2c_del_adapter(&ali1535_adapter); 523 i2c_del_adapter(&ali1535_adapter);
524 release_region(ali1535_smba, ALI1535_SMB_IOSIZE); 524 release_region(ali1535_smba, ALI1535_SMB_IOSIZE);
@@ -528,7 +528,7 @@ static struct pci_driver ali1535_driver = {
528 .name = "ali1535_smbus", 528 .name = "ali1535_smbus",
529 .id_table = ali1535_ids, 529 .id_table = ali1535_ids,
530 .probe = ali1535_probe, 530 .probe = ali1535_probe,
531 .remove = __devexit_p(ali1535_remove), 531 .remove = ali1535_remove,
532}; 532};
533 533
534module_pci_driver(ali1535_driver); 534module_pci_driver(ali1535_driver);
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index e02d9f86c6a0..84ccd9496a5e 100644
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -326,7 +326,7 @@ static u32 ali1563_func(struct i2c_adapter * a)
326} 326}
327 327
328 328
329static int __devinit ali1563_setup(struct pci_dev * dev) 329static int ali1563_setup(struct pci_dev *dev)
330{ 330{
331 u16 ctrl; 331 u16 ctrl;
332 332
@@ -390,8 +390,8 @@ static struct i2c_adapter ali1563_adapter = {
390 .algo = &ali1563_algorithm, 390 .algo = &ali1563_algorithm,
391}; 391};
392 392
393static int __devinit ali1563_probe(struct pci_dev * dev, 393static int ali1563_probe(struct pci_dev *dev,
394 const struct pci_device_id * id_table) 394 const struct pci_device_id *id_table)
395{ 395{
396 int error; 396 int error;
397 397
@@ -411,7 +411,7 @@ exit:
411 return error; 411 return error;
412} 412}
413 413
414static void __devexit ali1563_remove(struct pci_dev * dev) 414static void ali1563_remove(struct pci_dev *dev)
415{ 415{
416 i2c_del_adapter(&ali1563_adapter); 416 i2c_del_adapter(&ali1563_adapter);
417 ali1563_shutdown(dev); 417 ali1563_shutdown(dev);
@@ -428,7 +428,7 @@ static struct pci_driver ali1563_pci_driver = {
428 .name = "ali1563_smbus", 428 .name = "ali1563_smbus",
429 .id_table = ali1563_id_table, 429 .id_table = ali1563_id_table,
430 .probe = ali1563_probe, 430 .probe = ali1563_probe,
431 .remove = __devexit_p(ali1563_remove), 431 .remove = ali1563_remove,
432}; 432};
433 433
434module_pci_driver(ali1563_pci_driver); 434module_pci_driver(ali1563_pci_driver);
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index ce8d26d053a5..26bcc6127cee 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -131,7 +131,7 @@ MODULE_PARM_DESC(force_addr,
131static struct pci_driver ali15x3_driver; 131static struct pci_driver ali15x3_driver;
132static unsigned short ali15x3_smba; 132static unsigned short ali15x3_smba;
133 133
134static int __devinit ali15x3_setup(struct pci_dev *ALI15X3_dev) 134static int ali15x3_setup(struct pci_dev *ALI15X3_dev)
135{ 135{
136 u16 a; 136 u16 a;
137 unsigned char temp; 137 unsigned char temp;
@@ -484,7 +484,7 @@ static DEFINE_PCI_DEVICE_TABLE(ali15x3_ids) = {
484 484
485MODULE_DEVICE_TABLE (pci, ali15x3_ids); 485MODULE_DEVICE_TABLE (pci, ali15x3_ids);
486 486
487static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_id *id) 487static int ali15x3_probe(struct pci_dev *dev, const struct pci_device_id *id)
488{ 488{
489 if (ali15x3_setup(dev)) { 489 if (ali15x3_setup(dev)) {
490 dev_err(&dev->dev, 490 dev_err(&dev->dev,
@@ -500,7 +500,7 @@ static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_
500 return i2c_add_adapter(&ali15x3_adapter); 500 return i2c_add_adapter(&ali15x3_adapter);
501} 501}
502 502
503static void __devexit ali15x3_remove(struct pci_dev *dev) 503static void ali15x3_remove(struct pci_dev *dev)
504{ 504{
505 i2c_del_adapter(&ali15x3_adapter); 505 i2c_del_adapter(&ali15x3_adapter);
506 release_region(ali15x3_smba, ALI15X3_SMB_IOSIZE); 506 release_region(ali15x3_smba, ALI15X3_SMB_IOSIZE);
@@ -510,7 +510,7 @@ static struct pci_driver ali15x3_driver = {
510 .name = "ali15x3_smbus", 510 .name = "ali15x3_smbus",
511 .id_table = ali15x3_ids, 511 .id_table = ali15x3_ids,
512 .probe = ali15x3_probe, 512 .probe = ali15x3_probe,
513 .remove = __devexit_p(ali15x3_remove), 513 .remove = ali15x3_remove,
514}; 514};
515 515
516module_pci_driver(ali15x3_driver); 516module_pci_driver(ali15x3_driver);
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 304aa03b57b2..e13e2aa2d05d 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -324,8 +324,7 @@ static DEFINE_PCI_DEVICE_TABLE(amd756_ids) = {
324 324
325MODULE_DEVICE_TABLE (pci, amd756_ids); 325MODULE_DEVICE_TABLE (pci, amd756_ids);
326 326
327static int __devinit amd756_probe(struct pci_dev *pdev, 327static int amd756_probe(struct pci_dev *pdev, const struct pci_device_id *id)
328 const struct pci_device_id *id)
329{ 328{
330 int nforce = (id->driver_data == NFORCE); 329 int nforce = (id->driver_data == NFORCE);
331 int error; 330 int error;
@@ -397,7 +396,7 @@ static int __devinit amd756_probe(struct pci_dev *pdev,
397 return error; 396 return error;
398} 397}
399 398
400static void __devexit amd756_remove(struct pci_dev *dev) 399static void amd756_remove(struct pci_dev *dev)
401{ 400{
402 i2c_del_adapter(&amd756_smbus); 401 i2c_del_adapter(&amd756_smbus);
403 release_region(amd756_ioport, SMB_IOSIZE); 402 release_region(amd756_ioport, SMB_IOSIZE);
@@ -407,7 +406,7 @@ static struct pci_driver amd756_driver = {
407 .name = "amd756_smbus", 406 .name = "amd756_smbus",
408 .id_table = amd756_ids, 407 .id_table = amd756_ids,
409 .probe = amd756_probe, 408 .probe = amd756_probe,
410 .remove = __devexit_p(amd756_remove), 409 .remove = amd756_remove,
411}; 410};
412 411
413module_pci_driver(amd756_driver); 412module_pci_driver(amd756_driver);
diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c
index 0919ac1d99aa..a44e6e77c5a1 100644
--- a/drivers/i2c/busses/i2c-amd8111.c
+++ b/drivers/i2c/busses/i2c-amd8111.c
@@ -422,8 +422,7 @@ static DEFINE_PCI_DEVICE_TABLE(amd8111_ids) = {
422 422
423MODULE_DEVICE_TABLE (pci, amd8111_ids); 423MODULE_DEVICE_TABLE (pci, amd8111_ids);
424 424
425static int __devinit amd8111_probe(struct pci_dev *dev, 425static int amd8111_probe(struct pci_dev *dev, const struct pci_device_id *id)
426 const struct pci_device_id *id)
427{ 426{
428 struct amd_smbus *smbus; 427 struct amd_smbus *smbus;
429 int error; 428 int error;
@@ -475,7 +474,7 @@ static int __devinit amd8111_probe(struct pci_dev *dev,
475 return error; 474 return error;
476} 475}
477 476
478static void __devexit amd8111_remove(struct pci_dev *dev) 477static void amd8111_remove(struct pci_dev *dev)
479{ 478{
480 struct amd_smbus *smbus = pci_get_drvdata(dev); 479 struct amd_smbus *smbus = pci_get_drvdata(dev);
481 480
@@ -488,7 +487,7 @@ static struct pci_driver amd8111_driver = {
488 .name = "amd8111_smbus2", 487 .name = "amd8111_smbus2",
489 .id_table = amd8111_ids, 488 .id_table = amd8111_ids,
490 .probe = amd8111_probe, 489 .probe = amd8111_probe,
491 .remove = __devexit_p(amd8111_remove), 490 .remove = amd8111_remove,
492}; 491};
493 492
494module_pci_driver(amd8111_driver); 493module_pci_driver(amd8111_driver);
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index b4575ee4bdf3..2bfc04d0a1b1 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -145,7 +145,7 @@ static void at91_init_twi_bus(struct at91_twi_dev *dev)
145 * Calculate symmetric clock as stated in datasheet: 145 * Calculate symmetric clock as stated in datasheet:
146 * twi_clk = F_MAIN / (2 * (cdiv * (1 << ckdiv) + offset)) 146 * twi_clk = F_MAIN / (2 * (cdiv * (1 << ckdiv) + offset))
147 */ 147 */
148static void __devinit at91_calc_twi_clock(struct at91_twi_dev *dev, int twi_clk) 148static void at91_calc_twi_clock(struct at91_twi_dev *dev, int twi_clk)
149{ 149{
150 int ckdiv, cdiv, div; 150 int ckdiv, cdiv, div;
151 struct at91_twi_pdata *pdata = dev->pdata; 151 struct at91_twi_pdata *pdata = dev->pdata;
@@ -604,7 +604,7 @@ MODULE_DEVICE_TABLE(of, atmel_twi_dt_ids);
604#define atmel_twi_dt_ids NULL 604#define atmel_twi_dt_ids NULL
605#endif 605#endif
606 606
607static bool __devinit filter(struct dma_chan *chan, void *slave) 607static bool filter(struct dma_chan *chan, void *slave)
608{ 608{
609 struct at_dma_slave *sl = slave; 609 struct at_dma_slave *sl = slave;
610 610
@@ -616,7 +616,7 @@ static bool __devinit filter(struct dma_chan *chan, void *slave)
616 } 616 }
617} 617}
618 618
619static int __devinit at91_twi_configure_dma(struct at91_twi_dev *dev, u32 phy_addr) 619static int at91_twi_configure_dma(struct at91_twi_dev *dev, u32 phy_addr)
620{ 620{
621 int ret = 0; 621 int ret = 0;
622 struct at_dma_slave *sdata; 622 struct at_dma_slave *sdata;
@@ -688,7 +688,7 @@ error:
688 return ret; 688 return ret;
689} 689}
690 690
691static struct at91_twi_pdata * __devinit at91_twi_get_driver_data( 691static struct at91_twi_pdata *at91_twi_get_driver_data(
692 struct platform_device *pdev) 692 struct platform_device *pdev)
693{ 693{
694 if (pdev->dev.of_node) { 694 if (pdev->dev.of_node) {
@@ -701,7 +701,7 @@ static struct at91_twi_pdata * __devinit at91_twi_get_driver_data(
701 return (struct at91_twi_pdata *) platform_get_device_id(pdev)->driver_data; 701 return (struct at91_twi_pdata *) platform_get_device_id(pdev)->driver_data;
702} 702}
703 703
704static int __devinit at91_twi_probe(struct platform_device *pdev) 704static int at91_twi_probe(struct platform_device *pdev)
705{ 705{
706 struct at91_twi_dev *dev; 706 struct at91_twi_dev *dev;
707 struct resource *mem; 707 struct resource *mem;
@@ -779,7 +779,7 @@ static int __devinit at91_twi_probe(struct platform_device *pdev)
779 return 0; 779 return 0;
780} 780}
781 781
782static int __devexit at91_twi_remove(struct platform_device *pdev) 782static int at91_twi_remove(struct platform_device *pdev)
783{ 783{
784 struct at91_twi_dev *dev = platform_get_drvdata(pdev); 784 struct at91_twi_dev *dev = platform_get_drvdata(pdev);
785 int rc; 785 int rc;
@@ -820,7 +820,7 @@ static const struct dev_pm_ops at91_twi_pm = {
820 820
821static struct platform_driver at91_twi_driver = { 821static struct platform_driver at91_twi_driver = {
822 .probe = at91_twi_probe, 822 .probe = at91_twi_probe,
823 .remove = __devexit_p(at91_twi_remove), 823 .remove = at91_twi_remove,
824 .id_table = at91_twi_devtypes, 824 .id_table = at91_twi_devtypes,
825 .driver = { 825 .driver = {
826 .name = "at91_i2c", 826 .name = "at91_i2c",
diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c
index 582d616db346..b278298787d7 100644
--- a/drivers/i2c/busses/i2c-au1550.c
+++ b/drivers/i2c/busses/i2c-au1550.c
@@ -313,7 +313,7 @@ static void i2c_au1550_disable(struct i2c_au1550_data *priv)
313 * Prior to calling us, the 50MHz clock frequency and routing 313 * Prior to calling us, the 50MHz clock frequency and routing
314 * must have been set up for the PSC indicated by the adapter. 314 * must have been set up for the PSC indicated by the adapter.
315 */ 315 */
316static int __devinit 316static int
317i2c_au1550_probe(struct platform_device *pdev) 317i2c_au1550_probe(struct platform_device *pdev)
318{ 318{
319 struct i2c_au1550_data *priv; 319 struct i2c_au1550_data *priv;
@@ -372,7 +372,7 @@ out:
372 return ret; 372 return ret;
373} 373}
374 374
375static int __devexit i2c_au1550_remove(struct platform_device *pdev) 375static int i2c_au1550_remove(struct platform_device *pdev)
376{ 376{
377 struct i2c_au1550_data *priv = platform_get_drvdata(pdev); 377 struct i2c_au1550_data *priv = platform_get_drvdata(pdev);
378 378
@@ -423,7 +423,7 @@ static struct platform_driver au1xpsc_smbus_driver = {
423 .pm = AU1XPSC_SMBUS_PMOPS, 423 .pm = AU1XPSC_SMBUS_PMOPS,
424 }, 424 },
425 .probe = i2c_au1550_probe, 425 .probe = i2c_au1550_probe,
426 .remove = __devexit_p(i2c_au1550_remove), 426 .remove = i2c_au1550_remove,
427}; 427};
428 428
429module_platform_driver(au1xpsc_smbus_driver); 429module_platform_driver(au1xpsc_smbus_driver);
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index c1e1096ba069..2e79c1024191 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -426,7 +426,7 @@ static const struct i2c_adapter cpm_ops = {
426 .algo = &cpm_i2c_algo, 426 .algo = &cpm_i2c_algo,
427}; 427};
428 428
429static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm) 429static int cpm_i2c_setup(struct cpm_i2c *cpm)
430{ 430{
431 struct platform_device *ofdev = cpm->ofdev; 431 struct platform_device *ofdev = cpm->ofdev;
432 const u32 *data; 432 const u32 *data;
@@ -634,7 +634,7 @@ static void cpm_i2c_shutdown(struct cpm_i2c *cpm)
634 cpm_muram_free(cpm->i2c_addr); 634 cpm_muram_free(cpm->i2c_addr);
635} 635}
636 636
637static int __devinit cpm_i2c_probe(struct platform_device *ofdev) 637static int cpm_i2c_probe(struct platform_device *ofdev)
638{ 638{
639 int result, len; 639 int result, len;
640 struct cpm_i2c *cpm; 640 struct cpm_i2c *cpm;
@@ -688,7 +688,7 @@ out_free:
688 return result; 688 return result;
689} 689}
690 690
691static int __devexit cpm_i2c_remove(struct platform_device *ofdev) 691static int cpm_i2c_remove(struct platform_device *ofdev)
692{ 692{
693 struct cpm_i2c *cpm = dev_get_drvdata(&ofdev->dev); 693 struct cpm_i2c *cpm = dev_get_drvdata(&ofdev->dev);
694 694
@@ -716,7 +716,7 @@ MODULE_DEVICE_TABLE(of, cpm_i2c_match);
716 716
717static struct platform_driver cpm_i2c_driver = { 717static struct platform_driver cpm_i2c_driver = {
718 .probe = cpm_i2c_probe, 718 .probe = cpm_i2c_probe,
719 .remove = __devexit_p(cpm_i2c_remove), 719 .remove = cpm_i2c_remove,
720 .driver = { 720 .driver = {
721 .name = "fsl-i2c-cpm", 721 .name = "fsl-i2c-cpm",
722 .owner = THIS_MODULE, 722 .owner = THIS_MODULE,
diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c
index 92a1e2c15baa..6add851e9dee 100644
--- a/drivers/i2c/busses/i2c-designware-pcidrv.c
+++ b/drivers/i2c/busses/i2c-designware-pcidrv.c
@@ -207,7 +207,7 @@ static u32 i2c_dw_get_clk_rate_khz(struct dw_i2c_dev *dev)
207 return dev->controller->clk_khz; 207 return dev->controller->clk_khz;
208} 208}
209 209
210static int __devinit i2c_dw_pci_probe(struct pci_dev *pdev, 210static int i2c_dw_pci_probe(struct pci_dev *pdev,
211const struct pci_device_id *id) 211const struct pci_device_id *id)
212{ 212{
213 struct dw_i2c_dev *dev; 213 struct dw_i2c_dev *dev;
@@ -328,7 +328,7 @@ exit:
328 return r; 328 return r;
329} 329}
330 330
331static void __devexit i2c_dw_pci_remove(struct pci_dev *pdev) 331static void i2c_dw_pci_remove(struct pci_dev *pdev)
332{ 332{
333 struct dw_i2c_dev *dev = pci_get_drvdata(pdev); 333 struct dw_i2c_dev *dev = pci_get_drvdata(pdev);
334 334
@@ -368,7 +368,7 @@ static struct pci_driver dw_i2c_driver = {
368 .name = DRIVER_NAME, 368 .name = DRIVER_NAME,
369 .id_table = i2_designware_pci_ids, 369 .id_table = i2_designware_pci_ids,
370 .probe = i2c_dw_pci_probe, 370 .probe = i2c_dw_pci_probe,
371 .remove = __devexit_p(i2c_dw_pci_remove), 371 .remove = i2c_dw_pci_remove,
372 .driver = { 372 .driver = {
373 .pm = &i2c_dw_pm_ops, 373 .pm = &i2c_dw_pm_ops,
374 }, 374 },
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 0506fef8dc00..343357a2b5b4 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -50,7 +50,7 @@ static u32 i2c_dw_get_clk_rate_khz(struct dw_i2c_dev *dev)
50 return clk_get_rate(dev->clk)/1000; 50 return clk_get_rate(dev->clk)/1000;
51} 51}
52 52
53static int __devinit dw_i2c_probe(struct platform_device *pdev) 53static int dw_i2c_probe(struct platform_device *pdev)
54{ 54{
55 struct dw_i2c_dev *dev; 55 struct dw_i2c_dev *dev;
56 struct i2c_adapter *adap; 56 struct i2c_adapter *adap;
@@ -169,7 +169,7 @@ err_release_region:
169 return r; 169 return r;
170} 170}
171 171
172static int __devexit dw_i2c_remove(struct platform_device *pdev) 172static int dw_i2c_remove(struct platform_device *pdev)
173{ 173{
174 struct dw_i2c_dev *dev = platform_get_drvdata(pdev); 174 struct dw_i2c_dev *dev = platform_get_drvdata(pdev);
175 struct resource *mem; 175 struct resource *mem;
@@ -228,7 +228,7 @@ static SIMPLE_DEV_PM_OPS(dw_i2c_dev_pm_ops, dw_i2c_suspend, dw_i2c_resume);
228MODULE_ALIAS("platform:i2c_designware"); 228MODULE_ALIAS("platform:i2c_designware");
229 229
230static struct platform_driver dw_i2c_driver = { 230static struct platform_driver dw_i2c_driver = {
231 .remove = __devexit_p(dw_i2c_remove), 231 .remove = dw_i2c_remove,
232 .driver = { 232 .driver = {
233 .name = "i2c_designware", 233 .name = "i2c_designware",
234 .owner = THIS_MODULE, 234 .owner = THIS_MODULE,
diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c
index 259f7697bf25..5e7886e7136e 100644
--- a/drivers/i2c/busses/i2c-eg20t.c
+++ b/drivers/i2c/busses/i2c-eg20t.c
@@ -758,7 +758,7 @@ static void pch_i2c_disbl_int(struct i2c_algo_pch_data *adap)
758 iowrite32(BUFFER_MODE_INTR_DISBL, p + PCH_I2CBUFMSK); 758 iowrite32(BUFFER_MODE_INTR_DISBL, p + PCH_I2CBUFMSK);
759} 759}
760 760
761static int __devinit pch_i2c_probe(struct pci_dev *pdev, 761static int pch_i2c_probe(struct pci_dev *pdev,
762 const struct pci_device_id *id) 762 const struct pci_device_id *id)
763{ 763{
764 void __iomem *base_addr; 764 void __iomem *base_addr;
@@ -851,7 +851,7 @@ err_pci_enable:
851 return ret; 851 return ret;
852} 852}
853 853
854static void __devexit pch_i2c_remove(struct pci_dev *pdev) 854static void pch_i2c_remove(struct pci_dev *pdev)
855{ 855{
856 int i; 856 int i;
857 struct adapter_info *adap_info = pci_get_drvdata(pdev); 857 struct adapter_info *adap_info = pci_get_drvdata(pdev);
@@ -948,7 +948,7 @@ static struct pci_driver pch_pcidriver = {
948 .name = KBUILD_MODNAME, 948 .name = KBUILD_MODNAME,
949 .id_table = pch_pcidev_id, 949 .id_table = pch_pcidev_id,
950 .probe = pch_i2c_probe, 950 .probe = pch_i2c_probe,
951 .remove = __devexit_p(pch_i2c_remove), 951 .remove = pch_i2c_remove,
952 .suspend = pch_i2c_suspend, 952 .suspend = pch_i2c_suspend,
953 .resume = pch_i2c_resume 953 .resume = pch_i2c_resume
954}; 954};
diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c
index 37e2e82a9c88..485497066ed7 100644
--- a/drivers/i2c/busses/i2c-elektor.c
+++ b/drivers/i2c/busses/i2c-elektor.c
@@ -205,7 +205,7 @@ static struct i2c_adapter pcf_isa_ops = {
205 .name = "i2c-elektor", 205 .name = "i2c-elektor",
206}; 206};
207 207
208static int __devinit elektor_match(struct device *dev, unsigned int id) 208static int elektor_match(struct device *dev, unsigned int id)
209{ 209{
210#ifdef __alpha__ 210#ifdef __alpha__
211 /* check to see we have memory mapped PCF8584 connected to the 211 /* 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 return 1; 264 return 1;
265} 265}
266 266
267static int __devinit elektor_probe(struct device *dev, unsigned int id) 267static int elektor_probe(struct device *dev, unsigned int id)
268{ 268{
269 init_waitqueue_head(&pcf_wait); 269 init_waitqueue_head(&pcf_wait);
270 if (pcf_isa_init()) 270 if (pcf_isa_init())
@@ -293,7 +293,7 @@ static int __devinit elektor_probe(struct device *dev, unsigned int id)
293 return -ENODEV; 293 return -ENODEV;
294} 294}
295 295
296static int __devexit elektor_remove(struct device *dev, unsigned int id) 296static int elektor_remove(struct device *dev, unsigned int id)
297{ 297{
298 i2c_del_adapter(&pcf_isa_ops); 298 i2c_del_adapter(&pcf_isa_ops);
299 299
@@ -316,7 +316,7 @@ static int __devexit elektor_remove(struct device *dev, unsigned int id)
316static struct isa_driver i2c_elektor_driver = { 316static struct isa_driver i2c_elektor_driver = {
317 .match = elektor_match, 317 .match = elektor_match,
318 .probe = elektor_probe, 318 .probe = elektor_probe,
319 .remove = __devexit_p(elektor_remove), 319 .remove = elektor_remove,
320 .driver = { 320 .driver = {
321 .owner = THIS_MODULE, 321 .owner = THIS_MODULE,
322 .name = "i2c-elektor", 322 .name = "i2c-elektor",
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index 257299a92df3..f3fa4332bbdf 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -85,7 +85,7 @@ static int i2c_gpio_getscl(void *data)
85 return gpio_get_value(pdata->scl_pin); 85 return gpio_get_value(pdata->scl_pin);
86} 86}
87 87
88static int __devinit of_i2c_gpio_probe(struct device_node *np, 88static int of_i2c_gpio_probe(struct device_node *np,
89 struct i2c_gpio_platform_data *pdata) 89 struct i2c_gpio_platform_data *pdata)
90{ 90{
91 u32 reg; 91 u32 reg;
@@ -117,7 +117,7 @@ static int __devinit of_i2c_gpio_probe(struct device_node *np,
117 return 0; 117 return 0;
118} 118}
119 119
120static int __devinit i2c_gpio_probe(struct platform_device *pdev) 120static int i2c_gpio_probe(struct platform_device *pdev)
121{ 121{
122 struct i2c_gpio_private_data *priv; 122 struct i2c_gpio_private_data *priv;
123 struct i2c_gpio_platform_data *pdata; 123 struct i2c_gpio_platform_data *pdata;
@@ -218,7 +218,7 @@ err_request_sda:
218 return ret; 218 return ret;
219} 219}
220 220
221static int __devexit i2c_gpio_remove(struct platform_device *pdev) 221static int i2c_gpio_remove(struct platform_device *pdev)
222{ 222{
223 struct i2c_gpio_private_data *priv; 223 struct i2c_gpio_private_data *priv;
224 struct i2c_gpio_platform_data *pdata; 224 struct i2c_gpio_platform_data *pdata;
@@ -251,7 +251,7 @@ static struct platform_driver i2c_gpio_driver = {
251 .of_match_table = of_match_ptr(i2c_gpio_dt_ids), 251 .of_match_table = of_match_ptr(i2c_gpio_dt_ids),
252 }, 252 },
253 .probe = i2c_gpio_probe, 253 .probe = i2c_gpio_probe,
254 .remove = __devexit_p(i2c_gpio_remove), 254 .remove = i2c_gpio_remove,
255}; 255};
256 256
257static int __init i2c_gpio_init(void) 257static int __init i2c_gpio_init(void)
diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c
index 19515df61021..3351cc7ed11f 100644
--- a/drivers/i2c/busses/i2c-highlander.c
+++ b/drivers/i2c/busses/i2c-highlander.c
@@ -356,7 +356,7 @@ static const struct i2c_algorithm highlander_i2c_algo = {
356 .functionality = highlander_i2c_func, 356 .functionality = highlander_i2c_func,
357}; 357};
358 358
359static int __devinit highlander_i2c_probe(struct platform_device *pdev) 359static int highlander_i2c_probe(struct platform_device *pdev)
360{ 360{
361 struct highlander_i2c_dev *dev; 361 struct highlander_i2c_dev *dev;
362 struct i2c_adapter *adap; 362 struct i2c_adapter *adap;
@@ -441,7 +441,7 @@ err:
441 return ret; 441 return ret;
442} 442}
443 443
444static int __devexit highlander_i2c_remove(struct platform_device *pdev) 444static int highlander_i2c_remove(struct platform_device *pdev)
445{ 445{
446 struct highlander_i2c_dev *dev = platform_get_drvdata(pdev); 446 struct highlander_i2c_dev *dev = platform_get_drvdata(pdev);
447 447
@@ -465,7 +465,7 @@ static struct platform_driver highlander_i2c_driver = {
465 }, 465 },
466 466
467 .probe = highlander_i2c_probe, 467 .probe = highlander_i2c_probe,
468 .remove = __devexit_p(highlander_i2c_remove), 468 .remove = highlander_i2c_remove,
469}; 469};
470 470
471module_platform_driver(highlander_i2c_driver); 471module_platform_driver(highlander_i2c_driver);
diff --git a/drivers/i2c/busses/i2c-hydra.c b/drivers/i2c/busses/i2c-hydra.c
index c9f95e1666a8..79c3d9069a48 100644
--- a/drivers/i2c/busses/i2c-hydra.c
+++ b/drivers/i2c/busses/i2c-hydra.c
@@ -112,7 +112,7 @@ static DEFINE_PCI_DEVICE_TABLE(hydra_ids) = {
112 112
113MODULE_DEVICE_TABLE (pci, hydra_ids); 113MODULE_DEVICE_TABLE (pci, hydra_ids);
114 114
115static int __devinit hydra_probe(struct pci_dev *dev, 115static int hydra_probe(struct pci_dev *dev,
116 const struct pci_device_id *id) 116 const struct pci_device_id *id)
117{ 117{
118 unsigned long base = pci_resource_start(dev, 0); 118 unsigned long base = pci_resource_start(dev, 0);
@@ -139,7 +139,7 @@ static int __devinit hydra_probe(struct pci_dev *dev,
139 return 0; 139 return 0;
140} 140}
141 141
142static void __devexit hydra_remove(struct pci_dev *dev) 142static void hydra_remove(struct pci_dev *dev)
143{ 143{
144 pdregw(hydra_bit_data.data, 0); /* clear SCLK_OE and SDAT_OE */ 144 pdregw(hydra_bit_data.data, 0); /* clear SCLK_OE and SDAT_OE */
145 i2c_del_adapter(&hydra_adap); 145 i2c_del_adapter(&hydra_adap);
@@ -153,7 +153,7 @@ static struct pci_driver hydra_driver = {
153 .name = "hydra_smbus", 153 .name = "hydra_smbus",
154 .id_table = hydra_ids, 154 .id_table = hydra_ids,
155 .probe = hydra_probe, 155 .probe = hydra_probe,
156 .remove = __devexit_p(hydra_remove), 156 .remove = hydra_remove,
157}; 157};
158 158
159module_pci_driver(hydra_driver); 159module_pci_driver(hydra_driver);
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 1e73638225e1..3092387f6ef4 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -841,14 +841,14 @@ struct dmi_onboard_device_info {
841 const char *i2c_type; 841 const char *i2c_type;
842}; 842};
843 843
844static struct dmi_onboard_device_info __devinitdata dmi_devices[] = { 844static const struct dmi_onboard_device_info dmi_devices[] = {
845 { "Syleus", DMI_DEV_TYPE_OTHER, 0x73, "fscsyl" }, 845 { "Syleus", DMI_DEV_TYPE_OTHER, 0x73, "fscsyl" },
846 { "Hermes", DMI_DEV_TYPE_OTHER, 0x73, "fscher" }, 846 { "Hermes", DMI_DEV_TYPE_OTHER, 0x73, "fscher" },
847 { "Hades", DMI_DEV_TYPE_OTHER, 0x73, "fschds" }, 847 { "Hades", DMI_DEV_TYPE_OTHER, 0x73, "fschds" },
848}; 848};
849 849
850static void __devinit dmi_check_onboard_device(u8 type, const char *name, 850static void dmi_check_onboard_device(u8 type, const char *name,
851 struct i2c_adapter *adap) 851 struct i2c_adapter *adap)
852{ 852{
853 int i; 853 int i;
854 struct i2c_board_info info; 854 struct i2c_board_info info;
@@ -871,8 +871,7 @@ static void __devinit dmi_check_onboard_device(u8 type, const char *name,
871/* We use our own function to check for onboard devices instead of 871/* We use our own function to check for onboard devices instead of
872 dmi_find_device() as some buggy BIOS's have the devices we are interested 872 dmi_find_device() as some buggy BIOS's have the devices we are interested
873 in marked as disabled */ 873 in marked as disabled */
874static void __devinit dmi_check_onboard_devices(const struct dmi_header *dm, 874static void dmi_check_onboard_devices(const struct dmi_header *dm, void *adap)
875 void *adap)
876{ 875{
877 int i, count; 876 int i, count;
878 877
@@ -901,7 +900,7 @@ static void __devinit dmi_check_onboard_devices(const struct dmi_header *dm,
901} 900}
902 901
903/* Register optional slaves */ 902/* Register optional slaves */
904static void __devinit i801_probe_optional_slaves(struct i801_priv *priv) 903static void i801_probe_optional_slaves(struct i801_priv *priv)
905{ 904{
906 /* Only register slaves on main SMBus channel */ 905 /* Only register slaves on main SMBus channel */
907 if (priv->features & FEATURE_IDF) 906 if (priv->features & FEATURE_IDF)
@@ -921,7 +920,7 @@ static void __devinit i801_probe_optional_slaves(struct i801_priv *priv)
921} 920}
922#else 921#else
923static void __init input_apanel_init(void) {} 922static void __init input_apanel_init(void) {}
924static void __devinit i801_probe_optional_slaves(struct i801_priv *priv) {} 923static void i801_probe_optional_slaves(struct i801_priv *priv) {}
925#endif /* CONFIG_X86 && CONFIG_DMI */ 924#endif /* CONFIG_X86 && CONFIG_DMI */
926 925
927#if (defined CONFIG_I2C_MUX_GPIO || defined CONFIG_I2C_MUX_GPIO_MODULE) && \ 926#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 .n_gpios = 2, 943 .n_gpios = 2,
945}; 944};
946 945
947static struct dmi_system_id __devinitdata mux_dmi_table[] = { 946static const struct dmi_system_id mux_dmi_table[] = {
948 { 947 {
949 .matches = { 948 .matches = {
950 DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), 949 DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
@@ -1012,7 +1011,7 @@ static struct dmi_system_id __devinitdata mux_dmi_table[] = {
1012}; 1011};
1013 1012
1014/* Setup multiplexing if needed */ 1013/* Setup multiplexing if needed */
1015static int __devinit i801_add_mux(struct i801_priv *priv) 1014static int i801_add_mux(struct i801_priv *priv)
1016{ 1015{
1017 struct device *dev = &priv->adapter.dev; 1016 struct device *dev = &priv->adapter.dev;
1018 const struct i801_mux_config *mux_config; 1017 const struct i801_mux_config *mux_config;
@@ -1048,13 +1047,13 @@ static int __devinit i801_add_mux(struct i801_priv *priv)
1048 return 0; 1047 return 0;
1049} 1048}
1050 1049
1051static void __devexit i801_del_mux(struct i801_priv *priv) 1050static void i801_del_mux(struct i801_priv *priv)
1052{ 1051{
1053 if (priv->mux_pdev) 1052 if (priv->mux_pdev)
1054 platform_device_unregister(priv->mux_pdev); 1053 platform_device_unregister(priv->mux_pdev);
1055} 1054}
1056 1055
1057static unsigned int __devinit i801_get_adapter_class(struct i801_priv *priv) 1056static unsigned int i801_get_adapter_class(struct i801_priv *priv)
1058{ 1057{
1059 const struct dmi_system_id *id; 1058 const struct dmi_system_id *id;
1060 const struct i801_mux_config *mux_config; 1059 const struct i801_mux_config *mux_config;
@@ -1084,8 +1083,7 @@ static inline unsigned int i801_get_adapter_class(struct i801_priv *priv)
1084} 1083}
1085#endif 1084#endif
1086 1085
1087static int __devinit i801_probe(struct pci_dev *dev, 1086static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
1088 const struct pci_device_id *id)
1089{ 1087{
1090 unsigned char temp; 1088 unsigned char temp;
1091 int err, i; 1089 int err, i;
@@ -1226,7 +1224,7 @@ exit:
1226 return err; 1224 return err;
1227} 1225}
1228 1226
1229static void __devexit i801_remove(struct pci_dev *dev) 1227static void i801_remove(struct pci_dev *dev)
1230{ 1228{
1231 struct i801_priv *priv = pci_get_drvdata(dev); 1229 struct i801_priv *priv = pci_get_drvdata(dev);
1232 1230
@@ -1272,7 +1270,7 @@ static struct pci_driver i801_driver = {
1272 .name = "i801_smbus", 1270 .name = "i801_smbus",
1273 .id_table = i801_ids, 1271 .id_table = i801_ids,
1274 .probe = i801_probe, 1272 .probe = i801_probe,
1275 .remove = __devexit_p(i801_remove), 1273 .remove = i801_remove,
1276 .suspend = i801_suspend, 1274 .suspend = i801_suspend,
1277 .resume = i801_resume, 1275 .resume = i801_resume,
1278}; 1276};
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 806e225f3de7..33a2abb6c063 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -660,7 +660,7 @@ static inline u8 iic_clckdiv(unsigned int opb)
660 return (u8)((opb + 9) / 10 - 1); 660 return (u8)((opb + 9) / 10 - 1);
661} 661}
662 662
663static int __devinit iic_request_irq(struct platform_device *ofdev, 663static int iic_request_irq(struct platform_device *ofdev,
664 struct ibm_iic_private *dev) 664 struct ibm_iic_private *dev)
665{ 665{
666 struct device_node *np = ofdev->dev.of_node; 666 struct device_node *np = ofdev->dev.of_node;
@@ -691,7 +691,7 @@ static int __devinit iic_request_irq(struct platform_device *ofdev,
691/* 691/*
692 * Register single IIC interface 692 * Register single IIC interface
693 */ 693 */
694static int __devinit iic_probe(struct platform_device *ofdev) 694static int iic_probe(struct platform_device *ofdev)
695{ 695{
696 struct device_node *np = ofdev->dev.of_node; 696 struct device_node *np = ofdev->dev.of_node;
697 struct ibm_iic_private *dev; 697 struct ibm_iic_private *dev;
@@ -781,7 +781,7 @@ error_cleanup:
781/* 781/*
782 * Cleanup initialized IIC interface 782 * Cleanup initialized IIC interface
783 */ 783 */
784static int __devexit iic_remove(struct platform_device *ofdev) 784static int iic_remove(struct platform_device *ofdev)
785{ 785{
786 struct ibm_iic_private *dev = dev_get_drvdata(&ofdev->dev); 786 struct ibm_iic_private *dev = dev_get_drvdata(&ofdev->dev);
787 787
@@ -812,7 +812,7 @@ static struct platform_driver ibm_iic_driver = {
812 .of_match_table = ibm_iic_match, 812 .of_match_table = ibm_iic_match,
813 }, 813 },
814 .probe = iic_probe, 814 .probe = iic_probe,
815 .remove = __devexit_p(iic_remove), 815 .remove = iic_remove,
816}; 816};
817 817
818module_platform_driver(ibm_iic_driver); 818module_platform_driver(ibm_iic_driver);
diff --git a/drivers/i2c/busses/i2c-intel-mid.c b/drivers/i2c/busses/i2c-intel-mid.c
index 7c28f10f95ca..de3736bf6465 100644
--- a/drivers/i2c/busses/i2c-intel-mid.c
+++ b/drivers/i2c/busses/i2c-intel-mid.c
@@ -947,7 +947,7 @@ static const struct dev_pm_ops intel_mid_i2c_pm_ops = {
947 * 5. Call intel_mid_i2c_hwinit() for hardware initialization 947 * 5. Call intel_mid_i2c_hwinit() for hardware initialization
948 * 6. Register I2C adapter in i2c-core 948 * 6. Register I2C adapter in i2c-core
949 */ 949 */
950static int __devinit intel_mid_i2c_probe(struct pci_dev *dev, 950static int intel_mid_i2c_probe(struct pci_dev *dev,
951 const struct pci_device_id *id) 951 const struct pci_device_id *id)
952{ 952{
953 struct intel_mid_i2c_private *mrst; 953 struct intel_mid_i2c_private *mrst;
@@ -1079,7 +1079,7 @@ exit:
1079 return err; 1079 return err;
1080} 1080}
1081 1081
1082static void __devexit intel_mid_i2c_remove(struct pci_dev *dev) 1082static void intel_mid_i2c_remove(struct pci_dev *dev)
1083{ 1083{
1084 struct intel_mid_i2c_private *mrst = pci_get_drvdata(dev); 1084 struct intel_mid_i2c_private *mrst = pci_get_drvdata(dev);
1085 intel_mid_i2c_disable(&mrst->adap); 1085 intel_mid_i2c_disable(&mrst->adap);
@@ -1113,7 +1113,7 @@ static struct pci_driver intel_mid_i2c_driver = {
1113 .name = DRIVER_NAME, 1113 .name = DRIVER_NAME,
1114 .id_table = intel_mid_i2c_ids, 1114 .id_table = intel_mid_i2c_ids,
1115 .probe = intel_mid_i2c_probe, 1115 .probe = intel_mid_i2c_probe,
1116 .remove = __devexit_p(intel_mid_i2c_remove), 1116 .remove = intel_mid_i2c_remove,
1117}; 1117};
1118 1118
1119module_pci_driver(intel_mid_i2c_driver); 1119module_pci_driver(intel_mid_i2c_driver);
diff --git a/drivers/i2c/busses/i2c-isch.c b/drivers/i2c/busses/i2c-isch.c
index f90a6057508d..4099f79c2280 100644
--- a/drivers/i2c/busses/i2c-isch.c
+++ b/drivers/i2c/busses/i2c-isch.c
@@ -249,7 +249,7 @@ static struct i2c_adapter sch_adapter = {
249 .algo = &smbus_algorithm, 249 .algo = &smbus_algorithm,
250}; 250};
251 251
252static int __devinit smbus_sch_probe(struct platform_device *dev) 252static int smbus_sch_probe(struct platform_device *dev)
253{ 253{
254 struct resource *res; 254 struct resource *res;
255 int retval; 255 int retval;
@@ -284,7 +284,7 @@ static int __devinit smbus_sch_probe(struct platform_device *dev)
284 return retval; 284 return retval;
285} 285}
286 286
287static int __devexit smbus_sch_remove(struct platform_device *pdev) 287static int smbus_sch_remove(struct platform_device *pdev)
288{ 288{
289 struct resource *res; 289 struct resource *res;
290 if (sch_smba) { 290 if (sch_smba) {
@@ -303,7 +303,7 @@ static struct platform_driver smbus_sch_driver = {
303 .owner = THIS_MODULE, 303 .owner = THIS_MODULE,
304 }, 304 },
305 .probe = smbus_sch_probe, 305 .probe = smbus_sch_probe,
306 .remove = __devexit_p(smbus_sch_remove), 306 .remove = smbus_sch_remove,
307}; 307};
308 308
309module_platform_driver(smbus_sch_driver); 309module_platform_driver(smbus_sch_driver);
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index ca86430cb4a2..a69459e5c3f3 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -175,7 +175,7 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing)
175} 175}
176 176
177#if defined(CONFIG_PPC_MPC52xx) || defined(CONFIG_PPC_MPC512x) 177#if defined(CONFIG_PPC_MPC52xx) || defined(CONFIG_PPC_MPC512x)
178static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] __devinitconst = { 178static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] = {
179 {20, 0x20}, {22, 0x21}, {24, 0x22}, {26, 0x23}, 179 {20, 0x20}, {22, 0x21}, {24, 0x22}, {26, 0x23},
180 {28, 0x24}, {30, 0x01}, {32, 0x25}, {34, 0x02}, 180 {28, 0x24}, {30, 0x01}, {32, 0x25}, {34, 0x02},
181 {36, 0x26}, {40, 0x27}, {44, 0x04}, {48, 0x28}, 181 {36, 0x26}, {40, 0x27}, {44, 0x04}, {48, 0x28},
@@ -196,7 +196,7 @@ static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] __devinitconst = {
196 {10240, 0x9d}, {12288, 0x9e}, {15360, 0x9f} 196 {10240, 0x9d}, {12288, 0x9e}, {15360, 0x9f}
197}; 197};
198 198
199static int __devinit mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock, 199static int mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock,
200 int prescaler, u32 *real_clk) 200 int prescaler, u32 *real_clk)
201{ 201{
202 const struct mpc_i2c_divider *div = NULL; 202 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 return (int)div->fdr; 230 return (int)div->fdr;
231} 231}
232 232
233static void __devinit mpc_i2c_setup_52xx(struct device_node *node, 233static void mpc_i2c_setup_52xx(struct device_node *node,
234 struct mpc_i2c *i2c, 234 struct mpc_i2c *i2c,
235 u32 clock, u32 prescaler) 235 u32 clock, u32 prescaler)
236{ 236{
@@ -252,7 +252,7 @@ static void __devinit mpc_i2c_setup_52xx(struct device_node *node,
252 fdr); 252 fdr);
253} 253}
254#else /* !(CONFIG_PPC_MPC52xx || CONFIG_PPC_MPC512x) */ 254#else /* !(CONFIG_PPC_MPC52xx || CONFIG_PPC_MPC512x) */
255static void __devinit mpc_i2c_setup_52xx(struct device_node *node, 255static void mpc_i2c_setup_52xx(struct device_node *node,
256 struct mpc_i2c *i2c, 256 struct mpc_i2c *i2c,
257 u32 clock, u32 prescaler) 257 u32 clock, u32 prescaler)
258{ 258{
@@ -260,7 +260,7 @@ static void __devinit mpc_i2c_setup_52xx(struct device_node *node,
260#endif /* CONFIG_PPC_MPC52xx || CONFIG_PPC_MPC512x */ 260#endif /* CONFIG_PPC_MPC52xx || CONFIG_PPC_MPC512x */
261 261
262#ifdef CONFIG_PPC_MPC512x 262#ifdef CONFIG_PPC_MPC512x
263static void __devinit mpc_i2c_setup_512x(struct device_node *node, 263static void mpc_i2c_setup_512x(struct device_node *node,
264 struct mpc_i2c *i2c, 264 struct mpc_i2c *i2c,
265 u32 clock, u32 prescaler) 265 u32 clock, u32 prescaler)
266{ 266{
@@ -288,7 +288,7 @@ static void __devinit mpc_i2c_setup_512x(struct device_node *node,
288 mpc_i2c_setup_52xx(node, i2c, clock, prescaler); 288 mpc_i2c_setup_52xx(node, i2c, clock, prescaler);
289} 289}
290#else /* CONFIG_PPC_MPC512x */ 290#else /* CONFIG_PPC_MPC512x */
291static void __devinit mpc_i2c_setup_512x(struct device_node *node, 291static void mpc_i2c_setup_512x(struct device_node *node,
292 struct mpc_i2c *i2c, 292 struct mpc_i2c *i2c,
293 u32 clock, u32 prescaler) 293 u32 clock, u32 prescaler)
294{ 294{
@@ -296,7 +296,7 @@ static void __devinit mpc_i2c_setup_512x(struct device_node *node,
296#endif /* CONFIG_PPC_MPC512x */ 296#endif /* CONFIG_PPC_MPC512x */
297 297
298#ifdef CONFIG_FSL_SOC 298#ifdef CONFIG_FSL_SOC
299static const struct mpc_i2c_divider mpc_i2c_dividers_8xxx[] __devinitconst = { 299static const struct mpc_i2c_divider mpc_i2c_dividers_8xxx[] = {
300 {160, 0x0120}, {192, 0x0121}, {224, 0x0122}, {256, 0x0123}, 300 {160, 0x0120}, {192, 0x0121}, {224, 0x0122}, {256, 0x0123},
301 {288, 0x0100}, {320, 0x0101}, {352, 0x0601}, {384, 0x0102}, 301 {288, 0x0100}, {320, 0x0101}, {352, 0x0601}, {384, 0x0102},
302 {416, 0x0602}, {448, 0x0126}, {480, 0x0103}, {512, 0x0127}, 302 {416, 0x0602}, {448, 0x0126}, {480, 0x0103}, {512, 0x0127},
@@ -316,7 +316,7 @@ static const struct mpc_i2c_divider mpc_i2c_dividers_8xxx[] __devinitconst = {
316 {49152, 0x011e}, {61440, 0x011f} 316 {49152, 0x011e}, {61440, 0x011f}
317}; 317};
318 318
319static u32 __devinit mpc_i2c_get_sec_cfg_8xxx(void) 319static u32 mpc_i2c_get_sec_cfg_8xxx(void)
320{ 320{
321 struct device_node *node = NULL; 321 struct device_node *node = NULL;
322 u32 __iomem *reg; 322 u32 __iomem *reg;
@@ -345,7 +345,7 @@ static u32 __devinit mpc_i2c_get_sec_cfg_8xxx(void)
345 return val; 345 return val;
346} 346}
347 347
348static int __devinit mpc_i2c_get_fdr_8xxx(struct device_node *node, u32 clock, 348static int mpc_i2c_get_fdr_8xxx(struct device_node *node, u32 clock,
349 u32 prescaler, u32 *real_clk) 349 u32 prescaler, u32 *real_clk)
350{ 350{
351 const struct mpc_i2c_divider *div = NULL; 351 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 return div ? (int)div->fdr : -EINVAL; 383 return div ? (int)div->fdr : -EINVAL;
384} 384}
385 385
386static void __devinit mpc_i2c_setup_8xxx(struct device_node *node, 386static void mpc_i2c_setup_8xxx(struct device_node *node,
387 struct mpc_i2c *i2c, 387 struct mpc_i2c *i2c,
388 u32 clock, u32 prescaler) 388 u32 clock, u32 prescaler)
389{ 389{
@@ -408,7 +408,7 @@ static void __devinit mpc_i2c_setup_8xxx(struct device_node *node,
408} 408}
409 409
410#else /* !CONFIG_FSL_SOC */ 410#else /* !CONFIG_FSL_SOC */
411static void __devinit mpc_i2c_setup_8xxx(struct device_node *node, 411static void mpc_i2c_setup_8xxx(struct device_node *node,
412 struct mpc_i2c *i2c, 412 struct mpc_i2c *i2c,
413 u32 clock, u32 prescaler) 413 u32 clock, u32 prescaler)
414{ 414{
@@ -615,7 +615,7 @@ static struct i2c_adapter mpc_ops = {
615}; 615};
616 616
617static const struct of_device_id mpc_i2c_of_match[]; 617static const struct of_device_id mpc_i2c_of_match[];
618static int __devinit fsl_i2c_probe(struct platform_device *op) 618static int fsl_i2c_probe(struct platform_device *op)
619{ 619{
620 const struct of_device_id *match; 620 const struct of_device_id *match;
621 struct mpc_i2c *i2c; 621 struct mpc_i2c *i2c;
@@ -706,7 +706,7 @@ static int __devinit fsl_i2c_probe(struct platform_device *op)
706 return result; 706 return result;
707}; 707};
708 708
709static int __devexit fsl_i2c_remove(struct platform_device *op) 709static int fsl_i2c_remove(struct platform_device *op)
710{ 710{
711 struct mpc_i2c *i2c = dev_get_drvdata(&op->dev); 711 struct mpc_i2c *i2c = dev_get_drvdata(&op->dev);
712 712
@@ -746,24 +746,24 @@ static int mpc_i2c_resume(struct device *dev)
746SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume); 746SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume);
747#endif 747#endif
748 748
749static const struct mpc_i2c_data mpc_i2c_data_512x __devinitdata = { 749static const struct mpc_i2c_data mpc_i2c_data_512x = {
750 .setup = mpc_i2c_setup_512x, 750 .setup = mpc_i2c_setup_512x,
751}; 751};
752 752
753static const struct mpc_i2c_data mpc_i2c_data_52xx __devinitdata = { 753static const struct mpc_i2c_data mpc_i2c_data_52xx = {
754 .setup = mpc_i2c_setup_52xx, 754 .setup = mpc_i2c_setup_52xx,
755}; 755};
756 756
757static const struct mpc_i2c_data mpc_i2c_data_8313 __devinitdata = { 757static const struct mpc_i2c_data mpc_i2c_data_8313 = {
758 .setup = mpc_i2c_setup_8xxx, 758 .setup = mpc_i2c_setup_8xxx,
759}; 759};
760 760
761static const struct mpc_i2c_data mpc_i2c_data_8543 __devinitdata = { 761static const struct mpc_i2c_data mpc_i2c_data_8543 = {
762 .setup = mpc_i2c_setup_8xxx, 762 .setup = mpc_i2c_setup_8xxx,
763 .prescaler = 2, 763 .prescaler = 2,
764}; 764};
765 765
766static const struct mpc_i2c_data mpc_i2c_data_8544 __devinitdata = { 766static const struct mpc_i2c_data mpc_i2c_data_8544 = {
767 .setup = mpc_i2c_setup_8xxx, 767 .setup = mpc_i2c_setup_8xxx,
768 .prescaler = 3, 768 .prescaler = 3,
769}; 769};
@@ -785,7 +785,7 @@ MODULE_DEVICE_TABLE(of, mpc_i2c_of_match);
785/* Structure for a device driver */ 785/* Structure for a device driver */
786static struct platform_driver mpc_i2c_driver = { 786static struct platform_driver mpc_i2c_driver = {
787 .probe = fsl_i2c_probe, 787 .probe = fsl_i2c_probe,
788 .remove = __devexit_p(fsl_i2c_remove), 788 .remove = fsl_i2c_remove,
789 .driver = { 789 .driver = {
790 .owner = THIS_MODULE, 790 .owner = THIS_MODULE,
791 .name = DRV_NAME, 791 .name = DRV_NAME,
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 2e9d56719e99..8b20ef8524ac 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -495,7 +495,7 @@ static const struct i2c_algorithm mv64xxx_i2c_algo = {
495 * 495 *
496 ***************************************************************************** 496 *****************************************************************************
497 */ 497 */
498static int __devinit 498static int
499mv64xxx_i2c_map_regs(struct platform_device *pd, 499mv64xxx_i2c_map_regs(struct platform_device *pd,
500 struct mv64xxx_i2c_data *drv_data) 500 struct mv64xxx_i2c_data *drv_data)
501{ 501{
@@ -530,13 +530,13 @@ mv64xxx_i2c_unmap_regs(struct mv64xxx_i2c_data *drv_data)
530} 530}
531 531
532#ifdef CONFIG_OF 532#ifdef CONFIG_OF
533static int __devinit 533static int
534mv64xxx_calc_freq(const int tclk, const int n, const int m) 534mv64xxx_calc_freq(const int tclk, const int n, const int m)
535{ 535{
536 return tclk / (10 * (m + 1) * (2 << n)); 536 return tclk / (10 * (m + 1) * (2 << n));
537} 537}
538 538
539static bool __devinit 539static bool
540mv64xxx_find_baud_factors(const u32 req_freq, const u32 tclk, u32 *best_n, 540mv64xxx_find_baud_factors(const u32 req_freq, const u32 tclk, u32 *best_n,
541 u32 *best_m) 541 u32 *best_m)
542{ 542{
@@ -560,7 +560,7 @@ mv64xxx_find_baud_factors(const u32 req_freq, const u32 tclk, u32 *best_n,
560 return true; 560 return true;
561} 561}
562 562
563static int __devinit 563static int
564mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, 564mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
565 struct device_node *np) 565 struct device_node *np)
566{ 566{
@@ -597,7 +597,7 @@ out:
597#endif 597#endif
598} 598}
599#else /* CONFIG_OF */ 599#else /* CONFIG_OF */
600static int __devinit 600static int
601mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, 601mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
602 struct device_node *np) 602 struct device_node *np)
603{ 603{
@@ -605,7 +605,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
605} 605}
606#endif /* CONFIG_OF */ 606#endif /* CONFIG_OF */
607 607
608static int __devinit 608static int
609mv64xxx_i2c_probe(struct platform_device *pd) 609mv64xxx_i2c_probe(struct platform_device *pd)
610{ 610{
611 struct mv64xxx_i2c_data *drv_data; 611 struct mv64xxx_i2c_data *drv_data;
@@ -697,7 +697,7 @@ mv64xxx_i2c_probe(struct platform_device *pd)
697 return rc; 697 return rc;
698} 698}
699 699
700static int __devexit 700static int
701mv64xxx_i2c_remove(struct platform_device *dev) 701mv64xxx_i2c_remove(struct platform_device *dev)
702{ 702{
703 struct mv64xxx_i2c_data *drv_data = platform_get_drvdata(dev); 703 struct mv64xxx_i2c_data *drv_data = platform_get_drvdata(dev);
@@ -718,7 +718,7 @@ mv64xxx_i2c_remove(struct platform_device *dev)
718 return rc; 718 return rc;
719} 719}
720 720
721static const struct of_device_id mv64xxx_i2c_of_match_table[] __devinitdata = { 721static const struct of_device_id mv64xxx_i2c_of_match_table[] = {
722 { .compatible = "marvell,mv64xxx-i2c", }, 722 { .compatible = "marvell,mv64xxx-i2c", },
723 {} 723 {}
724}; 724};
@@ -726,7 +726,7 @@ MODULE_DEVICE_TABLE(of, mv64xxx_i2c_of_match_table);
726 726
727static struct platform_driver mv64xxx_i2c_driver = { 727static struct platform_driver mv64xxx_i2c_driver = {
728 .probe = mv64xxx_i2c_probe, 728 .probe = mv64xxx_i2c_probe,
729 .remove = __devexit_p(mv64xxx_i2c_remove), 729 .remove = mv64xxx_i2c_remove,
730 .driver = { 730 .driver = {
731 .owner = THIS_MODULE, 731 .owner = THIS_MODULE,
732 .name = MV64XXX_I2C_CTLR_NAME, 732 .name = MV64XXX_I2C_CTLR_NAME,
diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c
index 6ed53da9e1f4..1b1a936eccc9 100644
--- a/drivers/i2c/busses/i2c-mxs.c
+++ b/drivers/i2c/busses/i2c-mxs.c
@@ -432,7 +432,7 @@ static int mxs_i2c_get_ofdata(struct mxs_i2c_dev *i2c)
432 return 0; 432 return 0;
433} 433}
434 434
435static int __devinit mxs_i2c_probe(struct platform_device *pdev) 435static int mxs_i2c_probe(struct platform_device *pdev)
436{ 436{
437 struct device *dev = &pdev->dev; 437 struct device *dev = &pdev->dev;
438 struct mxs_i2c_dev *i2c; 438 struct mxs_i2c_dev *i2c;
@@ -515,7 +515,7 @@ static int __devinit mxs_i2c_probe(struct platform_device *pdev)
515 return 0; 515 return 0;
516} 516}
517 517
518static int __devexit mxs_i2c_remove(struct platform_device *pdev) 518static int mxs_i2c_remove(struct platform_device *pdev)
519{ 519{
520 struct mxs_i2c_dev *i2c = platform_get_drvdata(pdev); 520 struct mxs_i2c_dev *i2c = platform_get_drvdata(pdev);
521 int ret; 521 int ret;
@@ -546,7 +546,7 @@ static struct platform_driver mxs_i2c_driver = {
546 .owner = THIS_MODULE, 546 .owner = THIS_MODULE,
547 .of_match_table = mxs_i2c_dt_ids, 547 .of_match_table = mxs_i2c_dt_ids,
548 }, 548 },
549 .remove = __devexit_p(mxs_i2c_remove), 549 .remove = mxs_i2c_remove,
550}; 550};
551 551
552static int __init mxs_i2c_init(void) 552static int __init mxs_i2c_init(void)
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index 392303b4be07..adac8542771d 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -117,7 +117,7 @@ struct nforce2_smbus {
117#define MAX_TIMEOUT 100 117#define MAX_TIMEOUT 100
118 118
119/* We disable the second SMBus channel on these boards */ 119/* We disable the second SMBus channel on these boards */
120static struct dmi_system_id __devinitdata nforce2_dmi_blacklist2[] = { 120static const struct dmi_system_id nforce2_dmi_blacklist2[] = {
121 { 121 {
122 .ident = "DFI Lanparty NF4 Expert", 122 .ident = "DFI Lanparty NF4 Expert",
123 .matches = { 123 .matches = {
@@ -330,8 +330,8 @@ static DEFINE_PCI_DEVICE_TABLE(nforce2_ids) = {
330MODULE_DEVICE_TABLE (pci, nforce2_ids); 330MODULE_DEVICE_TABLE (pci, nforce2_ids);
331 331
332 332
333static int __devinit nforce2_probe_smb (struct pci_dev *dev, int bar, 333static int nforce2_probe_smb(struct pci_dev *dev, int bar, int alt_reg,
334 int alt_reg, struct nforce2_smbus *smbus, const char *name) 334 struct nforce2_smbus *smbus, const char *name)
335{ 335{
336 int error; 336 int error;
337 337
@@ -382,7 +382,7 @@ static int __devinit nforce2_probe_smb (struct pci_dev *dev, int bar,
382} 382}
383 383
384 384
385static int __devinit nforce2_probe(struct pci_dev *dev, const struct pci_device_id *id) 385static int nforce2_probe(struct pci_dev *dev, const struct pci_device_id *id)
386{ 386{
387 struct nforce2_smbus *smbuses; 387 struct nforce2_smbus *smbuses;
388 int res1, res2; 388 int res1, res2;
@@ -430,7 +430,7 @@ static int __devinit nforce2_probe(struct pci_dev *dev, const struct pci_device_
430} 430}
431 431
432 432
433static void __devexit nforce2_remove(struct pci_dev *dev) 433static void nforce2_remove(struct pci_dev *dev)
434{ 434{
435 struct nforce2_smbus *smbuses = pci_get_drvdata(dev); 435 struct nforce2_smbus *smbuses = pci_get_drvdata(dev);
436 436
@@ -450,7 +450,7 @@ static struct pci_driver nforce2_driver = {
450 .name = "nForce2_smbus", 450 .name = "nForce2_smbus",
451 .id_table = nforce2_ids, 451 .id_table = nforce2_ids,
452 .probe = nforce2_probe, 452 .probe = nforce2_probe,
453 .remove = __devexit_p(nforce2_remove), 453 .remove = nforce2_remove,
454}; 454};
455 455
456module_pci_driver(nforce2_driver); 456module_pci_driver(nforce2_driver);
diff --git a/drivers/i2c/busses/i2c-nuc900.c b/drivers/i2c/busses/i2c-nuc900.c
index a23b91b0b738..865ee350adb3 100644
--- a/drivers/i2c/busses/i2c-nuc900.c
+++ b/drivers/i2c/busses/i2c-nuc900.c
@@ -518,7 +518,7 @@ static const struct i2c_algorithm nuc900_i2c_algorithm = {
518 * called by the bus driver when a suitable device is found 518 * called by the bus driver when a suitable device is found
519*/ 519*/
520 520
521static int __devinit nuc900_i2c_probe(struct platform_device *pdev) 521static int nuc900_i2c_probe(struct platform_device *pdev)
522{ 522{
523 struct nuc900_i2c *i2c; 523 struct nuc900_i2c *i2c;
524 struct nuc900_platform_i2c *pdata; 524 struct nuc900_platform_i2c *pdata;
@@ -663,7 +663,7 @@ static int __devinit nuc900_i2c_probe(struct platform_device *pdev)
663 * called when device is removed from the bus 663 * called when device is removed from the bus
664*/ 664*/
665 665
666static int __devexit nuc900_i2c_remove(struct platform_device *pdev) 666static int nuc900_i2c_remove(struct platform_device *pdev)
667{ 667{
668 struct nuc900_i2c *i2c = platform_get_drvdata(pdev); 668 struct nuc900_i2c *i2c = platform_get_drvdata(pdev);
669 669
@@ -684,7 +684,7 @@ static int __devexit nuc900_i2c_remove(struct platform_device *pdev)
684 684
685static struct platform_driver nuc900_i2c_driver = { 685static struct platform_driver nuc900_i2c_driver = {
686 .probe = nuc900_i2c_probe, 686 .probe = nuc900_i2c_probe,
687 .remove = __devexit_p(nuc900_i2c_remove), 687 .remove = nuc900_i2c_remove,
688 .driver = { 688 .driver = {
689 .owner = THIS_MODULE, 689 .owner = THIS_MODULE,
690 .name = "nuc900-i2c0", 690 .name = "nuc900-i2c0",
diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index 9b35c9fbb2fe..a873d0ad1acb 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -343,7 +343,7 @@ static int ocores_i2c_of_probe(struct platform_device *pdev,
343#define ocores_i2c_of_probe(pdev,i2c) -ENODEV 343#define ocores_i2c_of_probe(pdev,i2c) -ENODEV
344#endif 344#endif
345 345
346static int __devinit ocores_i2c_probe(struct platform_device *pdev) 346static int ocores_i2c_probe(struct platform_device *pdev)
347{ 347{
348 struct ocores_i2c *i2c; 348 struct ocores_i2c *i2c;
349 struct ocores_i2c_platform_data *pdata; 349 struct ocores_i2c_platform_data *pdata;
@@ -441,7 +441,7 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
441 return 0; 441 return 0;
442} 442}
443 443
444static int __devexit ocores_i2c_remove(struct platform_device *pdev) 444static int ocores_i2c_remove(struct platform_device *pdev)
445{ 445{
446 struct ocores_i2c *i2c = platform_get_drvdata(pdev); 446 struct ocores_i2c *i2c = platform_get_drvdata(pdev);
447 447
@@ -485,7 +485,7 @@ static SIMPLE_DEV_PM_OPS(ocores_i2c_pm, ocores_i2c_suspend, ocores_i2c_resume);
485 485
486static struct platform_driver ocores_i2c_driver = { 486static struct platform_driver ocores_i2c_driver = {
487 .probe = ocores_i2c_probe, 487 .probe = ocores_i2c_probe,
488 .remove = __devexit_p(ocores_i2c_remove), 488 .remove = ocores_i2c_remove,
489 .driver = { 489 .driver = {
490 .owner = THIS_MODULE, 490 .owner = THIS_MODULE,
491 .name = "ocores-i2c", 491 .name = "ocores-i2c",
diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c
index f44c83549fe5..484ca771fdff 100644
--- a/drivers/i2c/busses/i2c-octeon.c
+++ b/drivers/i2c/busses/i2c-octeon.c
@@ -446,7 +446,7 @@ static struct i2c_adapter octeon_i2c_ops = {
446/** 446/**
447 * octeon_i2c_setclock - Calculate and set clock divisors. 447 * octeon_i2c_setclock - Calculate and set clock divisors.
448 */ 448 */
449static int __devinit octeon_i2c_setclock(struct octeon_i2c *i2c) 449static int octeon_i2c_setclock(struct octeon_i2c *i2c)
450{ 450{
451 int tclk, thp_base, inc, thp_idx, mdiv_idx, ndiv_idx, foscl, diff; 451 int tclk, thp_base, inc, thp_idx, mdiv_idx, ndiv_idx, foscl, diff;
452 int thp = 0x18, mdiv = 2, ndiv = 0, delta_hz = 1000000; 452 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 return 0; 489 return 0;
490} 490}
491 491
492static int __devinit octeon_i2c_initlowlevel(struct octeon_i2c *i2c) 492static int octeon_i2c_initlowlevel(struct octeon_i2c *i2c)
493{ 493{
494 u8 status; 494 u8 status;
495 int tries; 495 int tries;
@@ -510,7 +510,7 @@ static int __devinit octeon_i2c_initlowlevel(struct octeon_i2c *i2c)
510 return -EIO; 510 return -EIO;
511} 511}
512 512
513static int __devinit octeon_i2c_probe(struct platform_device *pdev) 513static int octeon_i2c_probe(struct platform_device *pdev)
514{ 514{
515 int irq, result = 0; 515 int irq, result = 0;
516 struct octeon_i2c *i2c; 516 struct octeon_i2c *i2c;
@@ -609,7 +609,7 @@ out:
609 return result; 609 return result;
610}; 610};
611 611
612static int __devexit octeon_i2c_remove(struct platform_device *pdev) 612static int octeon_i2c_remove(struct platform_device *pdev)
613{ 613{
614 struct octeon_i2c *i2c = platform_get_drvdata(pdev); 614 struct octeon_i2c *i2c = platform_get_drvdata(pdev);
615 615
@@ -628,7 +628,7 @@ MODULE_DEVICE_TABLE(of, octeon_i2c_match);
628 628
629static struct platform_driver octeon_i2c_driver = { 629static struct platform_driver octeon_i2c_driver = {
630 .probe = octeon_i2c_probe, 630 .probe = octeon_i2c_probe,
631 .remove = __devexit_p(octeon_i2c_remove), 631 .remove = octeon_i2c_remove,
632 .driver = { 632 .driver = {
633 .owner = THIS_MODULE, 633 .owner = THIS_MODULE,
634 .name = DRV_NAME, 634 .name = DRV_NAME,
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 7a62acb7d262..20d41bfa7c19 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1069,7 +1069,7 @@ MODULE_DEVICE_TABLE(of, omap_i2c_of_match);
1069#define OMAP_I2C_SCHEME_0 0 1069#define OMAP_I2C_SCHEME_0 0
1070#define OMAP_I2C_SCHEME_1 1 1070#define OMAP_I2C_SCHEME_1 1
1071 1071
1072static int __devinit 1072static int
1073omap_i2c_probe(struct platform_device *pdev) 1073omap_i2c_probe(struct platform_device *pdev)
1074{ 1074{
1075 struct omap_i2c_dev *dev; 1075 struct omap_i2c_dev *dev;
@@ -1267,7 +1267,7 @@ err_free_mem:
1267 return r; 1267 return r;
1268} 1268}
1269 1269
1270static int __devexit omap_i2c_remove(struct platform_device *pdev) 1270static int omap_i2c_remove(struct platform_device *pdev)
1271{ 1271{
1272 struct omap_i2c_dev *dev = platform_get_drvdata(pdev); 1272 struct omap_i2c_dev *dev = platform_get_drvdata(pdev);
1273 int ret; 1273 int ret;
@@ -1333,7 +1333,7 @@ static struct dev_pm_ops omap_i2c_pm_ops = {
1333 1333
1334static struct platform_driver omap_i2c_driver = { 1334static struct platform_driver omap_i2c_driver = {
1335 .probe = omap_i2c_probe, 1335 .probe = omap_i2c_probe,
1336 .remove = __devexit_p(omap_i2c_remove), 1336 .remove = omap_i2c_remove,
1337 .driver = { 1337 .driver = {
1338 .name = "omap_i2c", 1338 .name = "omap_i2c",
1339 .owner = THIS_MODULE, 1339 .owner = THIS_MODULE,
diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c
index 4b95f7a63a3b..aa9577881925 100644
--- a/drivers/i2c/busses/i2c-parport-light.c
+++ b/drivers/i2c/busses/i2c-parport-light.c
@@ -135,7 +135,7 @@ static struct lineop parport_ctrl_irq = {
135 .port = PORT_CTRL, 135 .port = PORT_CTRL,
136}; 136};
137 137
138static int __devinit i2c_parport_probe(struct platform_device *pdev) 138static int i2c_parport_probe(struct platform_device *pdev)
139{ 139{
140 int err; 140 int err;
141 141
@@ -169,7 +169,7 @@ static int __devinit i2c_parport_probe(struct platform_device *pdev)
169 return 0; 169 return 0;
170} 170}
171 171
172static int __devexit i2c_parport_remove(struct platform_device *pdev) 172static int i2c_parport_remove(struct platform_device *pdev)
173{ 173{
174 if (ara) { 174 if (ara) {
175 line_set(0, &parport_ctrl_irq); 175 line_set(0, &parport_ctrl_irq);
@@ -191,7 +191,7 @@ static struct platform_driver i2c_parport_driver = {
191 .name = DRVNAME, 191 .name = DRVNAME,
192 }, 192 },
193 .probe = i2c_parport_probe, 193 .probe = i2c_parport_probe,
194 .remove = __devexit_p(i2c_parport_remove), 194 .remove = i2c_parport_remove,
195}; 195};
196 196
197static int __init i2c_parport_device_add(u16 address) 197static int __init i2c_parport_device_add(u16 address)
diff --git a/drivers/i2c/busses/i2c-pasemi.c b/drivers/i2c/busses/i2c-pasemi.c
index 12edefd4183a..615f632c846f 100644
--- a/drivers/i2c/busses/i2c-pasemi.c
+++ b/drivers/i2c/busses/i2c-pasemi.c
@@ -340,7 +340,7 @@ static const struct i2c_algorithm smbus_algorithm = {
340 .functionality = pasemi_smb_func, 340 .functionality = pasemi_smb_func,
341}; 341};
342 342
343static int __devinit pasemi_smb_probe(struct pci_dev *dev, 343static int pasemi_smb_probe(struct pci_dev *dev,
344 const struct pci_device_id *id) 344 const struct pci_device_id *id)
345{ 345{
346 struct pasemi_smbus *smbus; 346 struct pasemi_smbus *smbus;
@@ -392,7 +392,7 @@ static int __devinit pasemi_smb_probe(struct pci_dev *dev,
392 return error; 392 return error;
393} 393}
394 394
395static void __devexit pasemi_smb_remove(struct pci_dev *dev) 395static void pasemi_smb_remove(struct pci_dev *dev)
396{ 396{
397 struct pasemi_smbus *smbus = pci_get_drvdata(dev); 397 struct pasemi_smbus *smbus = pci_get_drvdata(dev);
398 398
@@ -412,7 +412,7 @@ static struct pci_driver pasemi_smb_driver = {
412 .name = "i2c-pasemi", 412 .name = "i2c-pasemi",
413 .id_table = pasemi_smb_ids, 413 .id_table = pasemi_smb_ids,
414 .probe = pasemi_smb_probe, 414 .probe = pasemi_smb_probe,
415 .remove = __devexit_p(pasemi_smb_remove), 415 .remove = pasemi_smb_remove,
416}; 416};
417 417
418module_pci_driver(pasemi_smb_driver); 418module_pci_driver(pasemi_smb_driver);
diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c
index 29933f87d8fa..323f061a3163 100644
--- a/drivers/i2c/busses/i2c-pca-isa.c
+++ b/drivers/i2c/busses/i2c-pca-isa.c
@@ -119,7 +119,7 @@ static struct i2c_adapter pca_isa_ops = {
119 .timeout = HZ, 119 .timeout = HZ,
120}; 120};
121 121
122static int __devinit pca_isa_match(struct device *dev, unsigned int id) 122static int pca_isa_match(struct device *dev, unsigned int id)
123{ 123{
124 int match = base != 0; 124 int match = base != 0;
125 125
@@ -132,7 +132,7 @@ static int __devinit pca_isa_match(struct device *dev, unsigned int id)
132 return match; 132 return match;
133} 133}
134 134
135static int __devinit pca_isa_probe(struct device *dev, unsigned int id) 135static int pca_isa_probe(struct device *dev, unsigned int id)
136{ 136{
137 init_waitqueue_head(&pca_wait); 137 init_waitqueue_head(&pca_wait);
138 138
@@ -174,7 +174,7 @@ static int __devinit pca_isa_probe(struct device *dev, unsigned int id)
174 return -ENODEV; 174 return -ENODEV;
175} 175}
176 176
177static int __devexit pca_isa_remove(struct device *dev, unsigned int id) 177static int pca_isa_remove(struct device *dev, unsigned int id)
178{ 178{
179 i2c_del_adapter(&pca_isa_ops); 179 i2c_del_adapter(&pca_isa_ops);
180 180
@@ -190,7 +190,7 @@ static int __devexit pca_isa_remove(struct device *dev, unsigned int id)
190static struct isa_driver pca_isa_driver = { 190static struct isa_driver pca_isa_driver = {
191 .match = pca_isa_match, 191 .match = pca_isa_match,
192 .probe = pca_isa_probe, 192 .probe = pca_isa_probe,
193 .remove = __devexit_p(pca_isa_remove), 193 .remove = pca_isa_remove,
194 .driver = { 194 .driver = {
195 .owner = THIS_MODULE, 195 .owner = THIS_MODULE,
196 .name = DRIVER, 196 .name = DRIVER,
diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c
index 675878f49f76..a30d2f613c03 100644
--- a/drivers/i2c/busses/i2c-pca-platform.c
+++ b/drivers/i2c/busses/i2c-pca-platform.c
@@ -131,7 +131,7 @@ static irqreturn_t i2c_pca_pf_handler(int this_irq, void *dev_id)
131} 131}
132 132
133 133
134static int __devinit i2c_pca_pf_probe(struct platform_device *pdev) 134static int i2c_pca_pf_probe(struct platform_device *pdev)
135{ 135{
136 struct i2c_pca_pf_data *i2c; 136 struct i2c_pca_pf_data *i2c;
137 struct resource *res; 137 struct resource *res;
@@ -257,7 +257,7 @@ e_print:
257 return ret; 257 return ret;
258} 258}
259 259
260static int __devexit i2c_pca_pf_remove(struct platform_device *pdev) 260static int i2c_pca_pf_remove(struct platform_device *pdev)
261{ 261{
262 struct i2c_pca_pf_data *i2c = platform_get_drvdata(pdev); 262 struct i2c_pca_pf_data *i2c = platform_get_drvdata(pdev);
263 platform_set_drvdata(pdev, NULL); 263 platform_set_drvdata(pdev, NULL);
@@ -279,7 +279,7 @@ static int __devexit i2c_pca_pf_remove(struct platform_device *pdev)
279 279
280static struct platform_driver i2c_pca_pf_driver = { 280static struct platform_driver i2c_pca_pf_driver = {
281 .probe = i2c_pca_pf_probe, 281 .probe = i2c_pca_pf_probe,
282 .remove = __devexit_p(i2c_pca_pf_remove), 282 .remove = i2c_pca_pf_remove,
283 .driver = { 283 .driver = {
284 .name = "i2c-pca-platform", 284 .name = "i2c-pca-platform",
285 .owner = THIS_MODULE, 285 .owner = THIS_MODULE,
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index f7216ed2f3a9..39ab78c1a02c 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -99,7 +99,7 @@ MODULE_PARM_DESC(force_addr,
99static int srvrworks_csb5_delay; 99static int srvrworks_csb5_delay;
100static struct pci_driver piix4_driver; 100static struct pci_driver piix4_driver;
101 101
102static struct dmi_system_id __devinitdata piix4_dmi_blacklist[] = { 102static const struct dmi_system_id piix4_dmi_blacklist[] = {
103 { 103 {
104 .ident = "Sapphire AM2RD790", 104 .ident = "Sapphire AM2RD790",
105 .matches = { 105 .matches = {
@@ -119,7 +119,7 @@ static struct dmi_system_id __devinitdata piix4_dmi_blacklist[] = {
119 119
120/* The IBM entry is in a separate table because we only check it 120/* The IBM entry is in a separate table because we only check it
121 on Intel-based systems */ 121 on Intel-based systems */
122static struct dmi_system_id __devinitdata piix4_dmi_ibm[] = { 122static const struct dmi_system_id piix4_dmi_ibm[] = {
123 { 123 {
124 .ident = "IBM", 124 .ident = "IBM",
125 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, 125 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -131,8 +131,8 @@ struct i2c_piix4_adapdata {
131 unsigned short smba; 131 unsigned short smba;
132}; 132};
133 133
134static int __devinit piix4_setup(struct pci_dev *PIIX4_dev, 134static int piix4_setup(struct pci_dev *PIIX4_dev,
135 const struct pci_device_id *id) 135 const struct pci_device_id *id)
136{ 136{
137 unsigned char temp; 137 unsigned char temp;
138 unsigned short piix4_smba; 138 unsigned short piix4_smba;
@@ -230,8 +230,8 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,
230 return piix4_smba; 230 return piix4_smba;
231} 231}
232 232
233static int __devinit piix4_setup_sb800(struct pci_dev *PIIX4_dev, 233static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
234 const struct pci_device_id *id) 234 const struct pci_device_id *id)
235{ 235{
236 unsigned short piix4_smba; 236 unsigned short piix4_smba;
237 unsigned short smba_idx = 0xcd6; 237 unsigned short smba_idx = 0xcd6;
@@ -294,9 +294,9 @@ static int __devinit piix4_setup_sb800(struct pci_dev *PIIX4_dev,
294 return piix4_smba; 294 return piix4_smba;
295} 295}
296 296
297static int __devinit piix4_setup_aux(struct pci_dev *PIIX4_dev, 297static int piix4_setup_aux(struct pci_dev *PIIX4_dev,
298 const struct pci_device_id *id, 298 const struct pci_device_id *id,
299 unsigned short base_reg_addr) 299 unsigned short base_reg_addr)
300{ 300{
301 /* Set up auxiliary SMBus controllers found on some 301 /* Set up auxiliary SMBus controllers found on some
302 * AMD chipsets e.g. SP5100 (SB700 derivative) */ 302 * AMD chipsets e.g. SP5100 (SB700 derivative) */
@@ -540,9 +540,8 @@ MODULE_DEVICE_TABLE (pci, piix4_ids);
540static struct i2c_adapter *piix4_main_adapter; 540static struct i2c_adapter *piix4_main_adapter;
541static struct i2c_adapter *piix4_aux_adapter; 541static struct i2c_adapter *piix4_aux_adapter;
542 542
543static int __devinit piix4_add_adapter(struct pci_dev *dev, 543static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
544 unsigned short smba, 544 struct i2c_adapter **padap)
545 struct i2c_adapter **padap)
546{ 545{
547 struct i2c_adapter *adap; 546 struct i2c_adapter *adap;
548 struct i2c_piix4_adapdata *adapdata; 547 struct i2c_piix4_adapdata *adapdata;
@@ -588,8 +587,7 @@ static int __devinit piix4_add_adapter(struct pci_dev *dev,
588 return 0; 587 return 0;
589} 588}
590 589
591static int __devinit piix4_probe(struct pci_dev *dev, 590static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
592 const struct pci_device_id *id)
593{ 591{
594 int retval; 592 int retval;
595 593
@@ -626,7 +624,7 @@ static int __devinit piix4_probe(struct pci_dev *dev,
626 return 0; 624 return 0;
627} 625}
628 626
629static void __devexit piix4_adap_remove(struct i2c_adapter *adap) 627static void piix4_adap_remove(struct i2c_adapter *adap)
630{ 628{
631 struct i2c_piix4_adapdata *adapdata = i2c_get_adapdata(adap); 629 struct i2c_piix4_adapdata *adapdata = i2c_get_adapdata(adap);
632 630
@@ -638,7 +636,7 @@ static void __devexit piix4_adap_remove(struct i2c_adapter *adap)
638 } 636 }
639} 637}
640 638
641static void __devexit piix4_remove(struct pci_dev *dev) 639static void piix4_remove(struct pci_dev *dev)
642{ 640{
643 if (piix4_main_adapter) { 641 if (piix4_main_adapter) {
644 piix4_adap_remove(piix4_main_adapter); 642 piix4_adap_remove(piix4_main_adapter);
@@ -655,7 +653,7 @@ static struct pci_driver piix4_driver = {
655 .name = "piix4_smbus", 653 .name = "piix4_smbus",
656 .id_table = piix4_ids, 654 .id_table = piix4_ids,
657 .probe = piix4_probe, 655 .probe = piix4_probe,
658 .remove = __devexit_p(piix4_remove), 656 .remove = piix4_remove,
659}; 657};
660 658
661module_pci_driver(piix4_driver); 659module_pci_driver(piix4_driver);
diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c
index 3d71395ae1f7..083d68cfaf0b 100644
--- a/drivers/i2c/busses/i2c-pmcmsp.c
+++ b/drivers/i2c/busses/i2c-pmcmsp.c
@@ -270,7 +270,7 @@ static irqreturn_t pmcmsptwi_interrupt(int irq, void *ptr)
270/* 270/*
271 * Probe for and register the device and return 0 if there is one. 271 * Probe for and register the device and return 0 if there is one.
272 */ 272 */
273static int __devinit pmcmsptwi_probe(struct platform_device *pldev) 273static int pmcmsptwi_probe(struct platform_device *pldev)
274{ 274{
275 struct resource *res; 275 struct resource *res;
276 int rc = -ENODEV; 276 int rc = -ENODEV;
@@ -368,7 +368,7 @@ ret_err:
368/* 368/*
369 * Release the device and return 0 if there is one. 369 * Release the device and return 0 if there is one.
370 */ 370 */
371static int __devexit pmcmsptwi_remove(struct platform_device *pldev) 371static int pmcmsptwi_remove(struct platform_device *pldev)
372{ 372{
373 struct resource *res; 373 struct resource *res;
374 374
@@ -628,7 +628,7 @@ static struct i2c_adapter pmcmsptwi_adapter = {
628 628
629static struct platform_driver pmcmsptwi_driver = { 629static struct platform_driver pmcmsptwi_driver = {
630 .probe = pmcmsptwi_probe, 630 .probe = pmcmsptwi_probe,
631 .remove = __devexit_p(pmcmsptwi_remove), 631 .remove = pmcmsptwi_remove,
632 .driver = { 632 .driver = {
633 .name = DRV_NAME, 633 .name = DRV_NAME,
634 .owner = THIS_MODULE, 634 .owner = THIS_MODULE,
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 8488bddfe465..ce4097012e97 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -619,7 +619,7 @@ static SIMPLE_DEV_PM_OPS(i2c_pnx_pm,
619#define PNX_I2C_PM NULL 619#define PNX_I2C_PM NULL
620#endif 620#endif
621 621
622static int __devinit i2c_pnx_probe(struct platform_device *pdev) 622static int i2c_pnx_probe(struct platform_device *pdev)
623{ 623{
624 unsigned long tmp; 624 unsigned long tmp;
625 int ret = 0; 625 int ret = 0;
@@ -765,7 +765,7 @@ err_kzalloc:
765 return ret; 765 return ret;
766} 766}
767 767
768static int __devexit i2c_pnx_remove(struct platform_device *pdev) 768static int i2c_pnx_remove(struct platform_device *pdev)
769{ 769{
770 struct i2c_pnx_algo_data *alg_data = platform_get_drvdata(pdev); 770 struct i2c_pnx_algo_data *alg_data = platform_get_drvdata(pdev);
771 771
@@ -797,7 +797,7 @@ static struct platform_driver i2c_pnx_driver = {
797 .pm = PNX_I2C_PM, 797 .pm = PNX_I2C_PM,
798 }, 798 },
799 .probe = i2c_pnx_probe, 799 .probe = i2c_pnx_probe,
800 .remove = __devexit_p(i2c_pnx_remove), 800 .remove = i2c_pnx_remove,
801}; 801};
802 802
803static int __init i2c_adap_pnx_init(void) 803static int __init i2c_adap_pnx_init(void)
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index 5285f8565de4..0dd5b334d090 100644
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -210,7 +210,7 @@ static const struct i2c_algorithm i2c_powermac_algorithm = {
210}; 210};
211 211
212 212
213static int __devexit i2c_powermac_remove(struct platform_device *dev) 213static int i2c_powermac_remove(struct platform_device *dev)
214{ 214{
215 struct i2c_adapter *adapter = platform_get_drvdata(dev); 215 struct i2c_adapter *adapter = platform_get_drvdata(dev);
216 int rc; 216 int rc;
@@ -227,7 +227,7 @@ static int __devexit i2c_powermac_remove(struct platform_device *dev)
227 return 0; 227 return 0;
228} 228}
229 229
230static u32 __devinit i2c_powermac_get_addr(struct i2c_adapter *adap, 230static u32 i2c_powermac_get_addr(struct i2c_adapter *adap,
231 struct pmac_i2c_bus *bus, 231 struct pmac_i2c_bus *bus,
232 struct device_node *node) 232 struct device_node *node)
233{ 233{
@@ -255,7 +255,7 @@ static u32 __devinit i2c_powermac_get_addr(struct i2c_adapter *adap,
255 return 0xffffffff; 255 return 0xffffffff;
256} 256}
257 257
258static void __devinit i2c_powermac_create_one(struct i2c_adapter *adap, 258static void i2c_powermac_create_one(struct i2c_adapter *adap,
259 const char *type, 259 const char *type,
260 u32 addr) 260 u32 addr)
261{ 261{
@@ -271,7 +271,7 @@ static void __devinit i2c_powermac_create_one(struct i2c_adapter *adap,
271 type); 271 type);
272} 272}
273 273
274static void __devinit i2c_powermac_add_missing(struct i2c_adapter *adap, 274static void i2c_powermac_add_missing(struct i2c_adapter *adap,
275 struct pmac_i2c_bus *bus, 275 struct pmac_i2c_bus *bus,
276 bool found_onyx) 276 bool found_onyx)
277{ 277{
@@ -297,7 +297,7 @@ static void __devinit i2c_powermac_add_missing(struct i2c_adapter *adap,
297 } 297 }
298} 298}
299 299
300static bool __devinit i2c_powermac_get_type(struct i2c_adapter *adap, 300static bool i2c_powermac_get_type(struct i2c_adapter *adap,
301 struct device_node *node, 301 struct device_node *node,
302 u32 addr, char *type, int type_size) 302 u32 addr, char *type, int type_size)
303{ 303{
@@ -336,7 +336,7 @@ static bool __devinit i2c_powermac_get_type(struct i2c_adapter *adap,
336 return false; 336 return false;
337} 337}
338 338
339static void __devinit i2c_powermac_register_devices(struct i2c_adapter *adap, 339static void i2c_powermac_register_devices(struct i2c_adapter *adap,
340 struct pmac_i2c_bus *bus) 340 struct pmac_i2c_bus *bus)
341{ 341{
342 struct i2c_client *newdev; 342 struct i2c_client *newdev;
@@ -403,7 +403,7 @@ static void __devinit i2c_powermac_register_devices(struct i2c_adapter *adap,
403 i2c_powermac_add_missing(adap, bus, found_onyx); 403 i2c_powermac_add_missing(adap, bus, found_onyx);
404} 404}
405 405
406static int __devinit i2c_powermac_probe(struct platform_device *dev) 406static int i2c_powermac_probe(struct platform_device *dev)
407{ 407{
408 struct pmac_i2c_bus *bus = dev->dev.platform_data; 408 struct pmac_i2c_bus *bus = dev->dev.platform_data;
409 struct device_node *parent = NULL; 409 struct device_node *parent = NULL;
@@ -467,7 +467,7 @@ static int __devinit i2c_powermac_probe(struct platform_device *dev)
467 467
468static struct platform_driver i2c_powermac_driver = { 468static struct platform_driver i2c_powermac_driver = {
469 .probe = i2c_powermac_probe, 469 .probe = i2c_powermac_probe,
470 .remove = __devexit_p(i2c_powermac_remove), 470 .remove = i2c_powermac_remove,
471 .driver = { 471 .driver = {
472 .name = "i2c-powermac", 472 .name = "i2c-powermac",
473 .bus = &platform_bus_type, 473 .bus = &platform_bus_type,
diff --git a/drivers/i2c/busses/i2c-puv3.c b/drivers/i2c/busses/i2c-puv3.c
index d8515be00b98..d7c512d717a7 100644
--- a/drivers/i2c/busses/i2c-puv3.c
+++ b/drivers/i2c/busses/i2c-puv3.c
@@ -184,7 +184,7 @@ static struct i2c_algorithm puv3_i2c_algorithm = {
184/* 184/*
185 * Main initialization routine. 185 * Main initialization routine.
186 */ 186 */
187static int __devinit puv3_i2c_probe(struct platform_device *pdev) 187static int puv3_i2c_probe(struct platform_device *pdev)
188{ 188{
189 struct i2c_adapter *adapter; 189 struct i2c_adapter *adapter;
190 struct resource *mem; 190 struct resource *mem;
@@ -231,7 +231,7 @@ fail_nomem:
231 return rc; 231 return rc;
232} 232}
233 233
234static int __devexit puv3_i2c_remove(struct platform_device *pdev) 234static int puv3_i2c_remove(struct platform_device *pdev)
235{ 235{
236 struct i2c_adapter *adapter = platform_get_drvdata(pdev); 236 struct i2c_adapter *adapter = platform_get_drvdata(pdev);
237 struct resource *mem; 237 struct resource *mem;
@@ -276,7 +276,7 @@ static SIMPLE_DEV_PM_OPS(puv3_i2c_pm, puv3_i2c_suspend, NULL);
276 276
277static struct platform_driver puv3_i2c_driver = { 277static struct platform_driver puv3_i2c_driver = {
278 .probe = puv3_i2c_probe, 278 .probe = puv3_i2c_probe,
279 .remove = __devexit_p(puv3_i2c_remove), 279 .remove = puv3_i2c_remove,
280 .driver = { 280 .driver = {
281 .name = "PKUnity-v3-I2C", 281 .name = "PKUnity-v3-I2C",
282 .owner = THIS_MODULE, 282 .owner = THIS_MODULE,
diff --git a/drivers/i2c/busses/i2c-pxa-pci.c b/drivers/i2c/busses/i2c-pxa-pci.c
index 4dc9bef17d77..3d4985695aed 100644
--- a/drivers/i2c/busses/i2c-pxa-pci.c
+++ b/drivers/i2c/busses/i2c-pxa-pci.c
@@ -94,7 +94,7 @@ out:
94 return ERR_PTR(ret); 94 return ERR_PTR(ret);
95} 95}
96 96
97static int __devinit ce4100_i2c_probe(struct pci_dev *dev, 97static int ce4100_i2c_probe(struct pci_dev *dev,
98 const struct pci_device_id *ent) 98 const struct pci_device_id *ent)
99{ 99{
100 int ret; 100 int ret;
@@ -135,7 +135,7 @@ err_mem:
135 return ret; 135 return ret;
136} 136}
137 137
138static void __devexit ce4100_i2c_remove(struct pci_dev *dev) 138static void ce4100_i2c_remove(struct pci_dev *dev)
139{ 139{
140 struct ce4100_devices *sds; 140 struct ce4100_devices *sds;
141 unsigned int i; 141 unsigned int i;
@@ -160,7 +160,7 @@ static struct pci_driver ce4100_i2c_driver = {
160 .name = "ce4100_i2c", 160 .name = "ce4100_i2c",
161 .id_table = ce4100_i2c_devices, 161 .id_table = ce4100_i2c_devices,
162 .probe = ce4100_i2c_probe, 162 .probe = ce4100_i2c_probe,
163 .remove = __devexit_p(ce4100_i2c_remove), 163 .remove = ce4100_i2c_remove,
164}; 164};
165 165
166module_pci_driver(ce4100_i2c_driver); 166module_pci_driver(ce4100_i2c_driver);
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index 72a8071a5556..9bd4d73d29e3 100644
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -613,7 +613,7 @@ static const struct i2c_algorithm rcar_i2c_algo = {
613 .functionality = rcar_i2c_func, 613 .functionality = rcar_i2c_func,
614}; 614};
615 615
616static int __devinit rcar_i2c_probe(struct platform_device *pdev) 616static int rcar_i2c_probe(struct platform_device *pdev)
617{ 617{
618 struct i2c_rcar_platform_data *pdata = pdev->dev.platform_data; 618 struct i2c_rcar_platform_data *pdata = pdev->dev.platform_data;
619 struct rcar_i2c_priv *priv; 619 struct rcar_i2c_priv *priv;
@@ -682,7 +682,7 @@ static int __devinit rcar_i2c_probe(struct platform_device *pdev)
682 return 0; 682 return 0;
683} 683}
684 684
685static int __devexit rcar_i2c_remove(struct platform_device *pdev) 685static int rcar_i2c_remove(struct platform_device *pdev)
686{ 686{
687 struct rcar_i2c_priv *priv = platform_get_drvdata(pdev); 687 struct rcar_i2c_priv *priv = platform_get_drvdata(pdev);
688 struct device *dev = &pdev->dev; 688 struct device *dev = &pdev->dev;
@@ -699,7 +699,7 @@ static struct platform_driver rcar_i2c_driver = {
699 .owner = THIS_MODULE, 699 .owner = THIS_MODULE,
700 }, 700 },
701 .probe = rcar_i2c_probe, 701 .probe = rcar_i2c_probe,
702 .remove = __devexit_p(rcar_i2c_remove), 702 .remove = rcar_i2c_remove,
703}; 703};
704 704
705module_platform_driver(rcar_i2c_driver); 705module_platform_driver(rcar_i2c_driver);
diff --git a/drivers/i2c/busses/i2c-s6000.c b/drivers/i2c/busses/i2c-s6000.c
index b76a29d1f8e4..008836409efe 100644
--- a/drivers/i2c/busses/i2c-s6000.c
+++ b/drivers/i2c/busses/i2c-s6000.c
@@ -248,7 +248,7 @@ static struct i2c_algorithm s6i2c_algorithm = {
248 .functionality = s6i2c_functionality, 248 .functionality = s6i2c_functionality,
249}; 249};
250 250
251static u16 __devinit nanoseconds_on_clk(struct s6i2c_if *iface, u32 ns) 251static u16 nanoseconds_on_clk(struct s6i2c_if *iface, u32 ns)
252{ 252{
253 u32 dividend = ((clk_get_rate(iface->clk) / 1000) * ns) / 1000000; 253 u32 dividend = ((clk_get_rate(iface->clk) / 1000) * ns) / 1000000;
254 if (dividend > 0xffff) 254 if (dividend > 0xffff)
@@ -256,7 +256,7 @@ static u16 __devinit nanoseconds_on_clk(struct s6i2c_if *iface, u32 ns)
256 return dividend; 256 return dividend;
257} 257}
258 258
259static int __devinit s6i2c_probe(struct platform_device *dev) 259static int s6i2c_probe(struct platform_device *dev)
260{ 260{
261 struct s6i2c_if *iface = &s6i2c_if; 261 struct s6i2c_if *iface = &s6i2c_if;
262 struct i2c_adapter *p_adap; 262 struct i2c_adapter *p_adap;
@@ -361,7 +361,7 @@ err_out:
361 return rc; 361 return rc;
362} 362}
363 363
364static int __devexit s6i2c_remove(struct platform_device *pdev) 364static int s6i2c_remove(struct platform_device *pdev)
365{ 365{
366 struct s6i2c_if *iface = platform_get_drvdata(pdev); 366 struct s6i2c_if *iface = platform_get_drvdata(pdev);
367 i2c_wr16(iface, S6_I2C_ENABLE, 0); 367 i2c_wr16(iface, S6_I2C_ENABLE, 0);
@@ -378,7 +378,7 @@ static int __devexit s6i2c_remove(struct platform_device *pdev)
378 378
379static struct platform_driver s6i2c_driver = { 379static struct platform_driver s6i2c_driver = {
380 .probe = s6i2c_probe, 380 .probe = s6i2c_probe,
381 .remove = __devexit_p(s6i2c_remove), 381 .remove = s6i2c_remove,
382 .driver = { 382 .driver = {
383 .name = DRV_NAME, 383 .name = DRV_NAME,
384 .owner = THIS_MODULE, 384 .owner = THIS_MODULE,
diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c
index c0c9dffbdb12..3a2253e1bf59 100644
--- a/drivers/i2c/busses/i2c-sh7760.c
+++ b/drivers/i2c/busses/i2c-sh7760.c
@@ -390,7 +390,7 @@ static const struct i2c_algorithm sh7760_i2c_algo = {
390 * iclk = mclk/(CDF + 1). iclk must be < 20MHz. 390 * iclk = mclk/(CDF + 1). iclk must be < 20MHz.
391 * scl = iclk/(SCGD*8 + 20). 391 * scl = iclk/(SCGD*8 + 20).
392 */ 392 */
393static int __devinit calc_CCR(unsigned long scl_hz) 393static int calc_CCR(unsigned long scl_hz)
394{ 394{
395 struct clk *mclk; 395 struct clk *mclk;
396 unsigned long mck, m1, dff, odff, iclk; 396 unsigned long mck, m1, dff, odff, iclk;
@@ -430,7 +430,7 @@ static int __devinit calc_CCR(unsigned long scl_hz)
430 return ((scgdm << 2) | cdfm); 430 return ((scgdm << 2) | cdfm);
431} 431}
432 432
433static int __devinit sh7760_i2c_probe(struct platform_device *pdev) 433static int sh7760_i2c_probe(struct platform_device *pdev)
434{ 434{
435 struct sh7760_i2c_platdata *pd; 435 struct sh7760_i2c_platdata *pd;
436 struct resource *res; 436 struct resource *res;
@@ -536,7 +536,7 @@ out0:
536 return ret; 536 return ret;
537} 537}
538 538
539static int __devexit sh7760_i2c_remove(struct platform_device *pdev) 539static int sh7760_i2c_remove(struct platform_device *pdev)
540{ 540{
541 struct cami2c *id = platform_get_drvdata(pdev); 541 struct cami2c *id = platform_get_drvdata(pdev);
542 542
@@ -557,7 +557,7 @@ static struct platform_driver sh7760_i2c_drv = {
557 .owner = THIS_MODULE, 557 .owner = THIS_MODULE,
558 }, 558 },
559 .probe = sh7760_i2c_probe, 559 .probe = sh7760_i2c_probe,
560 .remove = __devexit_p(sh7760_i2c_remove), 560 .remove = sh7760_i2c_remove,
561}; 561};
562 562
563module_platform_driver(sh7760_i2c_drv); 563module_platform_driver(sh7760_i2c_drv);
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index 9411c1b892c0..b6e7a83a8296 100644
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -758,7 +758,7 @@ static const struct dev_pm_ops sh_mobile_i2c_dev_pm_ops = {
758 .runtime_resume = sh_mobile_i2c_runtime_nop, 758 .runtime_resume = sh_mobile_i2c_runtime_nop,
759}; 759};
760 760
761static const struct of_device_id sh_mobile_i2c_dt_ids[] __devinitconst = { 761static const struct of_device_id sh_mobile_i2c_dt_ids[] = {
762 { .compatible = "renesas,rmobile-iic", }, 762 { .compatible = "renesas,rmobile-iic", },
763 {}, 763 {},
764}; 764};
diff --git a/drivers/i2c/busses/i2c-sirf.c b/drivers/i2c/busses/i2c-sirf.c
index 5574a47792fb..3f1818b87974 100644
--- a/drivers/i2c/busses/i2c-sirf.c
+++ b/drivers/i2c/busses/i2c-sirf.c
@@ -258,7 +258,7 @@ static const struct i2c_algorithm i2c_sirfsoc_algo = {
258 .functionality = i2c_sirfsoc_func, 258 .functionality = i2c_sirfsoc_func,
259}; 259};
260 260
261static int __devinit i2c_sirfsoc_probe(struct platform_device *pdev) 261static int i2c_sirfsoc_probe(struct platform_device *pdev)
262{ 262{
263 struct sirfsoc_i2c *siic; 263 struct sirfsoc_i2c *siic;
264 struct i2c_adapter *adap; 264 struct i2c_adapter *adap;
@@ -385,7 +385,7 @@ err_get_clk:
385 return err; 385 return err;
386} 386}
387 387
388static int __devexit i2c_sirfsoc_remove(struct platform_device *pdev) 388static int i2c_sirfsoc_remove(struct platform_device *pdev)
389{ 389{
390 struct i2c_adapter *adapter = platform_get_drvdata(pdev); 390 struct i2c_adapter *adapter = platform_get_drvdata(pdev);
391 struct sirfsoc_i2c *siic = adapter->algo_data; 391 struct sirfsoc_i2c *siic = adapter->algo_data;
@@ -433,7 +433,7 @@ static const struct dev_pm_ops i2c_sirfsoc_pm_ops = {
433}; 433};
434#endif 434#endif
435 435
436static const struct of_device_id sirfsoc_i2c_of_match[] __devinitconst = { 436static const struct of_device_id sirfsoc_i2c_of_match[] = {
437 { .compatible = "sirf,prima2-i2c", }, 437 { .compatible = "sirf,prima2-i2c", },
438 {}, 438 {},
439}; 439};
@@ -449,7 +449,7 @@ static struct platform_driver i2c_sirfsoc_driver = {
449 .of_match_table = sirfsoc_i2c_of_match, 449 .of_match_table = sirfsoc_i2c_of_match,
450 }, 450 },
451 .probe = i2c_sirfsoc_probe, 451 .probe = i2c_sirfsoc_probe,
452 .remove = __devexit_p(i2c_sirfsoc_remove), 452 .remove = i2c_sirfsoc_remove,
453}; 453};
454module_platform_driver(i2c_sirfsoc_driver); 454module_platform_driver(i2c_sirfsoc_driver);
455 455
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index 87e5126d449c..79fd96a04386 100644
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -142,7 +142,7 @@ static void sis5595_write(u8 reg, u8 data)
142 outb(data, sis5595_base + SMB_DAT); 142 outb(data, sis5595_base + SMB_DAT);
143} 143}
144 144
145static int __devinit sis5595_setup(struct pci_dev *SIS5595_dev) 145static int sis5595_setup(struct pci_dev *SIS5595_dev)
146{ 146{
147 u16 a; 147 u16 a;
148 u8 val; 148 u8 val;
@@ -376,7 +376,7 @@ static DEFINE_PCI_DEVICE_TABLE(sis5595_ids) = {
376 376
377MODULE_DEVICE_TABLE (pci, sis5595_ids); 377MODULE_DEVICE_TABLE (pci, sis5595_ids);
378 378
379static int __devinit sis5595_probe(struct pci_dev *dev, const struct pci_device_id *id) 379static int sis5595_probe(struct pci_dev *dev, const struct pci_device_id *id)
380{ 380{
381 int err; 381 int err;
382 382
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index 5d6723b7525e..de6dddb9f865 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -389,7 +389,7 @@ static u32 sis630_func(struct i2c_adapter *adapter)
389 I2C_FUNC_SMBUS_BLOCK_DATA; 389 I2C_FUNC_SMBUS_BLOCK_DATA;
390} 390}
391 391
392static int __devinit sis630_setup(struct pci_dev *sis630_dev) 392static int sis630_setup(struct pci_dev *sis630_dev)
393{ 393{
394 unsigned char b; 394 unsigned char b;
395 struct pci_dev *dummy = NULL; 395 struct pci_dev *dummy = NULL;
@@ -480,7 +480,7 @@ static DEFINE_PCI_DEVICE_TABLE(sis630_ids) = {
480 480
481MODULE_DEVICE_TABLE (pci, sis630_ids); 481MODULE_DEVICE_TABLE (pci, sis630_ids);
482 482
483static int __devinit sis630_probe(struct pci_dev *dev, const struct pci_device_id *id) 483static int sis630_probe(struct pci_dev *dev, const struct pci_device_id *id)
484{ 484{
485 if (sis630_setup(dev)) { 485 if (sis630_setup(dev)) {
486 dev_err(&dev->dev, "SIS630 comp. bus not detected, module not inserted.\n"); 486 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 return i2c_add_adapter(&sis630_adapter); 496 return i2c_add_adapter(&sis630_adapter);
497} 497}
498 498
499static void __devexit sis630_remove(struct pci_dev *dev) 499static void sis630_remove(struct pci_dev *dev)
500{ 500{
501 if (acpi_base) { 501 if (acpi_base) {
502 i2c_del_adapter(&sis630_adapter); 502 i2c_del_adapter(&sis630_adapter);
@@ -510,7 +510,7 @@ static struct pci_driver sis630_driver = {
510 .name = "sis630_smbus", 510 .name = "sis630_smbus",
511 .id_table = sis630_ids, 511 .id_table = sis630_ids,
512 .probe = sis630_probe, 512 .probe = sis630_probe,
513 .remove = __devexit_p(sis630_remove), 513 .remove = sis630_remove,
514}; 514};
515 515
516module_pci_driver(sis630_driver); 516module_pci_driver(sis630_driver);
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index 7b72614a9bc0..b9faf9b6002b 100644
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -252,7 +252,7 @@ static DEFINE_PCI_DEVICE_TABLE(sis96x_ids) = {
252 252
253MODULE_DEVICE_TABLE (pci, sis96x_ids); 253MODULE_DEVICE_TABLE (pci, sis96x_ids);
254 254
255static int __devinit sis96x_probe(struct pci_dev *dev, 255static int sis96x_probe(struct pci_dev *dev,
256 const struct pci_device_id *id) 256 const struct pci_device_id *id)
257{ 257{
258 u16 ww = 0; 258 u16 ww = 0;
@@ -308,7 +308,7 @@ static int __devinit sis96x_probe(struct pci_dev *dev,
308 return retval; 308 return retval;
309} 309}
310 310
311static void __devexit sis96x_remove(struct pci_dev *dev) 311static void sis96x_remove(struct pci_dev *dev)
312{ 312{
313 if (sis96x_smbus_base) { 313 if (sis96x_smbus_base) {
314 i2c_del_adapter(&sis96x_adapter); 314 i2c_del_adapter(&sis96x_adapter);
@@ -321,7 +321,7 @@ static struct pci_driver sis96x_driver = {
321 .name = "sis96x_smbus", 321 .name = "sis96x_smbus",
322 .id_table = sis96x_ids, 322 .id_table = sis96x_ids,
323 .probe = sis96x_probe, 323 .probe = sis96x_probe,
324 .remove = __devexit_p(sis96x_remove), 324 .remove = sis96x_remove,
325}; 325};
326 326
327module_pci_driver(sis96x_driver); 327module_pci_driver(sis96x_driver);
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index dcea77bf6f50..7b38877ffec1 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -642,7 +642,7 @@ static const struct tegra_i2c_hw_feature tegra30_i2c_hw = {
642 642
643#if defined(CONFIG_OF) 643#if defined(CONFIG_OF)
644/* Match table for of_platform binding */ 644/* Match table for of_platform binding */
645static const struct of_device_id tegra_i2c_of_match[] __devinitconst = { 645static const struct of_device_id tegra_i2c_of_match[] = {
646 { .compatible = "nvidia,tegra30-i2c", .data = &tegra30_i2c_hw, }, 646 { .compatible = "nvidia,tegra30-i2c", .data = &tegra30_i2c_hw, },
647 { .compatible = "nvidia,tegra20-i2c", .data = &tegra20_i2c_hw, }, 647 { .compatible = "nvidia,tegra20-i2c", .data = &tegra20_i2c_hw, },
648 { .compatible = "nvidia,tegra20-i2c-dvc", .data = &tegra20_i2c_hw, }, 648 { .compatible = "nvidia,tegra20-i2c-dvc", .data = &tegra20_i2c_hw, },
@@ -651,7 +651,7 @@ static const struct of_device_id tegra_i2c_of_match[] __devinitconst = {
651MODULE_DEVICE_TABLE(of, tegra_i2c_of_match); 651MODULE_DEVICE_TABLE(of, tegra_i2c_of_match);
652#endif 652#endif
653 653
654static int __devinit tegra_i2c_probe(struct platform_device *pdev) 654static int tegra_i2c_probe(struct platform_device *pdev)
655{ 655{
656 struct tegra_i2c_dev *i2c_dev; 656 struct tegra_i2c_dev *i2c_dev;
657 struct tegra_i2c_platform_data *pdata = pdev->dev.platform_data; 657 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 return 0; 769 return 0;
770} 770}
771 771
772static int __devexit tegra_i2c_remove(struct platform_device *pdev) 772static int tegra_i2c_remove(struct platform_device *pdev)
773{ 773{
774 struct tegra_i2c_dev *i2c_dev = platform_get_drvdata(pdev); 774 struct tegra_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
775 i2c_del_adapter(&i2c_dev->adapter); 775 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 817
818static struct platform_driver tegra_i2c_driver = { 818static struct platform_driver tegra_i2c_driver = {
819 .probe = tegra_i2c_probe, 819 .probe = tegra_i2c_probe,
820 .remove = __devexit_p(tegra_i2c_remove), 820 .remove = tegra_i2c_remove,
821 .driver = { 821 .driver = {
822 .name = "tegra-i2c", 822 .name = "tegra-i2c",
823 .owner = THIS_MODULE, 823 .owner = THIS_MODULE,
diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c
index 7ffee71ca190..be662511c58b 100644
--- a/drivers/i2c/busses/i2c-via.c
+++ b/drivers/i2c/busses/i2c-via.c
@@ -96,7 +96,7 @@ static DEFINE_PCI_DEVICE_TABLE(vt586b_ids) = {
96 96
97MODULE_DEVICE_TABLE (pci, vt586b_ids); 97MODULE_DEVICE_TABLE (pci, vt586b_ids);
98 98
99static int __devinit vt586b_probe(struct pci_dev *dev, const struct pci_device_id *id) 99static int vt586b_probe(struct pci_dev *dev, const struct pci_device_id *id)
100{ 100{
101 u16 base; 101 u16 base;
102 u8 rev; 102 u8 rev;
@@ -146,7 +146,7 @@ static int __devinit vt586b_probe(struct pci_dev *dev, const struct pci_device_i
146 return 0; 146 return 0;
147} 147}
148 148
149static void __devexit vt586b_remove(struct pci_dev *dev) 149static void vt586b_remove(struct pci_dev *dev)
150{ 150{
151 i2c_del_adapter(&vt586b_adapter); 151 i2c_del_adapter(&vt586b_adapter);
152 release_region(I2C_DIR, IOSPACE); 152 release_region(I2C_DIR, IOSPACE);
@@ -158,7 +158,7 @@ static struct pci_driver vt586b_driver = {
158 .name = "vt586b_smbus", 158 .name = "vt586b_smbus",
159 .id_table = vt586b_ids, 159 .id_table = vt586b_ids,
160 .probe = vt586b_probe, 160 .probe = vt586b_probe,
161 .remove = __devexit_p(vt586b_remove), 161 .remove = vt586b_remove,
162}; 162};
163 163
164module_pci_driver(vt586b_driver); 164module_pci_driver(vt586b_driver);
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 271c9a2b0fd7..b2d90e105f41 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -320,8 +320,8 @@ static struct i2c_adapter vt596_adapter = {
320 .algo = &smbus_algorithm, 320 .algo = &smbus_algorithm,
321}; 321};
322 322
323static int __devinit vt596_probe(struct pci_dev *pdev, 323static int vt596_probe(struct pci_dev *pdev,
324 const struct pci_device_id *id) 324 const struct pci_device_id *id)
325{ 325{
326 unsigned char temp; 326 unsigned char temp;
327 int error; 327 int error;
diff --git a/drivers/i2c/busses/i2c-viperboard.c b/drivers/i2c/busses/i2c-viperboard.c
index f5fa20dea906..f45c32c1ace6 100644
--- a/drivers/i2c/busses/i2c-viperboard.c
+++ b/drivers/i2c/busses/i2c-viperboard.c
@@ -360,7 +360,7 @@ static const struct i2c_algorithm vprbrd_algorithm = {
360 .functionality = vprbrd_i2c_func, 360 .functionality = vprbrd_i2c_func,
361}; 361};
362 362
363static int __devinit vprbrd_i2c_probe(struct platform_device *pdev) 363static int vprbrd_i2c_probe(struct platform_device *pdev)
364{ 364{
365 struct vprbrd *vb = dev_get_drvdata(pdev->dev.parent); 365 struct vprbrd *vb = dev_get_drvdata(pdev->dev.parent);
366 struct vprbrd_i2c *vb_i2c; 366 struct vprbrd_i2c *vb_i2c;
@@ -418,7 +418,7 @@ error:
418 return ret; 418 return ret;
419} 419}
420 420
421static int __devexit vprbrd_i2c_remove(struct platform_device *pdev) 421static int vprbrd_i2c_remove(struct platform_device *pdev)
422{ 422{
423 struct vprbrd_i2c *vb_i2c = platform_get_drvdata(pdev); 423 struct vprbrd_i2c *vb_i2c = platform_get_drvdata(pdev);
424 int ret; 424 int ret;
@@ -432,7 +432,7 @@ static struct platform_driver vprbrd_i2c_driver = {
432 .driver.name = "viperboard-i2c", 432 .driver.name = "viperboard-i2c",
433 .driver.owner = THIS_MODULE, 433 .driver.owner = THIS_MODULE,
434 .probe = vprbrd_i2c_probe, 434 .probe = vprbrd_i2c_probe,
435 .remove = __devexit_p(vprbrd_i2c_remove), 435 .remove = vprbrd_i2c_remove,
436}; 436};
437 437
438static int __init vprbrd_i2c_init(void) 438static int __init vprbrd_i2c_init(void)
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index 641d0e5e3303..f042f6da0ace 100644
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -689,7 +689,7 @@ static struct i2c_adapter xiic_adapter = {
689}; 689};
690 690
691 691
692static int __devinit xiic_i2c_probe(struct platform_device *pdev) 692static int xiic_i2c_probe(struct platform_device *pdev)
693{ 693{
694 struct xiic_i2c *i2c; 694 struct xiic_i2c *i2c;
695 struct xiic_i2c_platform_data *pdata; 695 struct xiic_i2c_platform_data *pdata;
@@ -774,7 +774,7 @@ resource_missing:
774 return -ENOENT; 774 return -ENOENT;
775} 775}
776 776
777static int __devexit xiic_i2c_remove(struct platform_device* pdev) 777static int xiic_i2c_remove(struct platform_device *pdev)
778{ 778{
779 struct xiic_i2c *i2c = platform_get_drvdata(pdev); 779 struct xiic_i2c *i2c = platform_get_drvdata(pdev);
780 struct resource *res; 780 struct resource *res;
@@ -800,7 +800,7 @@ static int __devexit xiic_i2c_remove(struct platform_device* pdev)
800} 800}
801 801
802#if defined(CONFIG_OF) 802#if defined(CONFIG_OF)
803static const struct of_device_id xiic_of_match[] __devinitconst = { 803static const struct of_device_id xiic_of_match[] = {
804 { .compatible = "xlnx,xps-iic-2.00.a", }, 804 { .compatible = "xlnx,xps-iic-2.00.a", },
805 {}, 805 {},
806}; 806};
@@ -809,7 +809,7 @@ MODULE_DEVICE_TABLE(of, xiic_of_match);
809 809
810static struct platform_driver xiic_i2c_driver = { 810static struct platform_driver xiic_i2c_driver = {
811 .probe = xiic_i2c_probe, 811 .probe = xiic_i2c_probe,
812 .remove = __devexit_p(xiic_i2c_remove), 812 .remove = xiic_i2c_remove,
813 .driver = { 813 .driver = {
814 .owner = THIS_MODULE, 814 .owner = THIS_MODULE,
815 .name = DRIVER_NAME, 815 .name = DRIVER_NAME,
diff --git a/drivers/i2c/busses/i2c-xlr.c b/drivers/i2c/busses/i2c-xlr.c
index 96d3fabd8883..a005265461da 100644
--- a/drivers/i2c/busses/i2c-xlr.c
+++ b/drivers/i2c/busses/i2c-xlr.c
@@ -214,7 +214,7 @@ static struct i2c_algorithm xlr_i2c_algo = {
214 .functionality = xlr_func, 214 .functionality = xlr_func,
215}; 215};
216 216
217static int __devinit xlr_i2c_probe(struct platform_device *pdev) 217static int xlr_i2c_probe(struct platform_device *pdev)
218{ 218{
219 struct xlr_i2c_private *priv; 219 struct xlr_i2c_private *priv;
220 struct resource *res; 220 struct resource *res;
@@ -251,7 +251,7 @@ static int __devinit xlr_i2c_probe(struct platform_device *pdev)
251 return 0; 251 return 0;
252} 252}
253 253
254static int __devexit xlr_i2c_remove(struct platform_device *pdev) 254static int xlr_i2c_remove(struct platform_device *pdev)
255{ 255{
256 struct xlr_i2c_private *priv; 256 struct xlr_i2c_private *priv;
257 257
@@ -263,7 +263,7 @@ static int __devexit xlr_i2c_remove(struct platform_device *pdev)
263 263
264static struct platform_driver xlr_i2c_driver = { 264static struct platform_driver xlr_i2c_driver = {
265 .probe = xlr_i2c_probe, 265 .probe = xlr_i2c_probe,
266 .remove = __devexit_p(xlr_i2c_remove), 266 .remove = xlr_i2c_remove,
267 .driver = { 267 .driver = {
268 .name = "xlr-i2cbus", 268 .name = "xlr-i2cbus",
269 .owner = THIS_MODULE, 269 .owner = THIS_MODULE,
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index 08aab57337dd..3862a953239c 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -389,7 +389,7 @@ static const struct i2c_algorithm scx200_acb_algorithm = {
389static struct scx200_acb_iface *scx200_acb_list; 389static struct scx200_acb_iface *scx200_acb_list;
390static DEFINE_MUTEX(scx200_acb_list_mutex); 390static DEFINE_MUTEX(scx200_acb_list_mutex);
391 391
392static __devinit int scx200_acb_probe(struct scx200_acb_iface *iface) 392static int scx200_acb_probe(struct scx200_acb_iface *iface)
393{ 393{
394 u8 val; 394 u8 val;
395 395
@@ -424,7 +424,7 @@ static __devinit int scx200_acb_probe(struct scx200_acb_iface *iface)
424 return 0; 424 return 0;
425} 425}
426 426
427static __devinit struct scx200_acb_iface *scx200_create_iface(const char *text, 427static struct scx200_acb_iface *scx200_create_iface(const char *text,
428 struct device *dev, int index) 428 struct device *dev, int index)
429{ 429{
430 struct scx200_acb_iface *iface; 430 struct scx200_acb_iface *iface;
@@ -449,7 +449,7 @@ static __devinit struct scx200_acb_iface *scx200_create_iface(const char *text,
449 return iface; 449 return iface;
450} 450}
451 451
452static int __devinit scx200_acb_create(struct scx200_acb_iface *iface) 452static int scx200_acb_create(struct scx200_acb_iface *iface)
453{ 453{
454 struct i2c_adapter *adapter; 454 struct i2c_adapter *adapter;
455 int rc; 455 int rc;
@@ -480,7 +480,7 @@ static int __devinit scx200_acb_create(struct scx200_acb_iface *iface)
480 return 0; 480 return 0;
481} 481}
482 482
483static struct scx200_acb_iface * __devinit scx200_create_dev(const char *text, 483static struct scx200_acb_iface *scx200_create_dev(const char *text,
484 unsigned long base, int index, struct device *dev) 484 unsigned long base, int index, struct device *dev)
485{ 485{
486 struct scx200_acb_iface *iface; 486 struct scx200_acb_iface *iface;
@@ -508,7 +508,7 @@ static struct scx200_acb_iface * __devinit scx200_create_dev(const char *text,
508 return NULL; 508 return NULL;
509} 509}
510 510
511static int __devinit scx200_probe(struct platform_device *pdev) 511static int scx200_probe(struct platform_device *pdev)
512{ 512{
513 struct scx200_acb_iface *iface; 513 struct scx200_acb_iface *iface;
514 struct resource *res; 514 struct resource *res;
@@ -530,14 +530,14 @@ static int __devinit scx200_probe(struct platform_device *pdev)
530 return 0; 530 return 0;
531} 531}
532 532
533static void __devexit scx200_cleanup_iface(struct scx200_acb_iface *iface) 533static void scx200_cleanup_iface(struct scx200_acb_iface *iface)
534{ 534{
535 i2c_del_adapter(&iface->adapter); 535 i2c_del_adapter(&iface->adapter);
536 release_region(iface->base, 8); 536 release_region(iface->base, 8);
537 kfree(iface); 537 kfree(iface);
538} 538}
539 539
540static int __devexit scx200_remove(struct platform_device *pdev) 540static int scx200_remove(struct platform_device *pdev)
541{ 541{
542 struct scx200_acb_iface *iface; 542 struct scx200_acb_iface *iface;
543 543
@@ -554,7 +554,7 @@ static struct platform_driver scx200_pci_driver = {
554 .owner = THIS_MODULE, 554 .owner = THIS_MODULE,
555 }, 555 },
556 .probe = scx200_probe, 556 .probe = scx200_probe,
557 .remove = __devexit_p(scx200_remove), 557 .remove = scx200_remove,
558}; 558};
559 559
560static DEFINE_PCI_DEVICE_TABLE(scx200_isa) = { 560static DEFINE_PCI_DEVICE_TABLE(scx200_isa) = {
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index 3b7bc06fe8a6..9f50ef04a4bd 100644
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -53,14 +53,14 @@ static int i2c_mux_gpio_deselect(struct i2c_adapter *adap, void *data, u32 chan)
53 return 0; 53 return 0;
54} 54}
55 55
56static int __devinit match_gpio_chip_by_label(struct gpio_chip *chip, 56static int match_gpio_chip_by_label(struct gpio_chip *chip,
57 void *data) 57 void *data)
58{ 58{
59 return !strcmp(chip->label, data); 59 return !strcmp(chip->label, data);
60} 60}
61 61
62#ifdef CONFIG_OF 62#ifdef CONFIG_OF
63static int __devinit i2c_mux_gpio_probe_dt(struct gpiomux *mux, 63static int i2c_mux_gpio_probe_dt(struct gpiomux *mux,
64 struct platform_device *pdev) 64 struct platform_device *pdev)
65{ 65{
66 struct device_node *np = pdev->dev.of_node; 66 struct device_node *np = pdev->dev.of_node;
@@ -125,14 +125,14 @@ static int __devinit i2c_mux_gpio_probe_dt(struct gpiomux *mux,
125 return 0; 125 return 0;
126} 126}
127#else 127#else
128static int __devinit i2c_mux_gpio_probe_dt(struct gpiomux *mux, 128static int i2c_mux_gpio_probe_dt(struct gpiomux *mux,
129 struct platform_device *pdev) 129 struct platform_device *pdev)
130{ 130{
131 return 0; 131 return 0;
132} 132}
133#endif 133#endif
134 134
135static int __devinit i2c_mux_gpio_probe(struct platform_device *pdev) 135static int i2c_mux_gpio_probe(struct platform_device *pdev)
136{ 136{
137 struct gpiomux *mux; 137 struct gpiomux *mux;
138 struct i2c_adapter *parent; 138 struct i2c_adapter *parent;
@@ -239,7 +239,7 @@ alloc_failed:
239 return ret; 239 return ret;
240} 240}
241 241
242static int __devexit i2c_mux_gpio_remove(struct platform_device *pdev) 242static int i2c_mux_gpio_remove(struct platform_device *pdev)
243{ 243{
244 struct gpiomux *mux = platform_get_drvdata(pdev); 244 struct gpiomux *mux = platform_get_drvdata(pdev);
245 int i; 245 int i;
@@ -256,7 +256,7 @@ static int __devexit i2c_mux_gpio_remove(struct platform_device *pdev)
256 return 0; 256 return 0;
257} 257}
258 258
259static const struct of_device_id i2c_mux_gpio_of_match[] __devinitconst = { 259static const struct of_device_id i2c_mux_gpio_of_match[] = {
260 { .compatible = "i2c-mux-gpio", }, 260 { .compatible = "i2c-mux-gpio", },
261 {}, 261 {},
262}; 262};
@@ -264,7 +264,7 @@ MODULE_DEVICE_TABLE(of, i2c_mux_gpio_of_match);
264 264
265static struct platform_driver i2c_mux_gpio_driver = { 265static struct platform_driver i2c_mux_gpio_driver = {
266 .probe = i2c_mux_gpio_probe, 266 .probe = i2c_mux_gpio_probe,
267 .remove = __devexit_p(i2c_mux_gpio_remove), 267 .remove = i2c_mux_gpio_remove,
268 .driver = { 268 .driver = {
269 .owner = THIS_MODULE, 269 .owner = THIS_MODULE,
270 .name = "i2c-mux-gpio", 270 .name = "i2c-mux-gpio",
diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c
index 7fa5b24b16db..1e44d04d1b22 100644
--- a/drivers/i2c/muxes/i2c-mux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c
@@ -129,7 +129,7 @@ static inline int i2c_mux_pinctrl_parse_dt(struct i2c_mux_pinctrl *mux,
129} 129}
130#endif 130#endif
131 131
132static int __devinit i2c_mux_pinctrl_probe(struct platform_device *pdev) 132static int i2c_mux_pinctrl_probe(struct platform_device *pdev)
133{ 133{
134 struct i2c_mux_pinctrl *mux; 134 struct i2c_mux_pinctrl *mux;
135 int (*deselect)(struct i2c_adapter *, void *, u32); 135 int (*deselect)(struct i2c_adapter *, void *, u32);
@@ -241,7 +241,7 @@ err:
241 return ret; 241 return ret;
242} 242}
243 243
244static int __devexit i2c_mux_pinctrl_remove(struct platform_device *pdev) 244static int i2c_mux_pinctrl_remove(struct platform_device *pdev)
245{ 245{
246 struct i2c_mux_pinctrl *mux = platform_get_drvdata(pdev); 246 struct i2c_mux_pinctrl *mux = platform_get_drvdata(pdev);
247 int i; 247 int i;
@@ -255,7 +255,7 @@ static int __devexit i2c_mux_pinctrl_remove(struct platform_device *pdev)
255} 255}
256 256
257#ifdef CONFIG_OF 257#ifdef CONFIG_OF
258static const struct of_device_id i2c_mux_pinctrl_of_match[] __devinitconst = { 258static const struct of_device_id i2c_mux_pinctrl_of_match[] = {
259 { .compatible = "i2c-mux-pinctrl", }, 259 { .compatible = "i2c-mux-pinctrl", },
260 {}, 260 {},
261}; 261};
@@ -269,7 +269,7 @@ static struct platform_driver i2c_mux_pinctrl_driver = {
269 .of_match_table = of_match_ptr(i2c_mux_pinctrl_of_match), 269 .of_match_table = of_match_ptr(i2c_mux_pinctrl_of_match),
270 }, 270 },
271 .probe = i2c_mux_pinctrl_probe, 271 .probe = i2c_mux_pinctrl_probe,
272 .remove = __devexit_p(i2c_mux_pinctrl_remove), 272 .remove = i2c_mux_pinctrl_remove,
273}; 273};
274module_platform_driver(i2c_mux_pinctrl_driver); 274module_platform_driver(i2c_mux_pinctrl_driver);
275 275
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-16 23:49:19 -0500