summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>2014-09-02 10:55:08 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-03 01:12:41 +0200
commitb0d00f8bd526dab6878913dfd5690eee5d4be10e (patch)
treed617c534e5ee578541d6b15ec0c9e95081b9ef23 /drivers/acpi
parentff8c1af5e7ebfdf2da5d2063ee34e16a8d05643c (diff)
downloadblackbird-op-linux-b0d00f8bd526dab6878913dfd5690eee5d4be10e.tar.gz
blackbird-op-linux-b0d00f8bd526dab6878913dfd5690eee5d4be10e.zip
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>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpi_lpss.c9
1 files changed, 1 insertions, 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)
OpenPOWER on IntegriCloud