driver core: Move code to the right part of the file

This commit just moves around code to match the general organization of
the file.

Signed-off-by: Saravana Kannan <saravanak@google.com>
Link: https://lore.kernel.org/r/20200515053500.215929-2-saravanak@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/core.c b/drivers/base/core.c
index c9045521596fef7ec4aab841681d4b4c4d944fb4..2b454aae64b59291b0afb3d5858d1f87dc86177a 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1143,6 +1143,36 @@ static void device_links_purge(struct device *dev)
        device_links_write_unlock();
 }
 
+static u32 fw_devlink_flags = DL_FLAG_SYNC_STATE_ONLY;
+static int __init fw_devlink_setup(char *arg)
+{
+       if (!arg)
+               return -EINVAL;
+
+       if (strcmp(arg, "off") == 0) {
+               fw_devlink_flags = 0;
+       } else if (strcmp(arg, "permissive") == 0) {
+               fw_devlink_flags = DL_FLAG_SYNC_STATE_ONLY;
+       } else if (strcmp(arg, "on") == 0) {
+               fw_devlink_flags = DL_FLAG_AUTOPROBE_CONSUMER;
+       } else if (strcmp(arg, "rpm") == 0) {
+               fw_devlink_flags = DL_FLAG_AUTOPROBE_CONSUMER |
+                                  DL_FLAG_PM_RUNTIME;
+       }
+       return 0;
+}
+early_param("fw_devlink", fw_devlink_setup);
+
+u32 fw_devlink_get_flags(void)
+{
+       return fw_devlink_flags;
+}
+
+static bool fw_devlink_is_permissive(void)
+{
+       return fw_devlink_flags == DL_FLAG_SYNC_STATE_ONLY;
+}
+
 /* Device links support end. */
 
 int (*platform_notify)(struct device *dev) = NULL;
@@ -2345,36 +2375,6 @@ static int device_private_init(struct device *dev)
        return 0;
 }
 
-static u32 fw_devlink_flags = DL_FLAG_SYNC_STATE_ONLY;
-static int __init fw_devlink_setup(char *arg)
-{
-       if (!arg)
-               return -EINVAL;
-
-       if (strcmp(arg, "off") == 0) {
-               fw_devlink_flags = 0;
-       } else if (strcmp(arg, "permissive") == 0) {
-               fw_devlink_flags = DL_FLAG_SYNC_STATE_ONLY;
-       } else if (strcmp(arg, "on") == 0) {
-               fw_devlink_flags = DL_FLAG_AUTOPROBE_CONSUMER;
-       } else if (strcmp(arg, "rpm") == 0) {
-               fw_devlink_flags = DL_FLAG_AUTOPROBE_CONSUMER |
-                                  DL_FLAG_PM_RUNTIME;
-       }
-       return 0;
-}
-early_param("fw_devlink", fw_devlink_setup);
-
-u32 fw_devlink_get_flags(void)
-{
-       return fw_devlink_flags;
-}
-
-static bool fw_devlink_is_permissive(void)
-{
-       return fw_devlink_flags == DL_FLAG_SYNC_STATE_ONLY;
-}
-
 /**
  * device_add - add device to device hierarchy.
  * @dev: device.