[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1441972564-9621-9-git-send-email-kieranbingham@gmail.com>
Date: Fri, 11 Sep 2015 12:56:04 +0100
From: Kieran Bingham <kieranbingham@...il.com>
To: Wolfram Sang <wsa@...-dreams.de>,
Samuel Ortiz <sameo@...ux.intel.com>,
Lee Jones <lee.jones@...aro.org>
Cc: linux-i2c@...r.kernel.org, linux-kernel@...r.kernel.org,
grant.likely@...aro.org, javier@....samsung.com,
Kieran Bingham <kieranbingham@...il.com>
Subject: [RESEND PATCH v4 8/8] mfd: as3722: Rid driver of superfluous I2C device ID structure
From: Lee Jones <lee.jones@...aro.org>
Also remove unused second probe() parameter 'i2c_device_id'.
Acked-by: Grant Likely <grant.likely@...aro.org>
Signed-off-by: Lee Jones <lee.jones@...aro.org>
Signed-off-by: Kieran Bingham <kieranbingham@...il.com>
---
drivers/mfd/as3722.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/mfd/as3722.c b/drivers/mfd/as3722.c
index 924ea90..6ac4be3 100644
--- a/drivers/mfd/as3722.c
+++ b/drivers/mfd/as3722.c
@@ -354,8 +354,7 @@ static int as3722_i2c_of_probe(struct i2c_client *i2c,
return 0;
}
-static int as3722_i2c_probe(struct i2c_client *i2c,
- const struct i2c_device_id *id)
+static int as3722_i2c_probe(struct i2c_client *i2c)
{
struct as3722 *as3722;
unsigned long irq_flags;
@@ -428,20 +427,13 @@ static const struct of_device_id as3722_of_match[] = {
};
MODULE_DEVICE_TABLE(of, as3722_of_match);
-static const struct i2c_device_id as3722_i2c_id[] = {
- { "as3722", 0 },
- {},
-};
-MODULE_DEVICE_TABLE(i2c, as3722_i2c_id);
-
static struct i2c_driver as3722_i2c_driver = {
.driver = {
.name = "as3722",
.of_match_table = as3722_of_match,
},
- .probe = as3722_i2c_probe,
+ .probe2 = as3722_i2c_probe,
.remove = as3722_i2c_remove,
- .id_table = as3722_i2c_id,
};
module_i2c_driver(as3722_i2c_driver);
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists