From patchwork Thu Aug 28 14:35:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 36231 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E5AD7202DD for ; Thu, 28 Aug 2014 14:37:20 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id w7sf4881880qcr.3 for ; Thu, 28 Aug 2014 07:37:20 -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=FZj5rHaLTvFEuMmhu6FFenMT5TrWEfeZKYg6CcD2kGo=; b=HftHIlQxUmQ1gpYcTXZnFcZCsYL71AlqX0SBdqW1DpWt/MOkMx2iMRYr+Bd13XP/VN R+xRhqRWMzog0mx0tIkszt7JYedkqB2rIL3L195+WmiwGCEP32+hDNkPUh4R3HIQ0til 4MpQUvYPz9tgO1zDgVqlmisaBaeUQrTkFca9wZduClUUWAvp3NhbaejFEzQcjYVXwDWq 46ok3fw1nwzu8T7nwJ8JRIN8R1DESuWjCfIh9/vakPa0ZqhxwMEcxbSnB2ckS+L5UfaB aSGFR5YH/ArzOBMszdRYbFMhw6QvXf4UmlsH/dz1DPehKyHn4eKeCj+wAqsAFHIrqOdj L8EA== X-Gm-Message-State: ALoCoQkWSWYCZslTdiGi4EoldHmn5PgJawJPs/3xpYYCqDB3yb8pHLcBbILBuafY2Te/YeIX5iDa X-Received: by 10.236.100.134 with SMTP id z6mr2266627yhf.8.1409236640788; Thu, 28 Aug 2014 07:37:20 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.97.134 with SMTP id m6ls583673qge.8.gmail; Thu, 28 Aug 2014 07:37:20 -0700 (PDT) X-Received: by 10.52.4.69 with SMTP id i5mr1830780vdi.35.1409236640612; Thu, 28 Aug 2014 07:37:20 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id xj13si3669465vcb.60.2014.08.28.07.37.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Aug 2014 07:37:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id lf12so895418vcb.39 for ; Thu, 28 Aug 2014 07:37:20 -0700 (PDT) X-Received: by 10.220.81.132 with SMTP id x4mr3700206vck.0.1409236640514; Thu, 28 Aug 2014 07:37:20 -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.221.45.67 with SMTP id uj3csp246774vcb; Thu, 28 Aug 2014 07:37:20 -0700 (PDT) X-Received: by 10.70.95.100 with SMTP id dj4mr6673493pdb.94.1409236638664; Thu, 28 Aug 2014 07:37:18 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id so2si6871082pab.132.2014.08.28.07.37.18 for ; Thu, 28 Aug 2014 07:37:18 -0700 (PDT) Received-SPF: none (google.com: devicetree-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750930AbaH1OgW (ORCPT + 6 others); Thu, 28 Aug 2014 10:36:22 -0400 Received: from mail-qa0-f53.google.com ([209.85.216.53]:37206 "EHLO mail-qa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751918AbaH1OgK (ORCPT ); Thu, 28 Aug 2014 10:36:10 -0400 Received: by mail-qa0-f53.google.com with SMTP id w8so793480qac.12 for ; Thu, 28 Aug 2014 07:36:09 -0700 (PDT) X-Received: by 10.224.137.65 with SMTP id v1mr6949797qat.53.1409236569872; Thu, 28 Aug 2014 07:36:09 -0700 (PDT) Received: from localhost.localdomain (host86-152-0-170.range86-152.btcentralplus.com. [86.152.0.170]) by mx.google.com with ESMTPSA id o2sm5797541qgo.17.2014.08.28.07.36.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Aug 2014 07:36:09 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: lee.jones@linaro.org, kernel@stlinux.com, wsa@the-dreams.de, grant.likely@linaro.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linus.walleij@linaro.org Subject: [PATCH 8/8] mfd: as3722: Rid driver of superfluous I2C device ID structure Date: Thu, 28 Aug 2014 15:35:38 +0100 Message-Id: <1409236538-21274-9-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409236538-21274-1-git-send-email-lee.jones@linaro.org> References: <1409236538-21274-1-git-send-email-lee.jones@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.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.220.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org 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: , 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);