From patchwork Fri Jun 6 15:52:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 31495 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AE963202DA for ; Fri, 6 Jun 2014 15:52:58 +0000 (UTC) Received: by mail-lb0-f200.google.com with SMTP id c11sf3368297lbj.7 for ; Fri, 06 Jun 2014 08:52:57 -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=mniqVanfoVB+rmUqL+I+dn27DG/gp8tcSRREumxnmog=; b=PxJZlyYliCOyqgGIwv8CmSBtAEB3oYqgt2xSHbi9t0TCYDXY9Dm3z54bNxCvOoSGlt gjRX7msy0a+/swXyCQI0hfy7hxmMjRUilsWinP7FpyUoveBtVSYTNh3BSEmvCf3EB3Vs qgJU+xggZUDEpJ91npEGYtbgTtdTI2VKFkeY+v5n6R4o8s7VD7k9FelDlrUwiyQdRP0B MncjX6ke3iJ+Ppmr3Uw1IoAb9PIkfSUpzivTZj+Ijku1tIsj4jLO3r7Y+LWFn64LrWYx zz+A2UOnU2f2w/EdR2FVzvKdBydM40KouzhsX4mWyQ8tE45HGD7cav64YYMDWIbHJobr VxYQ== X-Gm-Message-State: ALoCoQmbs5Ydyt1NejZBPtovBDheslK7QnupwU25z4u/eALAGhoUlC11r04A0oW88W8W5s2ymSt1 X-Received: by 10.112.137.138 with SMTP id qi10mr1609816lbb.4.1402069977328; Fri, 06 Jun 2014 08:52:57 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.32.203 with SMTP id h69ls804541qgh.56.gmail; Fri, 06 Jun 2014 08:52:57 -0700 (PDT) X-Received: by 10.58.85.3 with SMTP id d3mr6647065vez.34.1402069977125; Fri, 06 Jun 2014 08:52:57 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id vy2si5407709vcb.73.2014.06.06.08.52.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Jun 2014 08:52:57 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id id10so1511302vcb.24 for ; Fri, 06 Jun 2014 08:52:57 -0700 (PDT) X-Received: by 10.58.245.2 with SMTP id xk2mr6599470vec.9.1402069977042; Fri, 06 Jun 2014 08:52:57 -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 vs6csp115253vcb; Fri, 6 Jun 2014 08:52:56 -0700 (PDT) X-Received: by 10.50.50.231 with SMTP id f7mr7249356igo.42.1402069976440; Fri, 06 Jun 2014 08:52:56 -0700 (PDT) Received: from mail-ig0-f172.google.com (mail-ig0-f172.google.com [209.85.213.172]) by mx.google.com with ESMTPS id ro1si48492010igb.33.2014.06.06.08.52.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Jun 2014 08:52:56 -0700 (PDT) Received-SPF: pass (google.com: domain of lee.jones@linaro.org designates 209.85.213.172 as permitted sender) client-ip=209.85.213.172; Received: by mail-ig0-f172.google.com with SMTP id l13so999607iga.17 for ; Fri, 06 Jun 2014 08:52:56 -0700 (PDT) X-Received: by 10.50.28.51 with SMTP id y19mr32574569igg.5.1402069976227; Fri, 06 Jun 2014 08:52:56 -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.52.53 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Jun 2014 08:52:55 -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 4/9] i2c: Make I2C ID tables non-mandatory for DT'ed devices Date: Fri, 6 Jun 2014 16:52:27 +0100 Message-Id: <1402069952-28022-5-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.220.179 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: , Currently the I2C framework insists on devices supplying an I2C ID table. Many of the devices which do so unnecessarily adding quite a few wasted lines to kernel code. This patch allows drivers a means to 'not' supply the aforementioned table and match on DT match tables instead. Acked-by: Grant Likely Signed-off-by: Lee Jones --- drivers/i2c/i2c-core.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 80a2f2e..3507087 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -100,7 +100,7 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv) /* Attempt an OF style match */ - if (of_driver_match_device(dev, drv)) + if (i2c_of_match_device(drv->of_match_table, dev)) return 1; /* Then ACPI style match */ @@ -268,7 +268,15 @@ static int i2c_device_probe(struct device *dev) return 0; driver = to_i2c_driver(dev->driver); - if (!driver->probe || !driver->id_table) + if (!driver->probe) + return -EINVAL; + + /* + * An I2C ID table is not mandatory, if and only if, a suitable Device + * Tree match table entry is supplied for the probing device. + */ + if (!driver->id_table && + !i2c_of_match_device(dev->driver->of_match_table, dev)) return -ENODEV; if (!device_can_wakeup(&client->dev))