Browse Source

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 <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>
Heikki Krogerus 11 years ago
parent
commit
b0d00f8bd5
1 changed files with 1 additions and 8 deletions
  1. 1 8
      drivers/acpi/acpi_lpss.c

+ 1 - 8
drivers/acpi/acpi_lpss.c

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