thermal: netlink: Improve the initcall ordering (d2a89b52) · Commits · 戴 / test

drivers/thermal/thermal_core.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1640,6 +1640,10 @@ static int __init thermal_init(void)
		{
		int result;

		result = thermal_netlink_init();
		if (result)
		goto error;

		mutex_init(&poweroff_lock);
		result = thermal_register_governors();
		if (result)

+1 −2

Original line number	Diff line number	Diff line
		@@ -641,8 +641,7 @@ static struct genl_family thermal_gnl_family __ro_after_init = {
		.n_mcgrps = ARRAY_SIZE(thermal_genl_mcgrps),
		};

		static int __init thermal_netlink_init(void)
		int __init thermal_netlink_init(void)
		{
		return genl_register_family(&thermal_gnl_family);
		}
		core_initcall(thermal_netlink_init);

+6 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@

		/* Netlink notification function */
		#ifdef CONFIG_THERMAL_NETLINK
		int __init thermal_netlink_init(void);
		int thermal_notify_tz_create(int tz_id, const char *name);
		int thermal_notify_tz_delete(int tz_id);
		int thermal_notify_tz_enable(int tz_id);
		@@ -23,6 +24,11 @@ int thermal_notify_cdev_delete(int cdev_id);
		int thermal_notify_tz_gov_change(int tz_id, const char *name);
		int thermal_genl_sampling_temp(int id, int temp);
		#else
		static inline int thermal_netlink_init(void)
		{
		return 0;
		}

		static inline int thermal_notify_tz_create(int tz_id, const char *name)
		{
		return 0;