From patchwork Wed May 4 15:14:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 67148 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp240208qge; Wed, 4 May 2016 08:15:43 -0700 (PDT) X-Received: by 10.98.15.145 with SMTP id 17mr12589845pfp.19.1462374943038; Wed, 04 May 2016 08:15:43 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u2si5402861pan.192.2016.05.04.08.15.42; Wed, 04 May 2016 08:15:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753639AbcEDPPZ (ORCPT + 29 others); Wed, 4 May 2016 11:15:25 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34136 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753523AbcEDPPS (ORCPT ); Wed, 4 May 2016 11:15:18 -0400 Received: by mail-wm0-f67.google.com with SMTP id n129so10867034wmn.1; Wed, 04 May 2016 08:15:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8e9O/09pC9tbVnjk4oP6N3w/W0dNTkkprnGKOnXW1do=; b=HCsBIoZoiULFmZ16nIEN0E2AyEVuSP/fXNDYm+txDTYzuOCmDa2B/2AQ09hwtzQkWI cR8A3UVgNVRLZWjPe4UK0rL0EeVtXRsCH9YwhIG/4Dfq2lNG7oLQSMVwWffd680V1J86 EIPV+jlXVG0N6RWuWvUzNdOflxbRv6OG5wopZQEkggeJYVrD2poECnvn3wIywVfLZvMe dRZMIwnxJL+WxUkmU/yFQLD0XwSXfCj4XNwWHwyO8wE0DaZqaC+bj9rvGHSKqWgUuyWQ tkoVbzEoWgDidnJDfxUr5TaDM8zHHj4rWrVqUOd0gO5lkApTmj+brYPoNjkvNKI4bZlS FNlA== X-Gm-Message-State: AOPr4FXOS7TzQXN2CV1WvWfert/LkJGwULXEn49GevWeVJ6CmNv6Dms9MogcZSiWulsb3g== X-Received: by 10.194.139.104 with SMTP id qx8mr8922828wjb.14.1462374916272; Wed, 04 May 2016 08:15:16 -0700 (PDT) Received: from CookieMonster.cookiemonster.local (cpc87017-aztw30-2-0-cust65.18-1.cable.virginm.net. [92.232.232.66]) by smtp.gmail.com with ESMTPSA id u187sm5497613wmu.21.2016.05.04.08.15.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 May 2016 08:15:15 -0700 (PDT) From: Kieran Bingham To: Wolfram Sang , Lee Jones , javier@osg.samsung.com Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, grant.likely@linaro.org, sameo@linux.intel.com, Kieran Bingham Subject: [PATCHv5 8/8] mfd: as3722: Rid driver of superfluous I2C device ID structure Date: Wed, 4 May 2016 16:14:48 +0100 Message-Id: <1462374888-22888-9-git-send-email-kieran@bingham.xyz> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1462374888-22888-1-git-send-email-kieran@bingham.xyz> References: <1462374888-22888-1-git-send-email-kieran@bingham.xyz> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lee Jones Also remove unused second probe() parameter 'i2c_device_id'. Acked-by: Grant Likely Signed-off-by: Lee Jones Signed-off-by: Kieran Bingham --- Changes since v4 - Rename .probe2 to probe_new --- drivers/mfd/as3722.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) -- 2.5.0 diff --git a/drivers/mfd/as3722.c b/drivers/mfd/as3722.c index e1f597f97f86..28fc62af6861 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; @@ -453,12 +452,6 @@ 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 const struct dev_pm_ops as3722_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(as3722_i2c_suspend, as3722_i2c_resume) }; @@ -469,9 +462,8 @@ static struct i2c_driver as3722_i2c_driver = { .of_match_table = as3722_of_match, .pm = &as3722_pm_ops, }, - .probe = as3722_i2c_probe, + .probe_new = as3722_i2c_probe, .remove = as3722_i2c_remove, - .id_table = as3722_i2c_id, }; module_i2c_driver(as3722_i2c_driver);