extcon: lc824206xa: Fix build error of POWER_SUPPLY_PROP_USB_TYPE
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Sep 2024 15:54:21 +0000 (00:54 +0900)
committerChanwoo Choi <cw00.choi@samsung.com>
Wed, 4 Sep 2024 16:44:51 +0000 (01:44 +0900)
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>
drivers/extcon/extcon-lc824206xa.c

index d58a2c369018838d2234f2f9c7f44dd972879ee4..56938748aea83b3052e66b60fbb316d3b392d774 100644 (file)
@@ -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,