diff options
Diffstat (limited to 'drivers/nfc/pn544/i2c.c')
-rw-r--r-- | drivers/nfc/pn544/i2c.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c index 7da9071b68b6..2a9c8d93d2e8 100644 --- a/drivers/nfc/pn544/i2c.c +++ b/drivers/nfc/pn544/i2c.c | |||
@@ -361,8 +361,8 @@ static struct nfc_phy_ops i2c_phy_ops = { | |||
361 | .disable = pn544_hci_i2c_disable, | 361 | .disable = pn544_hci_i2c_disable, |
362 | }; | 362 | }; |
363 | 363 | ||
364 | static int __devinit pn544_hci_i2c_probe(struct i2c_client *client, | 364 | static int pn544_hci_i2c_probe(struct i2c_client *client, |
365 | const struct i2c_device_id *id) | 365 | const struct i2c_device_id *id) |
366 | { | 366 | { |
367 | struct pn544_i2c_phy *phy; | 367 | struct pn544_i2c_phy *phy; |
368 | struct pn544_nfc_platform_data *pdata; | 368 | struct pn544_nfc_platform_data *pdata; |
@@ -442,7 +442,7 @@ err_phy_alloc: | |||
442 | return r; | 442 | return r; |
443 | } | 443 | } |
444 | 444 | ||
445 | static __devexit int pn544_hci_i2c_remove(struct i2c_client *client) | 445 | static int pn544_hci_i2c_remove(struct i2c_client *client) |
446 | { | 446 | { |
447 | struct pn544_i2c_phy *phy = i2c_get_clientdata(client); | 447 | struct pn544_i2c_phy *phy = i2c_get_clientdata(client); |
448 | struct pn544_nfc_platform_data *pdata = client->dev.platform_data; | 448 | struct pn544_nfc_platform_data *pdata = client->dev.platform_data; |
@@ -469,7 +469,7 @@ static struct i2c_driver pn544_hci_i2c_driver = { | |||
469 | }, | 469 | }, |
470 | .probe = pn544_hci_i2c_probe, | 470 | .probe = pn544_hci_i2c_probe, |
471 | .id_table = pn544_hci_i2c_id_table, | 471 | .id_table = pn544_hci_i2c_id_table, |
472 | .remove = __devexit_p(pn544_hci_i2c_remove), | 472 | .remove = pn544_hci_i2c_remove, |
473 | }; | 473 | }; |
474 | 474 | ||
475 | static int __init pn544_hci_i2c_init(void) | 475 | static int __init pn544_hci_i2c_init(void) |