OSDN Git Service

rtc: pcf85063: switch to probe_new
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 1 Apr 2019 16:08:05 +0000 (18:08 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Thu, 4 Apr 2019 08:07:11 +0000 (10:07 +0200)
struct i2c_device_id argument of probe() is not used, so use probe_new()
instead.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-pcf85063.c

index f6ce63c..14a81fa 100644 (file)
@@ -207,8 +207,7 @@ static int pcf85063_load_capacitance(struct i2c_client *client)
        return rc;
 }
 
-static int pcf85063_probe(struct i2c_client *client,
-                               const struct i2c_device_id *id)
+static int pcf85063_probe(struct i2c_client *client)
 {
        struct rtc_device *rtc;
        int err;
@@ -236,12 +235,6 @@ static int pcf85063_probe(struct i2c_client *client,
        return PTR_ERR_OR_ZERO(rtc);
 }
 
-static const struct i2c_device_id pcf85063_id[] = {
-       { "pcf85063", 0 },
-       { }
-};
-MODULE_DEVICE_TABLE(i2c, pcf85063_id);
-
 #ifdef CONFIG_OF
 static const struct of_device_id pcf85063_of_match[] = {
        { .compatible = "nxp,pcf85063" },
@@ -255,8 +248,7 @@ static struct i2c_driver pcf85063_driver = {
                .name   = "rtc-pcf85063",
                .of_match_table = of_match_ptr(pcf85063_of_match),
        },
-       .probe          = pcf85063_probe,
-       .id_table       = pcf85063_id,
+       .probe_new      = pcf85063_probe,
 };
 
 module_i2c_driver(pcf85063_driver);