]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
platform/x86: intel_mid_thermal: Remove duplicated platform device ID
authorJavier Martinez Canillas <javier@osg.samsung.com>
Mon, 2 Jan 2017 15:20:55 +0000 (12:20 -0300)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 3 Feb 2017 12:04:53 +0000 (14:04 +0200)
Commit 3fca3d3d5075 ("platform-x86: intel_mid_thermal: add msic_thermal
alias") added a "msic_thermal" entry to the driver's platform device ID
table since that was the platform dev name registered in some platforms
and the only dev in the platform table was "msic_sensor" (DRIVER_NAME).

But then commit 634830704d80 ("x86/mid/thermal: Add msic_thermal alias")
changed DRIVER_NAME from "msic_sensor" to "msic_thermal", and so there's
now duplicated entries in the platform device ID table.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drivers/platform/x86/intel_mid_thermal.c

index 0df3c9d375096e77234aba0048fdd59366b12696..05ac7203806d39d569a014639ebfc01b00ca788a 100644 (file)
@@ -549,7 +549,6 @@ static int mid_thermal_remove(struct platform_device *pdev)
 
 static const struct platform_device_id therm_id_table[] = {
        { DRIVER_NAME, 1 },
-       { "msic_thermal", 1 },
        { }
 };