From patchwork Fri Jun 20 12:02:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 32271 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EA75A203C2 for ; Fri, 20 Jun 2014 12:03:38 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id y20sf24706541ier.1 for ; Fri, 20 Jun 2014 05:03:38 -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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=ENjFQJdne441UHDJwsM9wjGsH8KO/EZlKZMGzjMC93Q=; b=V1dz4XRjOP2nR8RUvRfLg8cebmAS/T8+BAsY5EGfHi9OzyC0+zHzVvGBZ0DnyrWDcq EpV33ZeN/Tju/xi7FD+W6OWWB3RqaZ5Ghs14auHbmxB/vVuO+/DmvWhHGloQt/vnD3oR gAuyeFfizraR0ayoEpIhECj/nIyJEXRKYGswyMc3CsyetO+KNrSCGIftBXKITUZBCHkb GbV12PkTqIdnC2hi7mfKpFcLbGZ2F2nYE43RX+J4w14LQYntfcieN9etptl5DKowf2mg eNHbXtZnYKZ/FEv0QoWn4Dd34sc5aorUIjqzZ2ve61yLkmzQTPPmgUDJ4XAnXl0N0mzG /iyw== X-Gm-Message-State: ALoCoQkkt2bNqhn14pE3RXbk/J6nRea4rzlq4LvRwwRofVP4sjdh9c5LEw1KEAjOcxpFQa3QyGIR X-Received: by 10.182.43.196 with SMTP id y4mr1103532obl.35.1403265818456; Fri, 20 Jun 2014 05:03:38 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.38.111 with SMTP id s102ls992871qgs.20.gmail; Fri, 20 Jun 2014 05:03:38 -0700 (PDT) X-Received: by 10.220.113.207 with SMTP id b15mr9874vcq.55.1403265818346; Fri, 20 Jun 2014 05:03:38 -0700 (PDT) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id lv1si3864854vcb.85.2014.06.20.05.03.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Jun 2014 05:03:38 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.170 as permitted sender) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id i13so3496882veh.29 for ; Fri, 20 Jun 2014 05:03:38 -0700 (PDT) X-Received: by 10.52.248.209 with SMTP id yo17mr8543vdc.60.1403265818274; Fri, 20 Jun 2014 05:03:38 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp16615vcb; Fri, 20 Jun 2014 05:03:37 -0700 (PDT) X-Received: by 10.42.64.197 with SMTP id h5mr2418056ici.90.1403265817763; Fri, 20 Jun 2014 05:03:37 -0700 (PDT) Received: from mail-ie0-f170.google.com (mail-ie0-f170.google.com [209.85.223.170]) by mx.google.com with ESMTPS id f2si2468695igy.34.2014.06.20.05.03.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Jun 2014 05:03:37 -0700 (PDT) Received-SPF: pass (google.com: domain of lee.jones@linaro.org designates 209.85.223.170 as permitted sender) client-ip=209.85.223.170; Received: by mail-ie0-f170.google.com with SMTP id tr6so3174980ieb.15 for ; Fri, 20 Jun 2014 05:03:37 -0700 (PDT) X-Received: by 10.43.70.132 with SMTP id yg4mr3172602icb.7.1403265817541; Fri, 20 Jun 2014 05:03:37 -0700 (PDT) Received: from localhost.localdomain (host109-148-235-194.range109-148.btcentralplus.com. [109.148.235.194]) by mx.google.com with ESMTPSA id qn5sm3890078igb.7.2014.06.20.05.03.35 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Jun 2014 05:03:37 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: wsa@the-dreams.de, grant.likely@linaro.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linus.walleij@linaro.org, Lee Jones Subject: [PATCH 9/9] mfd: as3722: Rid driver of superfluous I2C device ID structure Date: Fri, 20 Jun 2014 13:02:33 +0100 Message-Id: <1403265753-25851-11-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1403265753-25851-1-git-send-email-lee.jones@linaro.org> References: <1403265753-25851-1-git-send-email-lee.jones@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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);