linux-kernel - Re: [PATCH next 23/25] thermal: Use dev_get

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: <c835c3db-a070-94d5-d4d1-ae9bb521b76d@huawei.com>
Date:   Mon, 29 Apr 2019 14:55:28 +0800
From:   Kefeng Wang <wangkefeng.wang@...wei.com>
To:     Zhang Rui <rui.zhang@...el.com>, <linux-kernel@...r.kernel.org>
CC:     Masahiro Yamada <yamada.masahiro@...ionext.com>,
        Eduardo Valentin <edubezval@...il.com>,
        Daniel Lezcano <daniel.lezcano@...aro.org>,
        <linux-pm@...r.kernel.org>
Subject: Re: [PATCH next 23/25] thermal: Use dev_get_drvdata()


On 2019/4/29 11:47, Zhang Rui wrote:
> On 二, 2019-04-23 at 15:50 +0800, Kefeng Wang wrote:
>> Using dev_get_drvdata directly.
>>
>> Cc: Zhang Rui <rui.zhang@...el.com>
>> Cc: Eduardo Valentin <edubezval@...il.com>
>> Cc: Daniel Lezcano <daniel.lezcano@...aro.org>
>> Cc: linux-pm@...r.kernel.org
>> Signed-off-by: Kefeng Wang <wangkefeng.wang@...wei.com>
>> ---
>>  .../intel/int340x_thermal/processor_thermal_device.c      | 8 +-----
>> --
>>  drivers/thermal/st/stm_thermal.c                          | 6 ++----
>>  2 files changed, 3 insertions(+), 11 deletions(-)
>>
>> diff --git
>> a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
>> b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
>> index 8e1cf4d789be..4ad54b8d4778 100644
>> ---
>> a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
>> +++
>> b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
>> @@ -81,8 +81,6 @@ static ssize_t
>> power_limit_##index##_##suffix##_show(struct device *dev, \
>>  					struct device_attribute
>> *attr, \
>>  					char *buf) \
>>  { \
>> -	struct pci_dev *pci_dev; \
>> -	struct platform_device *pdev; \
>>  	struct proc_thermal_device *proc_dev; \
>>  	\
>>  	if (proc_thermal_emum_mode == PROC_THERMAL_NONE) { \
>> @@ -91,11 +89,7 @@ static ssize_t
>> power_limit_##index##_##suffix##_show(struct device *dev, \
>>  	} \
>>  	\
>>  	if (proc_thermal_emum_mode == PROC_THERMAL_PLATFORM_DEV) { \
>> -		pdev = to_platform_device(dev); \
>> -		proc_dev = platform_get_drvdata(pdev); \
>> -	} else { \
>> -		pci_dev = to_pci_dev(dev); \
>> -		proc_dev = pci_get_drvdata(pci_dev); \
>> +		proc_dev = dev_get_drvdata(dev); \
>>  	} \
>>  	return sprintf(buf, "%lu\n",\
>>  	(unsigned long)proc_dev->power_limits[index].suffix * 1000);
>> \
> Sumeet has a patch to fix the same issue, which has been in my tree
> https://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git/commit
> /?h=next&id=1948d498dcf680bc650391f23da2f97e59f9126d
>
> Plus, the previous fix is wrong because proc_dev will be left
> uninitialized if proc_thermal_emum_mode equals PROC_THERMAL_PCI.

oh, Sumeet's patch is the right one and much cleaner.


>
> thanks,
> rui
>
>> diff --git a/drivers/thermal/st/stm_thermal.c
>> b/drivers/thermal/st/stm_thermal.c
>> index bbd73c5a4a4e..cf9ddc52f30e 100644
>> --- a/drivers/thermal/st/stm_thermal.c
>> +++ b/drivers/thermal/st/stm_thermal.c
>> @@ -570,8 +570,7 @@ static int stm_thermal_prepare(struct
>> stm_thermal_sensor *sensor)
>>  static int stm_thermal_suspend(struct device *dev)
>>  {
>>  	int ret;
>> -	struct platform_device *pdev = to_platform_device(dev);
>> -	struct stm_thermal_sensor *sensor =
>> platform_get_drvdata(pdev);
>> +	struct stm_thermal_sensor *sensor = dev_get_drvdata(dev);
>>  
>>  	ret = stm_thermal_sensor_off(sensor);
>>  	if (ret)
>> @@ -585,8 +584,7 @@ static int stm_thermal_suspend(struct device
>> *dev)
>>  static int stm_thermal_resume(struct device *dev)
>>  {
>>  	int ret;
>> -	struct platform_device *pdev = to_platform_device(dev);
>> -	struct stm_thermal_sensor *sensor =
>> platform_get_drvdata(pdev);
>> +	struct stm_thermal_sensor *sensor = dev_get_drvdata(dev);
>>  
>>  	ret = stm_thermal_prepare(sensor);
>>  	if (ret)
> .
>