[PATCH] extcon: axp288: Fix build err without CONFIG_ACPI

[PATCH] extcon: axp288: Fix build err without CONFIG_ACPI

[Yue Haibing]

From: YueHaibing <yuehaibing@huawei.com>

When building CONFIG_ACPI is not set
gcc warn this:

drivers/extcon/extcon-axp288.c: In function 'axp288_extcon_probe':
drivers/extcon/extcon-axp288.c:363:20: error: dereferencing pointer to incomplete type
    put_device(&adev->dev);

Reported-by: Hulk Robot <hulkci@huawei.com>
Fixes: 0cf064db948a ("extcon: axp288: Convert to use acpi_dev_get_first_match_dev()")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 drivers/extcon/extcon-axp288.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
index 50f9402..ed8ac3f 100644
--- a/drivers/extcon/extcon-axp288.c
+++ b/drivers/extcon/extcon-axp288.c
@@ -333,7 +333,6 @@ static int axp288_extcon_probe(struct platform_device *pdev)
 	struct axp288_extcon_info *info;
 	struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
 	struct device *dev = &pdev->dev;
-	struct acpi_device *adev;
 	int ret, i, pirq;
 
 	info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
@@ -357,6 +356,8 @@ static int axp288_extcon_probe(struct platform_device *pdev)
 		if (ret)
 			return ret;
 
+#ifdef CONFIG_ACPI
+		struct acpi_device *adev;
 		adev = acpi_dev_get_first_match_dev("INT3496", NULL, -1);
 		if (adev) {
 			info->id_extcon = extcon_get_extcon_dev(acpi_dev_name(adev));
@@ -365,9 +366,10 @@ static int axp288_extcon_probe(struct platform_device *pdev)
 				return -EPROBE_DEFER;
 
 			dev_info(dev, "controlling USB role\n");
-		} else {
-			dev_info(dev, "controlling USB role based on Vbus presence\n");
 		}
+#else
+		dev_info(dev, "controlling USB role based on Vbus presence\n");
+#endif
 	}
 
 	info->vbus_attach = axp288_get_vbus_attach(info);
-- 
2.7.4

Re: [PATCH] extcon: axp288: Fix build err without CONFIG_ACPI

[Mukesh Ojha]

On 4/4/2019 4:12 PM, Yue Haibing wrote:
> From: YueHaibing <yuehaibing@huawei.com>
>
> When building CONFIG_ACPI is not set
> gcc warn this:
>
> drivers/extcon/extcon-axp288.c: In function 'axp288_extcon_probe':
> drivers/extcon/extcon-axp288.c:363:20: error: dereferencing pointer to incomplete type
>      put_device(&adev->dev);
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Fixes: 0cf064db948a ("extcon: axp288: Convert to use acpi_dev_get_first_match_dev()")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>


Looks fine to me.
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>

Cheers,
-Mukesh

> ---
>   drivers/extcon/extcon-axp288.c | 8 +++++---
>   1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
> index 50f9402..ed8ac3f 100644
> --- a/drivers/extcon/extcon-axp288.c
> +++ b/drivers/extcon/extcon-axp288.c
> @@ -333,7 +333,6 @@ static int axp288_extcon_probe(struct platform_device *pdev)
>   	struct axp288_extcon_info *info;
>   	struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
>   	struct device *dev = &pdev->dev;
> -	struct acpi_device *adev;
>   	int ret, i, pirq;
>   
>   	info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
> @@ -357,6 +356,8 @@ static int axp288_extcon_probe(struct platform_device *pdev)
>   		if (ret)
>   			return ret;
>   
> +#ifdef CONFIG_ACPI
> +		struct acpi_device *adev;
>   		adev = acpi_dev_get_first_match_dev("INT3496", NULL, -1);
>   		if (adev) {
>   			info->id_extcon = extcon_get_extcon_dev(acpi_dev_name(adev));
> @@ -365,9 +366,10 @@ static int axp288_extcon_probe(struct platform_device *pdev)
>   				return -EPROBE_DEFER;
>   
>   			dev_info(dev, "controlling USB role\n");
> -		} else {
> -			dev_info(dev, "controlling USB role based on Vbus presence\n");
>   		}
> +#else
> +		dev_info(dev, "controlling USB role based on Vbus presence\n");
> +#endif
>   	}
>   
>   	info->vbus_attach = axp288_get_vbus_attach(info);

