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;
Date:   Wed, 2 Nov 2022 16:57:45 +0800 (CST)
Message-ID: <202211021657454006946@zte.com.cn>
Mime-Version: 1.0
From:   <zhang.songyi@zte.com.cn>
To:     <nm@ti.com>
Cc:     <kristo@kernel.org>, <ssantosh@kernel.org>,
        <linux-arm-kernel@lists.infradead.org>,
        <linux-kernel@vger.kernel.org>, <zhang.songyi@zte.com.cn>,
        <jiang.xuexin@zte.com.cn>, <xue.zhihong@zte.com.cn>
Subject: =?UTF-8?B?W1BBVENIIGxpbnV4LW5leHRdIGZpcm13YXJlOiB0aV9zY2k6IFVzZSBvZl9kZXZpY2VfZ2V0X21hdGNoX2RhdGEoKQ==?=
Content-Type: text/plain;
        charset="UTF-8"
Precedence: bulk

From 18dbde082d02c871453c5be8c762b6383a2f9641 Mon Sep 17 00:00:00 2001
From: zhang songyi <zhang.songyi@zte.com.cn>
Date: Wed, 2 Nov 2022 16:17:54 +0800
Subject: [PATCH linux-next] firmware: ti_sci: Use of_device_get_match_data()

Use of_device_get_match_data() to simplify the code.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: zhang songyi <zhang.songyi@zte.com.cn>
---
 drivers/firmware/ti_sci.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index 6d2fd0ff7ff3..7db7d840fbb2 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -3340,7 +3340,6 @@ MODULE_DEVICE_TABLE(of, ti_sci_of_match);
 static int ti_sci_probe(struct platform_device *pdev)
 {
    struct device *dev = &pdev->dev;
-   const struct of_device_id *of_id;
    const struct ti_sci_desc *desc;
    struct ti_sci_xfer *xfer;
    struct ti_sci_info *info = NULL;
@@ -3351,12 +3350,11 @@ static int ti_sci_probe(struct platform_device *pdev)
    int reboot = 0;
    u32 h_id;

-   of_id = of_match_device(ti_sci_of_match, dev);
-   if (!of_id) {
+   desc = of_device_get_match_data(dev);
+   if (!desc) {
        dev_err(dev, "OF data missing\n");
        return -EINVAL;
    }
-   desc = of_id->data;

    info = devm_kzalloc(dev, sizeof(*info), GFP_KERNEL);
    if (!info)
--
2.15.2