From b0d00f8bd526dab6878913dfd5690eee5d4be10e Mon Sep 17 00:00:00 2001 From: Heikki Krogerus Date: Tue, 2 Sep 2014 10:55:08 +0300 Subject: [PATCH] ACPI / LPSS: drop clkdev_name member from lpss_device_desc 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 Acked-by: Andy Shevchenko Acked-by: Mika Westerberg Signed-off-by: Rafael J. Wysocki --- drivers/acpi/acpi_lpss.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c index 4723a0e8335a..db3498bc4c2a 100644 --- a/drivers/acpi/acpi_lpss.c +++ b/drivers/acpi/acpi_lpss.c @@ -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)