driver core: Move code to the right part of the file (42926ac3) · Commits · 戴 / test

drivers/base/core.c

+30 −30

Original line number	Diff line number	Diff line
		@@ -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.

Admin message