From patchwork Fri May 30 12:26:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 354125 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 DC83C1400D8 for ; Fri, 30 May 2014 22:27:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932196AbaE3M13 (ORCPT ); Fri, 30 May 2014 08:27:29 -0400 Received: from mail-ig0-f173.google.com ([209.85.213.173]:35484 "EHLO mail-ig0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754466AbaE3M0w (ORCPT ); Fri, 30 May 2014 08:26:52 -0400 Received: by mail-ig0-f173.google.com with SMTP id hn18so714174igb.12 for ; Fri, 30 May 2014 05:26:51 -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=B0pcmzzm1VwRY72uTs4+xNH9O7EfjxBLEuRLjM8p1Tw=; b=VpDbY3wktxKaoGUuIqZPGZ5mFdqYjbH4Co8OFnMca27zi+cxDNK/r6s7SFLnJY2kB9 PuGdbO4VFztUrF6OTjCjrfeAkooRtFu3UFtxpvhz3SMLJlGAAYdP4FROWoxoff5DaR2F m8sN8DcR9gEikeYG55UT6odZ9OhxhX/FGvk9U/uAH0IPitqY64Q7V9qf/VZP+QVYGM+4 ScepNzfzcOIXDF0ImG2QtEI3jwiKufQRKb0fcL7da2+j7JvM9XJJxUSOuKCMpIU5Kd8n 2HXO90/2k1Sp4zUznQmQhiBiJPYr4u8+/cPV+o6EQQ/bJcmS3A9GI97uI1zd7IqXv5ii CLUw== X-Gm-Message-State: ALoCoQkdChgbTWL9gJG3rJepMyqglcJiNQ39GeO1j5f/VtwEPf/zxubGQd9wsFR99K8vxeaVeYwR X-Received: by 10.42.4.201 with SMTP id 9mr15067579ict.57.1401452811485; Fri, 30 May 2014 05:26:51 -0700 (PDT) Received: from localhost.localdomain (host109-148-113-200.range109-148.btcentralplus.com. [109.148.113.200]) by mx.google.com with ESMTPSA id g2sm5152788igc.12.2014.05.30.05.26.49 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 30 May 2014 05:26:51 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, wsa@the-dreams.de Cc: grant.likely@linaro.org, linus.walleij@linaro.org, linux-i2c@vger.kernel.org, Lee Jones Subject: [PATCH] i2c: Make I2C ID tables non-mandatory for DT'ed and/or ACPI'ed devices Date: Fri, 30 May 2014 13:26:37 +0100 Message-Id: <1401452797-29521-3-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1401452797-29521-1-git-send-email-lee.jones@linaro.org> References: <1401452797-29521-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 either DT and/or ACPI match tables instead. Signed-off-by: Lee Jones --- drivers/i2c/i2c-core.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 7c7f4b8..49c534d 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -260,13 +260,29 @@ static int i2c_device_probe(struct device *dev) { struct i2c_client *client = i2c_verify_client(dev); struct i2c_driver *driver; + const struct of_device_id *of_match = dev->driver->of_match_table; + const struct acpi_device_id *acpi_match = dev->driver->acpi_match_table; + const struct i2c_device_id *id; int status; if (!client) 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 madatory, if and only if, a suitable Device + * Tree and/or ACPI match table entry is supplied for the probing + * device. + */ + if (driver->id_table) + id = i2c_match_id(driver->id_table, client); + else if (of_match_device(of_match, dev) || + acpi_match_device(acpi_match, dev)) + id = NULL; + else return -ENODEV; if (!device_can_wakeup(&client->dev)) @@ -275,7 +291,7 @@ static int i2c_device_probe(struct device *dev) dev_dbg(dev, "probe\n"); acpi_dev_pm_attach(&client->dev, true); - status = driver->probe(client, i2c_match_id(driver->id_table, client)); + status = driver->probe(client, id); if (status) acpi_dev_pm_detach(&client->dev, true);