On Tue, 15 Mar 2022 02:34:12 +0000, cgel.zte@xxxxxxxxx wrote:
> From: Minghao Chi <chi.minghao@xxxxxxxxxx>
>
> Use of_device_get_match_data() to simplify the code.
>
> Reported-by: Zeal Robot <zealci@xxxxxxxxxx>
> Signed-off-by: Minghao Chi <chi.minghao@xxxxxxxxxx>
> ---
> drivers/hwmon/scpi-hwmon.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/hwmon/scpi-hwmon.c b/drivers/hwmon/scpi-hwmon.c
> index 919877970ae3..5187c6dd5a4f 100644
> --- a/drivers/hwmon/scpi-hwmon.c
> +++ b/drivers/hwmon/scpi-hwmon.c
> @@ -141,7 +141,6 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
> struct scpi_ops *scpi_ops;
> struct device *hwdev, *dev = &pdev->dev;
> struct scpi_sensors *scpi_sensors;
> - const struct of_device_id *of_id;
> int idx, ret;
>
> scpi_ops = get_scpi_ops();
> @@ -171,12 +170,11 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
>
> scpi_sensors->scpi_ops = scpi_ops;
>
> - of_id = of_match_device(scpi_of_match, &pdev->dev);
> - if (!of_id) {
> + scale = of_device_get_match_data(&pdev->dev);
> + if (!scale) {
> dev_err(&pdev->dev, "Unable to initialize scpi-hwmon data\n");
> return -ENODEV;
> }
> - scale = of_id->data;
>
> for (i = 0, idx = 0; i < nr_sensors; i++) {
> struct sensor_data *sensor = &scpi_sensors->data[idx];
Reviewed-by: Jean Delvare <jdelvare@xxxxxxx>
--
Jean Delvare
SUSE L3 Support
