From patchwork Sun Sep 16 23:45:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 146799 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp3154583ljw; Sun, 16 Sep 2018 16:46:08 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZGa6Jd+EWYUC15MB66poHpNzCO61VoyIw8hVEyhJjiSyVzBJew623qG26jRpBuptLxsvUb X-Received: by 2002:a63:bc0a:: with SMTP id q10-v6mr21060343pge.60.1537141568619; Sun, 16 Sep 2018 16:46:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537141568; cv=none; d=google.com; s=arc-20160816; b=bLQjTZ2XQgGVw23BAwYd05SAKOvQlAsKa9sB0uGBNw7ryE6Zfaeg+VZV3jy2QvQWO/ 2gfCZCZ1+lsVLIJbKDTfC2ICJgud9h8SGCqP2TXMNOFxLMITmnQzEbEiVGLwRvbYKDja AqUCracugj7pNHxZGM+dE4yeSncFA5UrDCWmPT1oXzb2sleY1wbLsnceXoGnkmDMgvTL Ck6quXS/4ePZDCxZB/P8RQACwFs/0NjHbhmKvznQfUJ9f/WtR3dW2bawF9JeUS2jlmUT POB7wRYV51RFXDs0l5ffG5nBTfJH3z+LvthH6TMPeg1sR7fEN3m6siTuh3AJZYKbMwY8 LjmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=jDArbQdVww+YSgUKwhIereZD0KDuIxo3XfjQo0Dfyoc=; b=UtcGfq0xOEJXSik6nKsHK/VqzLwHndIiuTqLLq6f4kTL3ug895BHS4/fo2yhtR3ARf TzQ3UrDRhWKoh2csDReX/kDYCRN7mkcmeOs9322zMJCzJ8VlXzaBFl2K16wpjEe7QS07 1f1AJCzq4OFWoHsFHnCuyB1TyXrScX081BHHk+7KZRnlC5FcOZCxqflx2PgpSXQXn9gB QvnOeUIJSFVHBLlJi/HFb7i5qYU5w1hHc70s3fSWu3JbjUf5G06CEpMBA7BhSKw/jWR1 +51aA2ICXxGrx61j9weoOSsmOUoDGTDaAV2gztWmL86eNhkZN6KSIUu7LjawP2og/O/O W36Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MtSqOS63; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f4-v6si13808546plt.346.2018.09.16.16.46.08; Sun, 16 Sep 2018 16:46:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MtSqOS63; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728268AbeIQFKl (ORCPT + 13 others); Mon, 17 Sep 2018 01:10:41 -0400 Received: from mail-io1-f66.google.com ([209.85.166.66]:37474 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728190AbeIQFKl (ORCPT ); Mon, 17 Sep 2018 01:10:41 -0400 Received: by mail-io1-f66.google.com with SMTP id v14-v6so10076626iob.4 for ; Sun, 16 Sep 2018 16:46:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jDArbQdVww+YSgUKwhIereZD0KDuIxo3XfjQo0Dfyoc=; b=MtSqOS63VH9yjjal86E/bgA2jgcaxL1KyQEcQ7/F7RLWZQ3Y1vZYGZoRUlLEor0FtB B6NLZCup0miL/UXfeOOAOdN/KrAPoV8JC1Nb17n08wPxnp4wjzmvxb4IvR4/BwDet5BJ dyScJ5A5M08ju3b2Si9t6v5eNJAi6WUH1Y8+0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jDArbQdVww+YSgUKwhIereZD0KDuIxo3XfjQo0Dfyoc=; b=S4jG7JEfL4pqgVG0Ohn0y7vAohTUJX28iJD6ApDWI5fCuAXfWQ4dEd/eanIaElrUfr P0dQzsArJL3kkQ5hCYss6VWkunQHIsSMCJ+ayZs/vCNJ5U5f9MyY57oqHM7fnWNRaqs5 f2o+ylK8kdI1Sg8PtNqHyBYQHCsf7l9IiCkFGTH2awcmTUyzbSPtZmklDAJLmLYAEbTZ ooXirlRh9HfrsCJaAF5dqhz7k+GxMgmYExeG0gvgB7OsTO5ki6r0YZTMnXheSOmnUu/U YV4/t+akb5PLGQfuKv0dLEcwDEhWc9j2jEUTm5vI+r69/qEwFd1ZP/R0ionRys5eXkA9 wuhA== X-Gm-Message-State: APzg51BGalvQ4r1M4khYo/XBzbAjwXgBb6wvkbzF5oE5Ly7tldqc/ss5 itR0C0cGsgxdaCCEQITTE2xHMg== X-Received: by 2002:a6b:c694:: with SMTP id w142-v6mr17833891iof.142.1537141560397; Sun, 16 Sep 2018 16:46:00 -0700 (PDT) Received: from localhost.localdomain ([209.82.80.116]) by smtp.gmail.com with ESMTPSA id a11-v6sm4495177ioc.63.2018.09.16.16.45.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Sep 2018 16:45:59 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: broonie@kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, vkoul@kernel.org, Srinivas Kandagatla Subject: [PATCH 3/7] slimbus: core: match device tree based devices correctly Date: Sun, 16 Sep 2018 16:45:42 -0700 Message-Id: <20180916234546.29661-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20180916234546.29661-1-srinivas.kandagatla@linaro.org> References: <20180916234546.29661-1-srinivas.kandagatla@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Srinivas Kandagatla device_id for device tree based devices come from dt compatible string, such drivers need not provide non dt style device id table. Match those device using compatible strings. Signed-off-by: Srinivas Kandagatla --- drivers/slimbus/core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.9.3 diff --git a/drivers/slimbus/core.c b/drivers/slimbus/core.c index 262591f..55eda58 100644 --- a/drivers/slimbus/core.c +++ b/drivers/slimbus/core.c @@ -33,6 +33,10 @@ static int slim_device_match(struct device *dev, struct device_driver *drv) struct slim_device *sbdev = to_slim_device(dev); struct slim_driver *sbdrv = to_slim_driver(drv); + /* Attempt an OF style match first */ + if (of_driver_match_device(dev, drv)) + return 1; + return !!slim_match(sbdrv->id_table, sbdev); } @@ -106,7 +110,7 @@ EXPORT_SYMBOL_GPL(slimbus_bus); int __slim_driver_register(struct slim_driver *drv, struct module *owner) { /* ID table and probe are mandatory */ - if (!drv->id_table || !drv->probe) + if (!(drv->driver.of_match_table || drv->id_table) || !drv->probe) return -EINVAL; drv->driver.bus = &slimbus_bus;