Re: [PATCH] extcon: axp288: Fix build err without CONFIG_ACPI

[Hans de Goede]

Hi,

On 04-04-19 12:42, Yue Haibing wrote:
> From: YueHaibing <yuehaibing@huawei.com>
> 
> When building CONFIG_ACPI is not set
> gcc warn this:
> 
> drivers/extcon/extcon-axp288.c: In function 'axp288_extcon_probe':
> drivers/extcon/extcon-axp288.c:363:20: error: dereferencing pointer to incomplete type
>      put_device(&adev->dev);
> 
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Fixes: 0cf064db948a ("extcon: axp288: Convert to use acpi_dev_get_first_match_dev()")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Using this driver without ACPI makes little sense, IMHO it would be better to add
a depends on ACPI to the Kconfig entry, rather then adding #ifdef-s to the driver.

Regards,

Hans


> ---
>   drivers/extcon/extcon-axp288.c | 8 +++++---
>   1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
> index 50f9402..ed8ac3f 100644
> --- a/drivers/extcon/extcon-axp288.c
> +++ b/drivers/extcon/extcon-axp288.c
> @@ -333,7 +333,6 @@ static int axp288_extcon_probe(struct platform_device *pdev)
>   	struct axp288_extcon_info *info;
>   	struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
>   	struct device *dev = &pdev->dev;
> -	struct acpi_device *adev;
>   	int ret, i, pirq;
>   
>   	info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
> @@ -357,6 +356,8 @@ static int axp288_extcon_probe(struct platform_device *pdev)
>   		if (ret)
>   			return ret;
>   
> +#ifdef CONFIG_ACPI
> +		struct acpi_device *adev;
>   		adev = acpi_dev_get_first_match_dev("INT3496", NULL, -1);
>   		if (adev) {
>   			info->id_extcon = extcon_get_extcon_dev(acpi_dev_name(adev));
> @@ -365,9 +366,10 @@ static int axp288_extcon_probe(struct platform_device *pdev)
>   				return -EPROBE_DEFER;
>   
>   			dev_info(dev, "controlling USB role\n");
> -		} else {
> -			dev_info(dev, "controlling USB role based on Vbus presence\n");
>   		}
> +#else
> +		dev_info(dev, "controlling USB role based on Vbus presence\n");
> +#endif
>   	}
>   
>   	info->vbus_attach = axp288_get_vbus_attach(info);
> 

Re: [PATCH] extcon: axp288: Fix build err without CONFIG_ACPI

[YueHaibing]

On 2019/4/4 20:02, Hans de Goede wrote:
> Hi,
> 
> On 04-04-19 12:42, Yue Haibing wrote:
>> From: YueHaibing <yuehaibing@huawei.com>
>>
>> When building CONFIG_ACPI is not set
>> gcc warn this:
>>
>> drivers/extcon/extcon-axp288.c: In function 'axp288_extcon_probe':
>> drivers/extcon/extcon-axp288.c:363:20: error: dereferencing pointer to incomplete type
>>      put_device(&adev->dev);
>>
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>> Fixes: 0cf064db948a ("extcon: axp288: Convert to use acpi_dev_get_first_match_dev()")
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> 
> Using this driver without ACPI makes little sense, IMHO it would be better to add
> a depends on ACPI to the Kconfig entry, rather then adding #ifdef-s to the driver.

OK, thank for your commnet, I will send v2 as this.

> 
> Regards,
> 
> Hans
> 
> 
>> ---
>>   drivers/extcon/extcon-axp288.c | 8 +++++---
>>   1 file changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
>> index 50f9402..ed8ac3f 100644
>> --- a/drivers/extcon/extcon-axp288.c
>> +++ b/drivers/extcon/extcon-axp288.c
>> @@ -333,7 +333,6 @@ static int axp288_extcon_probe(struct platform_device *pdev)
>>       struct axp288_extcon_info *info;
>>       struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
>>       struct device *dev = &pdev->dev;
>> -    struct acpi_device *adev;
>>       int ret, i, pirq;
>>         info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
>> @@ -357,6 +356,8 @@ static int axp288_extcon_probe(struct platform_device *pdev)
>>           if (ret)
>>               return ret;
>>   +#ifdef CONFIG_ACPI
>> +        struct acpi_device *adev;
>>           adev = acpi_dev_get_first_match_dev("INT3496", NULL, -1);
>>           if (adev) {
>>               info->id_extcon = extcon_get_extcon_dev(acpi_dev_name(adev));
>> @@ -365,9 +366,10 @@ static int axp288_extcon_probe(struct platform_device *pdev)
>>                   return -EPROBE_DEFER;
>>                 dev_info(dev, "controlling USB role\n");
>> -        } else {
>> -            dev_info(dev, "controlling USB role based on Vbus presence\n");
>>           }
>> +#else
>> +        dev_info(dev, "controlling USB role based on Vbus presence\n");
>> +#endif
>>       }
>>         info->vbus_attach = axp288_get_vbus_attach(info);
>>
> 
> .
> 

