diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-23 09:48:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-23 09:48:33 -0800 |
| commit | 637704cbc95c02d18741b4a6e7a5d2397f8b28ce (patch) | |
| tree | af99b09a5bc5c31a102df4b2fb4fe6cf10c518f4 /drivers/i2c/busses/i2c-designware-pcidrv.c | |
| parent | 4ae0a48b5efc44a95f5e7bb578f9de71fd35bfd0 (diff) | |
| parent | 0b255e927d47b550620dfd3475ee74b0f52e09c8 (diff) | |
| download | linux-3.10-637704cbc95c02d18741b4a6e7a5d2397f8b28ce.tar.gz linux-3.10-637704cbc95c02d18741b4a6e7a5d2397f8b28ce.tar.bz2 linux-3.10-637704cbc95c02d18741b4a6e7a5d2397f8b28ce.zip | |
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
Pull i2c __dev* attribute removal from Wolfram Sang:
"The squashed patches from Bill to get rid of the __dev* annotations in
the i2c subsystem. I couldn't include it in my previous pull request
due to some dependency with the mfd subsystem. I had this patch in
linux-next for two days before rc1 and nothing popped up."
* 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux:
i2c: remove __dev* attributes from subsystem
Diffstat (limited to 'drivers/i2c/busses/i2c-designware-pcidrv.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-pcidrv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c index 92a1e2c15ba..6add851e9de 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) return dev->controller->clk_khz; } -static int __devinit i2c_dw_pci_probe(struct pci_dev *pdev, +static int i2c_dw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) { struct dw_i2c_dev *dev; @@ -328,7 +328,7 @@ exit: return r; } -static void __devexit i2c_dw_pci_remove(struct pci_dev *pdev) +static void i2c_dw_pci_remove(struct pci_dev *pdev) { struct dw_i2c_dev *dev = pci_get_drvdata(pdev); @@ -368,7 +368,7 @@ static struct pci_driver dw_i2c_driver = { .name = DRIVER_NAME, .id_table = i2_designware_pci_ids, .probe = i2c_dw_pci_probe, - .remove = __devexit_p(i2c_dw_pci_remove), + .remove = i2c_dw_pci_remove, .driver = { .pm = &i2c_dw_pm_ops, }, |