[v1] goldfish: Fix unused const variable 'goldfish_pipe_acpi_match'

[PATCH] goldfish: Fix unused const variable 'goldfish_pipe_acpi_match'

Posted by Zeng Heng 1 month ago

Fix the following compilation warning:

drivers/platform/goldfish/goldfish_pipe.c:925:36: warning:
‘goldfish_pipe_acpi_match’ defined but not used
[-Wunused-const-variable=]
  925 | static const struct acpi_device_id goldfish_pipe_acpi_match[] = {

Only define the const variable when the CONFIG_ACPI is enabled.

Fixes: d62f324b0ac8 ("goldfish: Enable ACPI-based enumeration for android pipe")
Signed-off-by: Zeng Heng <zengheng4@huawei.com>
---
 drivers/platform/goldfish/goldfish_pipe.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index c2aab0cfab33..aeabacba3760 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -922,11 +922,13 @@ static void goldfish_pipe_remove(struct platform_device *pdev)
 	goldfish_pipe_device_deinit(pdev, dev);
 }
 
+#ifdef CONFIG_ACPI
 static const struct acpi_device_id goldfish_pipe_acpi_match[] = {
 	{ "GFSH0003", 0 },
 	{ },
 };
 MODULE_DEVICE_TABLE(acpi, goldfish_pipe_acpi_match);
+#endif
 
 static const struct of_device_id goldfish_pipe_of_match[] = {
 	{ .compatible = "google,android-pipe", },
-- 
2.25.1

Re: [PATCH] goldfish: Fix unused const variable 'goldfish_pipe_acpi_match'

Posted by Uwe Kleine-König 1 month ago

Hello,

[Cc += Andy]

On Fri, Oct 25, 2024 at 03:41:29PM +0800, Zeng Heng wrote:
> Fix the following compilation warning:
> 
> drivers/platform/goldfish/goldfish_pipe.c:925:36: warning:
> ‘goldfish_pipe_acpi_match’ defined but not used
> [-Wunused-const-variable=]
>   925 | static const struct acpi_device_id goldfish_pipe_acpi_match[] = {
> 
> Only define the const variable when the CONFIG_ACPI is enabled.

Note you also need CONFIG_MODULE=n to reproduce.

> Fixes: d62f324b0ac8 ("goldfish: Enable ACPI-based enumeration for android pipe")
> Signed-off-by: Zeng Heng <zengheng4@huawei.com>
> ---
>  drivers/platform/goldfish/goldfish_pipe.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
> index c2aab0cfab33..aeabacba3760 100644
> --- a/drivers/platform/goldfish/goldfish_pipe.c
> +++ b/drivers/platform/goldfish/goldfish_pipe.c
> @@ -922,11 +922,13 @@ static void goldfish_pipe_remove(struct platform_device *pdev)
>  	goldfish_pipe_device_deinit(pdev, dev);
>  }
>  
> +#ifdef CONFIG_ACPI
>  static const struct acpi_device_id goldfish_pipe_acpi_match[] = {
>  	{ "GFSH0003", 0 },
>  	{ },
>  };
>  MODULE_DEVICE_TABLE(acpi, goldfish_pipe_acpi_match);
> +#endif
>  
>  static const struct of_device_id goldfish_pipe_of_match[] = {
>  	{ .compatible = "google,android-pipe", },

Looking at changes like
https://lore.kernel.org/all/20241024130424.3818291-11-andriy.shevchenko@linux.intel.com/
I suggest to drop the use of ACPI_PTR() instead.

Best regards
Uwe

Re: [PATCH] goldfish: Fix unused const variable 'goldfish_pipe_acpi_match'

Posted by Zeng Heng 1 month ago

On 2024/10/25 22:27, Uwe Kleine-König wrote:
> Hello,
>
> [Cc += Andy]

I would loop in the next version.


>
> On Fri, Oct 25, 2024 at 03:41:29PM +0800, Zeng Heng wrote:
>> Fix the following compilation warning:
>>
>> drivers/platform/goldfish/goldfish_pipe.c:925:36: warning:
>> ‘goldfish_pipe_acpi_match’ defined but not used
>> [-Wunused-const-variable=]
>>    925 | static const struct acpi_device_id goldfish_pipe_acpi_match[] = {
>>
>> Only define the const variable when the CONFIG_ACPI is enabled.
> Note you also need CONFIG_MODULE=n to reproduce.
>
>> Fixes: d62f324b0ac8 ("goldfish: Enable ACPI-based enumeration for android pipe")
>> Signed-off-by: Zeng Heng <zengheng4@huawei.com>
>> ---
>>   drivers/platform/goldfish/goldfish_pipe.c | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
>> index c2aab0cfab33..aeabacba3760 100644
>> --- a/drivers/platform/goldfish/goldfish_pipe.c
>> +++ b/drivers/platform/goldfish/goldfish_pipe.c
>> @@ -922,11 +922,13 @@ static void goldfish_pipe_remove(struct platform_device *pdev)
>>   	goldfish_pipe_device_deinit(pdev, dev);
>>   }
>>   
>> +#ifdef CONFIG_ACPI
>>   static const struct acpi_device_id goldfish_pipe_acpi_match[] = {
>>   	{ "GFSH0003", 0 },
>>   	{ },
>>   };
>>   MODULE_DEVICE_TABLE(acpi, goldfish_pipe_acpi_match);
>> +#endif
>>   
>>   static const struct of_device_id goldfish_pipe_of_match[] = {
>>   	{ .compatible = "google,android-pipe", },
> Looking at changes like
> https://lore.kernel.org/all/20241024130424.3818291-11-andriy.shevchenko@linux.intel.com/
> I suggest to drop the use of ACPI_PTR() instead.

Right, got it.


Best regards,

Zeng Heng

Re: [PATCH] goldfish: Fix unused const variable 'goldfish_pipe_acpi_match'

Posted by Andy Shevchenko 1 month ago

On Fri, Oct 25, 2024 at 04:27:07PM +0200, Uwe Kleine-König wrote:
> On Fri, Oct 25, 2024 at 03:41:29PM +0800, Zeng Heng wrote:
> > Fix the following compilation warning:
> > 
> > drivers/platform/goldfish/goldfish_pipe.c:925:36: warning:
> > ‘goldfish_pipe_acpi_match’ defined but not used
> > [-Wunused-const-variable=]
> >   925 | static const struct acpi_device_id goldfish_pipe_acpi_match[] = {
> > 
> > Only define the const variable when the CONFIG_ACPI is enabled.

...

> Looking at changes like
> https://lore.kernel.org/all/20241024130424.3818291-11-andriy.shevchenko@linux.intel.com/
> I suggest to drop the use of ACPI_PTR() instead.

Right, please drop ACPI_PTR() and if needed, replace acpi.h with proper
mod_devicetable.h. You may find tons of examples in IIO:
`git log --grep ACPI_PTR -- drivers/iio`.

P.S. Thanks for Cc'ing me!

-- 
With Best Regards,
Andy Shevchenko