[PATCH v2] extcon: axp288: Add a depends on ACPI to the Kconfig entry

[Yue Haibing]

From: YueHaibing <yuehaibing@huawei.com>

As Hans de Goede pointed, using this driver without ACPI
makes little sense, so add ACPI dependency to Kconfig entry
to fix a build error while CONFIG_ACPI is not set.

drivers/extcon/extcon-axp288.c: In function 'axp288_extcon_probe':
drivers/extcon/extcon-axp288.c:363:20: error: dereferencing pointer to incomplete type
    put_device(&adev->dev);

Fixes: 0cf064db948a ("extcon: axp288: Convert to use acpi_dev_get_first_match_dev()")
Reported-by: Hulk Robot <hulkci@huawei.com>
Suggested-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
v2: rework patch
---
 drivers/extcon/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
index 1ed4b45..de06faf 100644
--- a/drivers/extcon/Kconfig
+++ b/drivers/extcon/Kconfig
@@ -30,7 +30,7 @@ config EXTCON_ARIZONA
 
 config EXTCON_AXP288
 	tristate "X-Power AXP288 EXTCON support"
-	depends on MFD_AXP20X && USB_SUPPORT && X86
+	depends on MFD_AXP20X && USB_SUPPORT && X86 && ACPI
 	select USB_ROLE_SWITCH
 	help
 	  Say Y here to enable support for USB peripheral detection
-- 
2.7.4

Re: [PATCH v2] extcon: axp288: Add a depends on ACPI to the Kconfig entry

[Hans de Goede]

Hi,

On 04-04-19 16:17, Yue Haibing wrote:
> From: YueHaibing <yuehaibing@huawei.com>
> 
> As Hans de Goede pointed, using this driver without ACPI
> makes little sense, so add ACPI dependency to Kconfig entry
> to fix a build error while CONFIG_ACPI is not set.
> 
> drivers/extcon/extcon-axp288.c: In function 'axp288_extcon_probe':
> drivers/extcon/extcon-axp288.c:363:20: error: dereferencing pointer to incomplete type
>      put_device(&adev->dev);
> 
> Fixes: 0cf064db948a ("extcon: axp288: Convert to use acpi_dev_get_first_match_dev()")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Suggested-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Patch looks to me, thanks:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans


> ---
> v2: rework patch
> ---
>   drivers/extcon/Kconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
> index 1ed4b45..de06faf 100644
> --- a/drivers/extcon/Kconfig
> +++ b/drivers/extcon/Kconfig
> @@ -30,7 +30,7 @@ config EXTCON_ARIZONA
>   
>   config EXTCON_AXP288
>   	tristate "X-Power AXP288 EXTCON support"
> -	depends on MFD_AXP20X && USB_SUPPORT && X86
> +	depends on MFD_AXP20X && USB_SUPPORT && X86 && ACPI
>   	select USB_ROLE_SWITCH
>   	help
>   	  Say Y here to enable support for USB peripheral detection
> 

Re: [PATCH v2] extcon: axp288: Add a depends on ACPI to the Kconfig entry

[Mukesh Ojha]

On 4/4/2019 7:47 PM, Yue Haibing wrote:
> From: YueHaibing <yuehaibing@huawei.com>
>
> As Hans de Goede pointed, using this driver without ACPI
> makes little sense, so add ACPI dependency to Kconfig entry
> to fix a build error while CONFIG_ACPI is not set.
>
> drivers/extcon/extcon-axp288.c: In function 'axp288_extcon_probe':
> drivers/extcon/extcon-axp288.c:363:20: error: dereferencing pointer to incomplete type
>      put_device(&adev->dev);
>
> Fixes: 0cf064db948a ("extcon: axp288: Convert to use acpi_dev_get_first_match_dev()")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Suggested-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

