From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Samuel Ortiz <sameo@linux.intel.com>, linux-wireless@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 04/12] NFC: fdp: Convert I2C driver to ->probe_new()
Date: Mon, 5 Jun 2017 23:20:01 +0300 [thread overview]
Message-ID: <20170605202009.78561-5-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20170605202009.78561-1-andriy.shevchenko@linux.intel.com>
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>
---
drivers/nfc/fdp/i2c.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c
index 712936f5d2d6..754d8d89c580 100644
--- a/drivers/nfc/fdp/i2c.c
+++ b/drivers/nfc/fdp/i2c.c
@@ -281,8 +281,7 @@ static void fdp_nci_i2c_read_device_properties(struct device *dev,
*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);
--
2.11.0
next prev parent reply other threads:[~2017-06-05 20:20 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-05 20:19 [PATCH v2 00/12] NFC: clean up for ACPI GPIO usage Andy Shevchenko
2017-06-05 20:19 ` [PATCH v2 01/12] NFC: pn544: Switch to devm_acpi_dev_add_driver_gpios() Andy Shevchenko
2017-06-05 20:19 ` [PATCH v2 02/12] NFC: st21nfca: Add GPIO ACPI mapping table Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 03/12] NFC: st21nfca: Get rid of code duplication in ->probe() Andy Shevchenko
2017-06-05 20:20 ` Andy Shevchenko [this message]
2017-06-05 20:20 ` [PATCH v2 05/12] NFC: fdp: Convert to use devres API Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 06/12] NFC: fdp: Add GPIO ACPI mapping table Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 07/12] NFC: st-nci: Get rid of platform data Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 08/12] NFC: st-nci: Get rid of "interesting" use of interrupt polarity Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 09/12] NFC: st-nci: Covert to use GPIO descriptor Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 10/12] NFC: st-nci: Use unified device property API meaningfully Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 11/12] NFC: st-nci: Add GPIO ACPI mapping table Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 12/12] NFC: st-nci: Get rid of code duplication in ->probe() Andy Shevchenko
2017-06-12 15:36 ` [PATCH v2 00/12] NFC: clean up for ACPI GPIO usage Andy Shevchenko
2017-06-12 20:56 ` Samuel Ortiz
2017-06-13 8:41 ` Andy Shevchenko
2017-06-18 23:11 ` Samuel Ortiz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170605202009.78561-5-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).