From patchwork Mon Jun 2 13:41:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 354885 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 4A191140085 for ; Mon, 2 Jun 2014 23:41:47 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755063AbaFBNlg (ORCPT ); Mon, 2 Jun 2014 09:41:36 -0400 Received: from mail-ie0-f179.google.com ([209.85.223.179]:46387 "EHLO mail-ie0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755008AbaFBNl0 (ORCPT ); Mon, 2 Jun 2014 09:41:26 -0400 Received: by mail-ie0-f179.google.com with SMTP id rd18so4489450iec.10 for ; Mon, 02 Jun 2014 06:41:25 -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=bdN4g+NvHCpofNE5mqF2cwfEIWIhkrNb5OF7VDQ9+zU=; b=A3RKxO/6mLdO1K0bcscqG6i+8oWjT4Ir1P4ErLYzb9l9XyApZWDdHD0ywnnUguVXFT 3JkPobq7huD0s00NjDHJ1syhdB14A65ihxMzwTFFDg37wRiSweRYc347o45mtg2uZ1li EWW/C4BpjbDJyvn2F/z/J1apqyetfnRzE8UF5YIu0vCn3iUXyjL++Rq73ceEpspc51GU aOh3/Z0UH97+5Vfg2e8mxoqBYHNmqKSC/UshwRqfP8T3wK7AhMfvjPGlCtEqFhH/aw34 F8GgscKeS0T/Z8HRnXO+QzZqWGAA10+7p1oX3+qJXPigufBbbUbau0/ZW4pon0J+TwZO IK2Q== X-Gm-Message-State: ALoCoQmjcwSHSnUrEp06YA5M8O62DvwjNK7M4wDOCLAxisdbScoRW7BoHUdc9dLCLrG+fqsGnu5Y X-Received: by 10.50.176.167 with SMTP id cj7mr19392430igc.44.1401716485678; Mon, 02 Jun 2014 06:41:25 -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 hy3sm6561043igb.1.2014.06.02.06.41.23 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Jun 2014 06:41:25 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, wsa@the-dreams.de Cc: linus.walleij@linaro.org, grant.likely@linaro.org, linux-i2c@vger.kernel.org, Lee Jones Subject: [PATCH 3/3] i2c: Make I2C ID tables non-mandatory for DT'ed and/or ACPI'ed devices Date: Mon, 2 Jun 2014 14:41:03 +0100 Message-Id: <1401716463-23457-4-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1401716463-23457-1-git-send-email-lee.jones@linaro.org> References: <1401716463-23457-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 Acked-by: Grant Likely --- drivers/i2c/i2c-core.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index d0c7180..811b78f 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -271,7 +271,18 @@ 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 madatory, if and only if, a suitable Device + * Tree and/or ACPI match table entry is supplied for the probing + * device. + * + * TODO: Provide 'device type' to 'ACPI node' call and match here. + */ + if (!driver->id_table && + !of_match_device(dev->driver->of_match_table, dev)) return -ENODEV; if (!device_can_wakeup(&client->dev))