This looks good too.
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>

Cheers,
-Mukesh

> ---
> v2: rework patch
> ---
>   drivers/extcon/Kconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
> index 1ed4b45..de06faf 100644
> --- a/drivers/extcon/Kconfig
> +++ b/drivers/extcon/Kconfig
> @@ -30,7 +30,7 @@ config EXTCON_ARIZONA
>   
>   config EXTCON_AXP288
>   	tristate "X-Power AXP288 EXTCON support"
> -	depends on MFD_AXP20X && USB_SUPPORT && X86
> +	depends on MFD_AXP20X && USB_SUPPORT && X86 && ACPI
>   	select USB_ROLE_SWITCH
>   	help
>   	  Say Y here to enable support for USB peripheral detection

Re: [PATCH v2] extcon: axp288: Add a depends on ACPI to the Kconfig entry

[Chanwoo Choi]

On 19. 4. 4. 오후 11:17, Yue Haibing wrote:
> From: YueHaibing <yuehaibing@huawei.com>
> 
> As Hans de Goede pointed, using this driver without ACPI
> makes little sense, so add ACPI dependency to Kconfig entry
> to fix a build error while CONFIG_ACPI is not set.
> 
> drivers/extcon/extcon-axp288.c: In function 'axp288_extcon_probe':
> drivers/extcon/extcon-axp288.c:363:20: error: dereferencing pointer to incomplete type
>     put_device(&adev->dev);
> 
> Fixes: 0cf064db948a ("extcon: axp288: Convert to use acpi_dev_get_first_match_dev()")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Suggested-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
> v2: rework patch
> ---
>  drivers/extcon/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
> index 1ed4b45..de06faf 100644
> --- a/drivers/extcon/Kconfig
> +++ b/drivers/extcon/Kconfig
> @@ -30,7 +30,7 @@ config EXTCON_ARIZONA
>  
>  config EXTCON_AXP288
>  	tristate "X-Power AXP288 EXTCON support"
> -	depends on MFD_AXP20X && USB_SUPPORT && X86
> +	depends on MFD_AXP20X && USB_SUPPORT && X86 && ACPI
>  	select USB_ROLE_SWITCH
>  	help
>  	  Say Y here to enable support for USB peripheral detection
> 

Applied it. Thanks.

-- 
Best Regards,
Chanwoo Choi
Samsung Electronics

Re: [PATCH v2] extcon: axp288: Add a depends on ACPI to the Kconfig entry

[Chanwoo Choi]

Dear all,
 
+ stable@vger.kernel.org 
 
It should be posted to stable@vger.kernel.org
in order to merge it to stable tree.
 
Regards,
Chanwoo Choi


On 19. 4. 12. 오전 8:30, Chanwoo Choi wrote:
> On 19. 4. 4. 오후 11:17, Yue Haibing wrote:
>> From: YueHaibing <yuehaibing@huawei.com>
>>
>> As Hans de Goede pointed, using this driver without ACPI
>> makes little sense, so add ACPI dependency to Kconfig entry
>> to fix a build error while CONFIG_ACPI is not set.
>>
>> drivers/extcon/extcon-axp288.c: In function 'axp288_extcon_probe':
>> drivers/extcon/extcon-axp288.c:363:20: error: dereferencing pointer to incomplete type
>>     put_device(&adev->dev);
>>
>> Fixes: 0cf064db948a ("extcon: axp288: Convert to use acpi_dev_get_first_match_dev()")
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>> Suggested-by: Hans de Goede <hdegoede@redhat.com>
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>> ---
>> v2: rework patch
>> ---
>>  drivers/extcon/Kconfig | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
>> index 1ed4b45..de06faf 100644
>> --- a/drivers/extcon/Kconfig
>> +++ b/drivers/extcon/Kconfig
>> @@ -30,7 +30,7 @@ config EXTCON_ARIZONA
>>  
>>  config EXTCON_AXP288
>>  	tristate "X-Power AXP288 EXTCON support"
>> -	depends on MFD_AXP20X && USB_SUPPORT && X86
>> +	depends on MFD_AXP20X && USB_SUPPORT && X86 && ACPI
>>  	select USB_ROLE_SWITCH
>>  	help
>>  	  Say Y here to enable support for USB peripheral detection
>>
> 
> Applied it. Thanks.
> 


-- 
Best Regards,
Chanwoo Choi
Samsung Electronics