ACPI / LPSS: drop clkdev_name member from lpss_device_desc
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>
Tue, 2 Sep 2014 07:55:08 +0000 (10:55 +0300)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 2 Sep 2014 23:12:41 +0000 (01:12 +0200)
It was used to provide the correct con_id for the dma
driver, but it's not needed. Even if the driver requests a
clock with the con_id, it still gets the correct clock. The
device name is enough to match a single clock.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/acpi_lpss.c

index 4723a0e8335aeb679ea987f07c84424b0ce774e6..db3498bc4c2a2a7e0f4cb0a385a0aa1c45ad6241 100644 (file)
@@ -70,7 +70,6 @@ struct lpss_shared_clock {
 struct lpss_private_data;
 
 struct lpss_device_desc {
-       const char *clkdev_name;
        unsigned int flags;
        unsigned int prv_offset;
        size_t prv_size_override;
@@ -79,7 +78,6 @@ struct lpss_device_desc {
 };
 
 static struct lpss_device_desc lpss_dma_desc = {
-       .clkdev_name = "hclk",
        .flags = LPSS_CLK,
 };
 
@@ -268,12 +266,7 @@ static int register_device_clock(struct acpi_device *adev,
        clk_data = platform_get_drvdata(lpss_clk_dev);
        if (!clk_data)
                return -ENODEV;
-
-       if (dev_desc->clkdev_name) {
-               clk_register_clkdev(clk_data->clk, dev_desc->clkdev_name,
-                                   devname);
-               return 0;
-       }
+       clk = clk_data->clk;
 
        if (!pdata->mmio_base
            || pdata->mmio_size < dev_desc->prv_offset + LPSS_CLK_SIZE)