linux-kernel - Re: hwmon: xgene: Minor clean up of ifdef and acpi_match

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20171101131553.GA21209@roeck-us.net>
Date:   Wed, 1 Nov 2017 06:15:53 -0700
From:   Guenter Roeck <linux@...ck-us.net>
To:     hotran <hotran@....com>
Cc:     Jean Delvare <jdelvare@...e.com>, linux-hwmon@...r.kernel.org,
        linux-kernel@...r.kernel.org, lho@....com, patches@....com
Subject: Re: hwmon: xgene: Minor clean up of ifdef and acpi_match_table
 reference

On Tue, Oct 31, 2017 at 01:58:07PM -0700, hotran wrote:
> This patch removes the un-necessary ifdef CONFIG_ACPI and directly
> uses the acpi_match_table from the driver pdev.
> 
> Signed-off-by: Hoan Tran <hotran@....com>

Applied to hwmon-next, with now unnecessary initialization of 'version'
removed.

Thanks,
Guenter

> ---
>  drivers/hwmon/xgene-hwmon.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/hwmon/xgene-hwmon.c b/drivers/hwmon/xgene-hwmon.c
> index 5783436..85c4e3d 100644
> --- a/drivers/hwmon/xgene-hwmon.c
> +++ b/drivers/hwmon/xgene-hwmon.c
> @@ -665,16 +665,15 @@ static int xgene_hwmon_probe(struct platform_device *pdev)
>  		}
>  	} else {
>  		struct acpi_pcct_hw_reduced *cppc_ss;
> -		int version = XGENE_HWMON_V1;
> -#ifdef CONFIG_ACPI
>  		const struct acpi_device_id *acpi_id;
> +		int version = XGENE_HWMON_V1;
>  
> -		acpi_id = acpi_match_device(xgene_hwmon_acpi_match, &pdev->dev);
> +		acpi_id = acpi_match_device(pdev->dev.driver->acpi_match_table,
> +					    &pdev->dev);
>  		if (!acpi_id)
>  			return -EINVAL;
>  
>  		version = (int)acpi_id->driver_data;
> -#endif
>  
>  		if (device_property_read_u32(&pdev->dev, "pcc-channel",
>  					     &ctx->mbox_idx)) {