From patchwork Wed Sep 9 18:33:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 53329 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 5C8BD22B05 for ; Wed, 9 Sep 2015 18:35:04 +0000 (UTC) Received: by wicuu12 with SMTP id uu12sf9921818wic.2 for ; Wed, 09 Sep 2015 11:35:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=0bRJE//1ZAqprT/fYRPYiu8kCHHVmGnSQuZKZ0oK4/c=; b=ILajOi5jp99Wwmd0T47UjjpHS6lufLDTSkXJRTzph3TcgeWHhDj22ZtrZ4zZmHAGQk ykSyHLvUMFKDrV8dz/cdj4KnLcIuz910Zo7IIwKSfNuaPfOztyrHtST1I1q82ESIsZZ8 ie5pd83D3OEeZewniQ5niOgTBKENOX2qjDjugF6kfgxJKaiEM0kBZ/N6ITny+DTRRYZq VEBXXz7A88MhhM3l/D248BIkMbdfi2RhBwd1Gp/mhzf/SFd5y8s3a1vRqvxSFZAuks9G ZSTsOA+5nb6LhEDc2NKUK/P0A+/kjxOUYuamh26FMaicIxlqOYRVYesaxGkYn9IpGSSZ 6+Uw== X-Gm-Message-State: ALoCoQkmBdQ9/TG5c2gVTdI5pZtB+vEm9HX2sPWZnGVPR+oJP+KwHGdM0cYWZPq3VFrZ04mrXawN X-Received: by 10.180.96.226 with SMTP id dv2mr8609915wib.2.1441823703642; Wed, 09 Sep 2015 11:35:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.135 with SMTP id q7ls86100laj.77.gmail; Wed, 09 Sep 2015 11:35:03 -0700 (PDT) X-Received: by 10.152.37.161 with SMTP id z1mr30161753laj.27.1441823703447; Wed, 09 Sep 2015 11:35:03 -0700 (PDT) Received: from mail-la0-x233.google.com (mail-la0-x233.google.com. [2a00:1450:4010:c03::233]) by mx.google.com with ESMTPS id i7si7482930lae.67.2015.09.09.11.35.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Sep 2015 11:35:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::233 as permitted sender) client-ip=2a00:1450:4010:c03::233; Received: by lagj9 with SMTP id j9so13061282lag.2 for ; Wed, 09 Sep 2015 11:35:03 -0700 (PDT) X-Received: by 10.112.151.106 with SMTP id up10mr26773228lbb.106.1441823703352; Wed, 09 Sep 2015 11:35:03 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp492236lbq; Wed, 9 Sep 2015 11:35:02 -0700 (PDT) X-Received: by 10.68.107.133 with SMTP id hc5mr72846762pbb.5.1441823696916; Wed, 09 Sep 2015 11:34:56 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qu10si2304353pbb.181.2015.09.09.11.34.55; Wed, 09 Sep 2015 11:34:56 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755089AbbIISes (ORCPT + 28 others); Wed, 9 Sep 2015 14:34:48 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:35905 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754894AbbIISeg (ORCPT ); Wed, 9 Sep 2015 14:34:36 -0400 Received: by wicgb1 with SMTP id gb1so127205270wic.1; Wed, 09 Sep 2015 11:34:35 -0700 (PDT) X-Received: by 10.180.82.98 with SMTP id h2mr55237577wiy.37.1441823675266; Wed, 09 Sep 2015 11:34:35 -0700 (PDT) Received: from localhost.localdomain (cpc17-aztw24-2-0-cust759.aztw.cable.virginm.net. [92.237.134.248]) by smtp.gmail.com with ESMTPSA id u1sm5155141wiz.22.2015.09.09.11.34.33 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Sep 2015 11:34:34 -0700 (PDT) From: Kieran Bingham To: Wolfram Sang , Samuel Ortiz , Lee Jones Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linus.walleij@linaro.org, grant.likely@linaro.org Subject: [PATCH v4 8/8] mfd: as3722: Rid driver of superfluous I2C device ID structure Date: Wed, 9 Sep 2015 19:33:47 +0100 Message-Id: <1441823627-6227-9-git-send-email-kieranbingham@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1441823627-6227-1-git-send-email-kieranbingham@gmail.com> References: <1441823627-6227-1-git-send-email-kieranbingham@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Original-Sender: kieranbingham@gmail.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::233 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@gmail.com; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Lee Jones 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 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);