From 2e01ac83c1c7166e58043ff2bdb0dc7dbfcfd11a Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Thu, 5 Sep 2024 00:54:21 +0900 Subject: [PATCH] extcon: lc824206xa: Fix build error of POWER_SUPPLY_PROP_USB_TYPE 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 Signed-off-by: Stephen Rothwell Signed-off-by: Chanwoo Choi --- 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,