From patchwork Fri Sep 11 11:56:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 53443 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id 47472215BF for ; Fri, 11 Sep 2015 11:58:25 +0000 (UTC) Received: by lamp12 with SMTP id p12sf24502816lam.2 for ; Fri, 11 Sep 2015 04:58:24 -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=4e4qjPKObOH4awM1k58ClawYE9AvT0r33P/OGpJPMMQ=; b=JHmDu4yQXIGZhozzqONBOW/bxT/dsDl5wUpvDRlXp3OwvUQxnV+ZGtI21zbn2xVsN3 QGmj+kqc4wTrQbowZx+D2i8IzC5gJ8Jx/DBkLYRja9F8HnOSI6Fv+16tJNOGxNAfc/hN i9Oi8Wjkz0U2CYkAo4F115pztSkoxnvhtSbLVqlMXj4Ok8n1bwcpvrTNrPtEIgh5ZkNW fAHN1l5Q5IuWZtkIE8oN/MhF/Dh2z+8vPdHvndVpZCX4WPBHnqHhIoBfe4JMorU7pSJt kQwy4DhmajGjtNzuHBdW0q+mh+ixq+t61dCWNzo0D4lPReWHG8+5Wmv2UjnnQwSbDV8h 9DOQ== X-Gm-Message-State: ALoCoQlhuQp/qCrvgw6xqcl5MsCJgzuEf8NCdlLMLM9b5NLSk+tKWdQqKMmeLymO/pvFYXD9DFu9 X-Received: by 10.152.26.101 with SMTP id k5mr11198026lag.9.1441972704228; Fri, 11 Sep 2015 04:58:24 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.163.69 with SMTP id yg5ls313860lab.5.gmail; Fri, 11 Sep 2015 04:58:24 -0700 (PDT) X-Received: by 10.112.168.100 with SMTP id zv4mr41088276lbb.117.1441972704051; Fri, 11 Sep 2015 04:58:24 -0700 (PDT) Received: from mail-la0-x22b.google.com (mail-la0-x22b.google.com. [2a00:1450:4010:c03::22b]) by mx.google.com with ESMTPS id c1si9916laa.72.2015.09.11.04.58.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Sep 2015 04:58:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::22b as permitted sender) client-ip=2a00:1450:4010:c03::22b; Received: by lamp12 with SMTP id p12so45625945lam.0 for ; Fri, 11 Sep 2015 04:58:24 -0700 (PDT) X-Received: by 10.112.72.97 with SMTP id c1mr27655487lbv.86.1441972703933; Fri, 11 Sep 2015 04:58:23 -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 w3csp1541944lbq; Fri, 11 Sep 2015 04:58:23 -0700 (PDT) X-Received: by 10.50.127.177 with SMTP id nh17mr3061022igb.40.1441972699117; Fri, 11 Sep 2015 04:58:19 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y66si118930ioi.149.2015.09.11.04.58.18; Fri, 11 Sep 2015 04:58:19 -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 S1752879AbbIKL6B (ORCPT + 28 others); Fri, 11 Sep 2015 07:58:01 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:34416 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752769AbbIKL55 (ORCPT ); Fri, 11 Sep 2015 07:57:57 -0400 Received: by wicfx3 with SMTP id fx3so61314655wic.1; Fri, 11 Sep 2015 04:57:56 -0700 (PDT) X-Received: by 10.180.109.200 with SMTP id hu8mr16319007wib.86.1441972676070; Fri, 11 Sep 2015 04:57:56 -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 wj4sm25354wjb.10.2015.09.11.04.57.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Sep 2015 04:57:54 -0700 (PDT) From: Kieran Bingham To: Wolfram Sang , Samuel Ortiz , Lee Jones Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, grant.likely@linaro.org, javier@osg.samsung.com, Kieran Bingham Subject: [RESEND PATCH v4 8/8] mfd: as3722: Rid driver of superfluous I2C device ID structure Date: Fri, 11 Sep 2015 12:56:04 +0100 Message-Id: <1441972564-9621-9-git-send-email-kieranbingham@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1441972564-9621-1-git-send-email-kieranbingham@gmail.com> References: <1441972564-9621-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::22b 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 Signed-off-by: Kieran Bingham --- 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);