diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-06-19 13:08:49 +0300 |
|---|---|---|
| committer |   Samuel Ortiz <sameo@linux.intel.com> | 2017-06-22 23:51:44 +0200 |
| commit | 8597c0920d6f4af66d2100b93599b0c0850dffdd (patch) | |
| tree | 75700eb6acb5c81b262f8a7299036a1448726f9d /drivers/nfc | |
| parent | NFC: st21nfca: Get rid of code duplication in ->probe() (diff) | |
| download | linux-dev-8597c0920d6f4af66d2100b93599b0c0850dffdd.tar.xz linux-dev-8597c0920d6f4af66d2100b93599b0c0850dffdd.zip | |
NFC: fdp: Convert I2C driver to ->probe_new()
There is no platform code that uses i2c module table.
Remove it altogether and adjust ->probe() to be ->probe_new().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/fdp/i2c.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c index e0baec848ff2..8a66b1845f27 100644 --- a/drivers/nfc/fdp/i2c.c +++ b/drivers/nfc/fdp/i2c.c @@ -281,8 +281,7 @@ vsc_read_err: *clock_type, *clock_freq, *fw_vsc_cfg != NULL ? "yes" : "no"); } -static int fdp_nci_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int fdp_nci_i2c_probe(struct i2c_client *client) { struct fdp_i2c_phy *phy; struct device *dev = &client->dev; @@ -360,12 +359,6 @@ static int fdp_nci_i2c_remove(struct i2c_client *client) return 0; } -static struct i2c_device_id fdp_nci_i2c_id_table[] = { - {"int339a", 0}, - {} -}; -MODULE_DEVICE_TABLE(i2c, fdp_nci_i2c_id_table); - static const struct acpi_device_id fdp_nci_i2c_acpi_match[] = { {"INT339A", 0}, {} @@ -377,8 +370,7 @@ static struct i2c_driver fdp_nci_i2c_driver = { .name = FDP_I2C_DRIVER_NAME, .acpi_match_table = ACPI_PTR(fdp_nci_i2c_acpi_match), }, - .id_table = fdp_nci_i2c_id_table, - .probe = fdp_nci_i2c_probe, + .probe_new = fdp_nci_i2c_probe, .remove = fdp_nci_i2c_remove, }; module_i2c_driver(fdp_nci_i2c_driver); |