Merge "Revert "usb: phy: dual-role: update sysfs attrs when changed"" (541439b3) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/usb/phy/class-dual-role.c

+9 −12

Original line number	Diff line number	Diff line
		@@ -70,7 +70,15 @@ static char kstrdupcase(const char str, gfp_t gfp, bool to_upper)
		return ret;
		}

		static void dual_role_changed_work(struct work_struct *work);
		static void dual_role_changed_work(struct work_struct *work)
		{
		struct dual_role_phy_instance *dual_role =
		container_of(work, struct dual_role_phy_instance,
		changed_work);

		dev_dbg(&dual_role->dev, "%s\n", __func__);
		kobject_uevent(&dual_role->dev.kobj, KOBJ_CHANGE);
		}

		void dual_role_instance_changed(struct dual_role_phy_instance *dual_role)
		{
		@@ -497,17 +505,6 @@ int dual_role_uevent(struct device dev, struct kobj_uevent_env env)
		return ret;
		}

		static void dual_role_changed_work(struct work_struct *work)
		{
		struct dual_role_phy_instance *dual_role =
		container_of(work, struct dual_role_phy_instance,
		changed_work);

		dev_dbg(&dual_role->dev, "%s\n", __func__);
		sysfs_update_group(&dual_role->dev.kobj, &dual_role_attr_group);
		kobject_uevent(&dual_role->dev.kobj, KOBJ_CHANGE);
		}

		/***************** Module Init *********************************/

		static int __init dual_role_class_init(void)