* [PATCH v2] extcon: lc824206xa: Fix build error of POWER_SUPPLY_PROP_USB_TYPE
@ 2024-09-04 16:43 chanwoo
2024-09-04 16:50 ` Hans de Goede
2024-09-04 23:31 ` Stephen Rothwell
0 siblings, 2 replies; 3+ messages in thread
From: chanwoo @ 2024-09-04 16:43 UTC (permalink / raw)
To: linux-kernel; +Cc: cw00.choi, myungjoo.ham, hdegoede, Stephen Rothwell
From: Stephen Rothwell <sfr@canb.auug.org.au>
commit 364ea7ccaef9("power: supply: Change usb_types from an array into a
bitmask") changes usb_types from an array into a bitmask. Fix the build error of
usb_types variables.
Link: https://lore.kernel.org/lkml/20240831142039.28830-7-hdegoede@redhat.com/
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
Changes from v1
- Update patch description with correct commit
drivers/extcon/extcon-lc824206xa.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/extcon/extcon-lc824206xa.c b/drivers/extcon/extcon-lc824206xa.c
index d58a2c369018..56938748aea8 100644
--- a/drivers/extcon/extcon-lc824206xa.c
+++ b/drivers/extcon/extcon-lc824206xa.c
@@ -393,14 +393,6 @@ static int lc824206xa_psy_get_prop(struct power_supply *psy,
return 0;
}
-static const enum power_supply_usb_type lc824206xa_psy_usb_types[] = {
- POWER_SUPPLY_USB_TYPE_SDP,
- POWER_SUPPLY_USB_TYPE_CDP,
- POWER_SUPPLY_USB_TYPE_DCP,
- POWER_SUPPLY_USB_TYPE_ACA,
- POWER_SUPPLY_USB_TYPE_UNKNOWN,
-};
-
static const enum power_supply_property lc824206xa_psy_props[] = {
POWER_SUPPLY_PROP_ONLINE,
POWER_SUPPLY_PROP_USB_TYPE,
@@ -410,8 +402,11 @@ static const enum power_supply_property lc824206xa_psy_props[] = {
static const struct power_supply_desc lc824206xa_psy_desc = {
.name = "lc824206xa-charger-detect",
.type = POWER_SUPPLY_TYPE_USB,
- .usb_types = lc824206xa_psy_usb_types,
- .num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types),
+ .usb_types = BIT(POWER_SUPPLY_USB_TYPE_SDP) |
+ BIT(POWER_SUPPLY_USB_TYPE_CDP) |
+ BIT(POWER_SUPPLY_USB_TYPE_DCP) |
+ BIT(POWER_SUPPLY_USB_TYPE_ACA) |
+ BIT(POWER_SUPPLY_USB_TYPE_UNKNOWN),
.properties = lc824206xa_psy_props,
.num_properties = ARRAY_SIZE(lc824206xa_psy_props),
.get_property = lc824206xa_psy_get_prop,
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] extcon: lc824206xa: Fix build error of POWER_SUPPLY_PROP_USB_TYPE
2024-09-04 16:43 [PATCH v2] extcon: lc824206xa: Fix build error of POWER_SUPPLY_PROP_USB_TYPE chanwoo
@ 2024-09-04 16:50 ` Hans de Goede
2024-09-04 23:31 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Hans de Goede @ 2024-09-04 16:50 UTC (permalink / raw)
To: chanwoo, linux-kernel; +Cc: cw00.choi, myungjoo.ham, Stephen Rothwell
Hi,
On 9/4/24 6:43 PM, chanwoo@kernel.org wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
>
> commit 364ea7ccaef9("power: supply: Change usb_types from an array into a
> bitmask") changes usb_types from an array into a bitmask. Fix the build error of
> usb_types variables.
>
> Link: https://lore.kernel.org/lkml/20240831142039.28830-7-hdegoede@redhat.com/
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Thanks, patch looks good to me now:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> Changes from v1
> - Update patch description with correct commit
>
> drivers/extcon/extcon-lc824206xa.c | 15 +++++----------
> 1 file changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/extcon/extcon-lc824206xa.c b/drivers/extcon/extcon-lc824206xa.c
> index d58a2c369018..56938748aea8 100644
> --- a/drivers/extcon/extcon-lc824206xa.c
> +++ b/drivers/extcon/extcon-lc824206xa.c
> @@ -393,14 +393,6 @@ static int lc824206xa_psy_get_prop(struct power_supply *psy,
> return 0;
> }
>
> -static const enum power_supply_usb_type lc824206xa_psy_usb_types[] = {
> - POWER_SUPPLY_USB_TYPE_SDP,
> - POWER_SUPPLY_USB_TYPE_CDP,
> - POWER_SUPPLY_USB_TYPE_DCP,
> - POWER_SUPPLY_USB_TYPE_ACA,
> - POWER_SUPPLY_USB_TYPE_UNKNOWN,
> -};
> -
> static const enum power_supply_property lc824206xa_psy_props[] = {
> POWER_SUPPLY_PROP_ONLINE,
> POWER_SUPPLY_PROP_USB_TYPE,
> @@ -410,8 +402,11 @@ static const enum power_supply_property lc824206xa_psy_props[] = {
> static const struct power_supply_desc lc824206xa_psy_desc = {
> .name = "lc824206xa-charger-detect",
> .type = POWER_SUPPLY_TYPE_USB,
> - .usb_types = lc824206xa_psy_usb_types,
> - .num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types),
> + .usb_types = BIT(POWER_SUPPLY_USB_TYPE_SDP) |
> + BIT(POWER_SUPPLY_USB_TYPE_CDP) |
> + BIT(POWER_SUPPLY_USB_TYPE_DCP) |
> + BIT(POWER_SUPPLY_USB_TYPE_ACA) |
> + BIT(POWER_SUPPLY_USB_TYPE_UNKNOWN),
> .properties = lc824206xa_psy_props,
> .num_properties = ARRAY_SIZE(lc824206xa_psy_props),
> .get_property = lc824206xa_psy_get_prop,
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] extcon: lc824206xa: Fix build error of POWER_SUPPLY_PROP_USB_TYPE
2024-09-04 16:43 [PATCH v2] extcon: lc824206xa: Fix build error of POWER_SUPPLY_PROP_USB_TYPE chanwoo
2024-09-04 16:50 ` Hans de Goede
@ 2024-09-04 23:31 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2024-09-04 23:31 UTC (permalink / raw)
To: chanwoo; +Cc: linux-kernel, cw00.choi, myungjoo.ham, hdegoede
[-- Attachment #1: Type: text/plain, Size: 2326 bytes --]
Hi,
On Thu, 5 Sep 2024 01:43:25 +0900 chanwoo@kernel.org wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
>
> commit 364ea7ccaef9("power: supply: Change usb_types from an array into a
> bitmask") changes usb_types from an array into a bitmask. Fix the build error of
> usb_types variables.
>
> Link: https://lore.kernel.org/lkml/20240831142039.28830-7-hdegoede@redhat.com/
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
> ---
> Changes from v1
> - Update patch description with correct commit
>
> drivers/extcon/extcon-lc824206xa.c | 15 +++++----------
> 1 file changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/extcon/extcon-lc824206xa.c b/drivers/extcon/extcon-lc824206xa.c
> index d58a2c369018..56938748aea8 100644
> --- a/drivers/extcon/extcon-lc824206xa.c
> +++ b/drivers/extcon/extcon-lc824206xa.c
> @@ -393,14 +393,6 @@ static int lc824206xa_psy_get_prop(struct power_supply *psy,
> return 0;
> }
>
> -static const enum power_supply_usb_type lc824206xa_psy_usb_types[] = {
> - POWER_SUPPLY_USB_TYPE_SDP,
> - POWER_SUPPLY_USB_TYPE_CDP,
> - POWER_SUPPLY_USB_TYPE_DCP,
> - POWER_SUPPLY_USB_TYPE_ACA,
> - POWER_SUPPLY_USB_TYPE_UNKNOWN,
> -};
> -
> static const enum power_supply_property lc824206xa_psy_props[] = {
> POWER_SUPPLY_PROP_ONLINE,
> POWER_SUPPLY_PROP_USB_TYPE,
> @@ -410,8 +402,11 @@ static const enum power_supply_property lc824206xa_psy_props[] = {
> static const struct power_supply_desc lc824206xa_psy_desc = {
> .name = "lc824206xa-charger-detect",
> .type = POWER_SUPPLY_TYPE_USB,
> - .usb_types = lc824206xa_psy_usb_types,
> - .num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types),
> + .usb_types = BIT(POWER_SUPPLY_USB_TYPE_SDP) |
> + BIT(POWER_SUPPLY_USB_TYPE_CDP) |
> + BIT(POWER_SUPPLY_USB_TYPE_DCP) |
> + BIT(POWER_SUPPLY_USB_TYPE_ACA) |
> + BIT(POWER_SUPPLY_USB_TYPE_UNKNOWN),
> .properties = lc824206xa_psy_props,
> .num_properties = ARRAY_SIZE(lc824206xa_psy_props),
> .get_property = lc824206xa_psy_get_prop,
> --
> 2.25.1
>
To preserve bisectablility, this fix up should have been applied to the
actual merge commit where you merged Hans immutable branch.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-04 23:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-04 16:43 [PATCH v2] extcon: lc824206xa: Fix build error of POWER_SUPPLY_PROP_USB_TYPE chanwoo
2024-09-04 16:50 ` Hans de Goede
2024-09-04 23:31 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox