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: 356907 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 896AE1400E4 for ; Sat, 7 Jun 2014 01:54:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752569AbaFFPw6 (ORCPT ); Fri, 6 Jun 2014 11:52:58 -0400 Received: from mail-ig0-f175.google.com ([209.85.213.175]:54095 "EHLO mail-ig0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752554AbaFFPw4 (ORCPT ); Fri, 6 Jun 2014 11:52:56 -0400 Received: by mail-ig0-f175.google.com with SMTP id uq10so1009949igb.2 for ; Fri, 06 Jun 2014 08:52:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mniqVanfoVB+rmUqL+I+dn27DG/gp8tcSRREumxnmog=; b=HUNXyeLIljdmJSdZWpJoj1mgwlS9esd2khFJYIEdwK7u/zPJvKOhIrVoyl6rQqq/x+ s9QGugGWqbrUQXWRfH7bzVp7SLfFJqpr7KOjLTxYNEWMXAOPqmgAw5Mt33HAIPmhzQsF gPtBifijaaANyhfMuLy/v05fvnYw2YlRsOMAHYdSbkeDAkfXCnnBPTb/wuppC33ksBe9 RKGXc8qCwmA35Q7bb7SR/GpnzdKjrEB8x+VnDOfEPrJhIa8QcImpdu+ldpZZqZa2BmUY D8zu36NNBTvtMFRQO+iRSUuyRv6s3z/cjz7TYAXCwUH0PHNUbnMGr2UpO6IS6ZXG1Mvf 6ZVQ== X-Gm-Message-State: ALoCoQmP3hChyJ0HDoFa06iwfkI6PYTuYIsl7YA9sswmHaTBu2X4hGwlNgiKhKfdjpNAapR61HMl 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> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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))