From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: [PATCH 8/8] mfd: as3722: Rid driver of superfluous I2C device ID structure Date: Thu, 28 Aug 2014 15:35:38 +0100 Message-ID: <1409236538-21274-9-git-send-email-lee.jones@linaro.org> References: <1409236538-21274-1-git-send-email-lee.jones@linaro.org> Return-path: In-Reply-To: <1409236538-21274-1-git-send-email-lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> Sender: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, kernel-F5mvAk5X5gdBDgjK7y7TUQ@public.gmane.org, wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org, grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org List-Id: linux-i2c@vger.kernel.org Also remove unused second probe() parameter 'i2c_device_id'. Acked-by: Grant Likely Signed-off-by: Lee Jones --- 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 39fa554..cb2fcf9 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,21 +427,14 @@ 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", .owner = THIS_MODULE, .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); -- 1.9.1