[PATCH RFC RESEND 5/8] ACPI: video: Stop creating "device" sysfs link

[Armin Wolf]

The thermal core will soon automatically create sysfs links between
the cooling device and its parent device. Stop manually creating
the "device" sysfs link between the cooling device and the parent
device to avoid a name collision. The "thermal_cooling" sysfs link
however stays for backwards compatibility, as it does not suffer
from a name collision.

Signed-off-by: Armin Wolf <W_Armin at gmx.de>
---
 drivers/acpi/acpi_video.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index be8e7e18abca..658e11745523 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -1774,16 +1774,12 @@ static void acpi_video_dev_register_backlight(struct acpi_video_device *device)
 
 	dev_info(&device->dev->dev, "registered as cooling_device%d\n",
 		 device->cooling_dev->id);
+	/* For backwards compatibility */
 	result = sysfs_create_link(&device->dev->dev.kobj,
 			&device->cooling_dev->device.kobj,
 			"thermal_cooling");
 	if (result)
 		pr_info("sysfs link creation failed\n");
-
-	result = sysfs_create_link(&device->cooling_dev->device.kobj,
-			&device->dev->dev.kobj, "device");
-	if (result)
-		pr_info("Reverse sysfs link creation failed\n");
 }
 
 static void acpi_video_run_bcl_for_osi(struct acpi_video_bus *video)
@@ -1852,7 +1848,6 @@ static void acpi_video_dev_unregister_backlight(struct acpi_video_device *device
 	}
 	if (device->cooling_dev) {
 		sysfs_remove_link(&device->dev->dev.kobj, "thermal_cooling");
-		sysfs_remove_link(&device->cooling_dev->device.kobj, "device");
 		thermal_cooling_device_unregister(device->cooling_dev);
 		device->cooling_dev = NULL;
 	}

-- 
2.39.5