greybus: interface: Rename *_NO_PM as *_NO_BUNDLE_ACTIVATE

Its a special quirk just for the bootrom as it doesn't have any PM
operations implemented. As the greybus bootrom bundle driver doesn't try
to do any PM stuff, this quirk is used only to skip bundle activate
operation currently.

Rename the GB_INTERFACE_QUIRK_NO_PM quirk to
GB_INTERFACE_QUIRK_NO_BUNDLE_ACTIVATE to suit its purpose better as the
GB_INTERFACE_QUIRK_NO_PM will be used for other quirk now.

Reviewed-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/control.c b/drivers/staging/greybus/control.c
index d7fd378026ec8dc4d6d88e78a95cf774ebff4be7..34493d5726847c7c3cacbb6ae002aaf7b985428d 100644 (file)
--- a/drivers/staging/greybus/control.c
+++ b/drivers/staging/greybus/control.c
@@ -534,7 +534,7 @@ int gb_control_enable(struct gb_control *control)
                control->has_bundle_version = true;
 
        /* FIXME: use protocol version instead */
-       if (!(control->intf->quirks & GB_INTERFACE_QUIRK_NO_PM))
+       if (!(control->intf->quirks & GB_INTERFACE_QUIRK_NO_BUNDLE_ACTIVATE))
                control->has_bundle_activate = true;
 
        return 0;

diff --git a/drivers/staging/greybus/interface.c b/drivers/staging/greybus/interface.c
index 74fa298f5fe7978c7258d8906479df6aac063c48..c20077acd0d58874966ff780fbb7c7208b58db06 100644 (file)
--- a/drivers/staging/greybus/interface.c
+++ b/drivers/staging/greybus/interface.c
@@ -412,7 +412,7 @@ static int gb_interface_read_and_clear_init_status(struct gb_interface *intf)
        bootrom_quirks = GB_INTERFACE_QUIRK_NO_CPORT_FEATURES |
                                GB_INTERFACE_QUIRK_FORCED_DISABLE |
                                GB_INTERFACE_QUIRK_LEGACY_MODE_SWITCH |
-                               GB_INTERFACE_QUIRK_NO_PM;
+                               GB_INTERFACE_QUIRK_NO_BUNDLE_ACTIVATE;
        switch (init_status) {
        case GB_INIT_BOOTROM_UNIPRO_BOOT_STARTED:
        case GB_INIT_BOOTROM_FALLBACK_UNIPRO_BOOT_STARTED:

diff --git a/drivers/staging/greybus/interface.h b/drivers/staging/greybus/interface.h
index a08d104806540d6e6de0b83e20fba9ffec9f2a94..89eecf0a4badf8c9f4722b7251ed2860bc2c2137 100644 (file)
--- a/drivers/staging/greybus/interface.h
+++ b/drivers/staging/greybus/interface.h
@@ -23,7 +23,7 @@ enum gb_interface_type {
 #define GB_INTERFACE_QUIRK_NO_ARA_IDS                  BIT(2)
 #define GB_INTERFACE_QUIRK_FORCED_DISABLE              BIT(3)
 #define GB_INTERFACE_QUIRK_LEGACY_MODE_SWITCH          BIT(4)
-#define GB_INTERFACE_QUIRK_NO_PM                       BIT(5)
+#define GB_INTERFACE_QUIRK_NO_BUNDLE_ACTIVATE          BIT(5)
 
 struct gb_interface {
        struct device dev;