From patchwork Thu Aug 31 16:05:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 137337 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c792:0:b0:3f2:4152:657d with SMTP id b18csp434006vqu; Thu, 31 Aug 2023 11:52:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE4sx0jlRBd3cfkMUxcpffiLipNtuHbzj57yiT7Vxr2yzWhfxJmb29DKKWbkYfzqmB8yhj2 X-Received: by 2002:a17:90a:5b12:b0:271:78a0:8ab2 with SMTP id o18-20020a17090a5b1200b0027178a08ab2mr478943pji.24.1693507938460; Thu, 31 Aug 2023 11:52:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693507938; cv=none; d=google.com; s=arc-20160816; b=CeKwrwn3pBky9gu28WjetY2iw/5joDrJjKqAFn4vPCfibSTHZo8bzSnY9CPvDVYfMN TQyDEuAhBtckcQGdA5807gGNvCE/fh8UNuO5Hp9kZyschNUiI4IzSnJ1Q9CwGKRpU+6M GRkVNCGNEEi4uCC4GmUeyqGytXPqb2UdpV9JzRGuE6kanSaCSedHtKwieEu5tZMPs31G JaELmyeyiDoDFbmL/qLJYSv/D1u+xGjxAlyno8sLm2PdIdYpozam1NYxL35wvG3jpet6 1d122keYw9rvc8mOZ18KCCwzy+Oqg+Rq5JdAFe2fmgelR8dJkc1tUkrCJCzEIqk4Xz9G dK1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=pMwILMgK7SgcaGn5qLw5PRuYGnWQlboh1IDgTLVlITU=; fh=o9SLWXOy7CjDICPJAAOsnetKjW4un45DYkhKAFpyC5o=; b=zs0WVwqCJCQX5W7p7OETFnc9zU2VXEWe0Grsad+A7RKSREzGHfIyBGWw/ep0p9r7A6 N3/JMgXommeUJk/nIe/O0uqFwp2y6QjzeTphZ19iIhjllYQQCqTskzH3cJfYd6Clmdf2 ikJ0IQfUDGbHJx/iGvA6HBbJM1MIbLhSj1NdQdTeVQRS9ijwnkfAY7juk8Yoe7iI7n2a 10WQui9JFRjNtYaoLR5kC4/BIHomAworLkJihjY6BJrZf1h071/E42NpITqomnRnPKgo NeUHI30uKthV6Zz7qkaMxfGPyOLN2tQcS1W9KKKcRKIwU4DRqz4qPCWnjWinULgsvadS ARYA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d13-20020a17090a498d00b00263e5a7d8d7si3860195pjh.1.2023.08.31.11.52.01; Thu, 31 Aug 2023 11:52:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346715AbjHaQF2 (ORCPT + 99 others); Thu, 31 Aug 2023 12:05:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346712AbjHaQF1 (ORCPT ); Thu, 31 Aug 2023 12:05:27 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7CEA1E71; Thu, 31 Aug 2023 09:05:22 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,217,1688396400"; d="scan'208";a="178328444" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 01 Sep 2023 01:05:21 +0900 Received: from localhost.localdomain (unknown [10.226.92.179]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id A783E40189C0; Fri, 1 Sep 2023 01:05:19 +0900 (JST) From: Biju Das To: Guenter Roeck , Heikki Krogerus Cc: Biju Das , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko Subject: [PATCH v2 5/5] usb: typec: tcpci_rt1711h: Drop CONFIG_OF ifdeffery Date: Thu, 31 Aug 2023 17:05:01 +0100 Message-Id: <20230831160501.55081-6-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230831160501.55081-1-biju.das.jz@bp.renesas.com> References: <20230831160501.55081-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775771780097350672 X-GMAIL-MSGID: 1775771780097350672 Drop of_match_ptr() from rt1711h_of_match and get rid of ugly CONFIG_OF ifdeffery. This slightly increases the size of rt1711h_of_match on non-OF system and shouldn't be an issue. Add mod_devicetable.h include. Signed-off-by: Biju Das --- v2: * New patch --- drivers/usb/typec/tcpm/tcpci_rt1711h.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpci_rt1711h.c b/drivers/usb/typec/tcpm/tcpci_rt1711h.c index 5d2dc7ead9d0..67422d45eb54 100644 --- a/drivers/usb/typec/tcpm/tcpci_rt1711h.c +++ b/drivers/usb/typec/tcpm/tcpci_rt1711h.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -411,19 +412,17 @@ static const struct i2c_device_id rt1711h_id[] = { }; MODULE_DEVICE_TABLE(i2c, rt1711h_id); -#ifdef CONFIG_OF static const struct of_device_id rt1711h_of_match[] = { { .compatible = "richtek,rt1711h", .data = &rt1711h }, { .compatible = "richtek,rt1715", .data = &rt1715 }, {} }; MODULE_DEVICE_TABLE(of, rt1711h_of_match); -#endif static struct i2c_driver rt1711h_i2c_driver = { .driver = { .name = "rt1711h", - .of_match_table = of_match_ptr(rt1711h_of_match), + .of_match_table = rt1711h_of_match, }, .probe = rt1711h_probe, .remove = rt1711h_remove,