From patchwork Fri Jun 6 15:52:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 31500 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BFE75202DA for ; Fri, 6 Jun 2014 15:53:09 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id hq11sf12297810vcb.8 for ; Fri, 06 Jun 2014 08:53:09 -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=vBVvvhPsHBGqEnWfmrQaydKIXy6v+1lYHC85K4A0iPY=; b=UvQeKIk9R7f4awajtl74pNx1zIU3eycdNKLyPpMzUiSZxzxqNqDjBDDbuOC0S1yICI XyCOyrqvl8CiIvAaNgCjfXQabwIYc9Ysd72BSyYGLgKsQb84jRZR9GAgM0HORVll8Lz/ ZdfVkVe2ynOmgQ2Z9N0QsH+YwRGOD0SLV9PF+Yvo335JYFZY/FPLwDEEljNNnV9BmLmB 6YfL5JV99EjHQb80vNjcd6Ylq39N0AHYQ2485ECq6vaF8M0jez3+LYpp3EYbm4XzR8Nz pciVUG7UQCpmzHJG0u1Z452oXZCHDQJ0hyLCCV3NnS3PsGlgL0fI2fdLzpYgapuUmrGZ 5yhA== X-Gm-Message-State: ALoCoQlj+Dl+TyOIC71/j3nGCA0cakLQHQ7UDJSOLGN4/BI3Tkfsk/EAkU2fvWMPxTU0TJlBMHy1 X-Received: by 10.224.79.212 with SMTP id q20mr3476942qak.9.1402069989576; Fri, 06 Jun 2014 08:53:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.107.247 with SMTP id h110ls782809qgf.44.gmail; Fri, 06 Jun 2014 08:53:09 -0700 (PDT) X-Received: by 10.58.152.137 with SMTP id uy9mr4785723veb.54.1402069989459; Fri, 06 Jun 2014 08:53:09 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id rv2si6653308vdb.88.2014.06.06.08.53.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Jun 2014 08:53:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.172 as permitted sender) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id oz11so3431726veb.17 for ; Fri, 06 Jun 2014 08:53:09 -0700 (PDT) X-Received: by 10.53.8.162 with SMTP id dl2mr5600678vdd.24.1402069989393; Fri, 06 Jun 2014 08:53:09 -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.54.6 with SMTP id vs6csp115271vcb; Fri, 6 Jun 2014 08:53:09 -0700 (PDT) X-Received: by 10.42.127.199 with SMTP id j7mr6864452ics.27.1402069988980; Fri, 06 Jun 2014 08:53:08 -0700 (PDT) Received: from mail-ig0-f174.google.com (mail-ig0-f174.google.com [209.85.213.174]) by mx.google.com with ESMTPS id j5si48515429igh.21.2014.06.06.08.53.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Jun 2014 08:53:08 -0700 (PDT) Received-SPF: pass (google.com: domain of lee.jones@linaro.org designates 209.85.213.174 as permitted sender) client-ip=209.85.213.174; Received: by mail-ig0-f174.google.com with SMTP id h3so1006713igd.13 for ; Fri, 06 Jun 2014 08:53:08 -0700 (PDT) X-Received: by 10.50.20.97 with SMTP id m1mr7404517ige.28.1402069988688; Fri, 06 Jun 2014 08:53:08 -0700 (PDT) Received: from localhost.localdomain (host86-181-29-77.range86-181.btcentralplus.com. [86.181.29.77]) by mx.google.com with ESMTPSA id j1sm27388094ige.0.2014.06.06.08.53.06 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Jun 2014 08:53:08 -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, linus.walleij@linaro.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, Lee Jones Subject: [PATCH 9/9] mfd: as3722: Rid driver of superfluous I2C device ID structure Date: Fri, 6 Jun 2014 16:52:32 +0100 Message-Id: <1402069952-28022-10-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1402069952-28022-1-git-send-email-lee.jones@linaro.org> References: <1402069952-28022-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.172 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'. 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);