kevin/linux
1
Fork 0
Code

extcon: lc824206xa: Fix build error of POWER_SUPPLY_PROP_USB_TYPE

Browse Source 
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/20240904164325.48386-1-chanwoo@kernel.org/
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
This commit is contained in:
Stephen Rothwell 2024-09-05 00:54:21 +09:00 committed by Chanwoo Choi
parent c135cd82f1
commit 2e01ac83c1
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/extcon/extcon-lc824206xa.c
View File

@ -393,14 +393,6 @@ static int lc824206xa_psy_get_prop(struct power_supply *psy,
return 0; 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[] = { static const enum power_supply_property lc824206xa_psy_props[] = {
POWER_SUPPLY_PROP_ONLINE, POWER_SUPPLY_PROP_ONLINE,
POWER_SUPPLY_PROP_USB_TYPE, 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 = { static const struct power_supply_desc lc824206xa_psy_desc = {
.name = "lc824206xa-charger-detect", .name = "lc824206xa-charger-detect",
.type = POWER_SUPPLY_TYPE_USB, .type = POWER_SUPPLY_TYPE_USB,
.usb_types = lc824206xa_psy_usb_types, .usb_types = BIT(POWER_SUPPLY_USB_TYPE_SDP) |
.num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types), 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, .properties = lc824206xa_psy_props,
.num_properties = ARRAY_SIZE(lc824206xa_psy_props), .num_properties = ARRAY_SIZE(lc824206xa_psy_props),
.get_property = lc824206xa_psy_get_prop, .get_property = lc824206xa_psy_get_prop,