diff options
author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2015-09-04 09:12:30 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2015-09-30 02:51:27 -0400 |
commit | aff1e0cee36ab679552846a18d15dcb6d2e3fc4c (patch) | |
tree | 701c6f1980561c8cb7e701f43f64ecc07bb879db | |
parent | ddfe4d0cce7828d79f3e3762c664342658c3f254 (diff) |
dmaengine: acpi: Use ACPI_COMPANION() instead of acpi_bus_get_device()
Get pointer to the struct acpi_device by using ACPI_COMPANION() macro. This
is more efficient than using ACPI_HANDLE() and acpi_bus_get_device().
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r-- | drivers/dma/acpi-dma.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/dma/acpi-dma.c b/drivers/dma/acpi-dma.c index 5a635646e05c..04257432c482 100644 --- a/drivers/dma/acpi-dma.c +++ b/drivers/dma/acpi-dma.c | |||
@@ -160,10 +160,8 @@ int acpi_dma_controller_register(struct device *dev, | |||
160 | return -EINVAL; | 160 | return -EINVAL; |
161 | 161 | ||
162 | /* Check if the device was enumerated by ACPI */ | 162 | /* Check if the device was enumerated by ACPI */ |
163 | if (!ACPI_HANDLE(dev)) | 163 | adev = ACPI_COMPANION(dev); |
164 | return -EINVAL; | 164 | if (!adev) |
165 | |||
166 | if (acpi_bus_get_device(ACPI_HANDLE(dev), &adev)) | ||
167 | return -EINVAL; | 165 | return -EINVAL; |
168 | 166 | ||
169 | adma = kzalloc(sizeof(*adma), GFP_KERNEL); | 167 | adma = kzalloc(sizeof(*adma), GFP_KERNEL); |
@@ -358,10 +356,11 @@ struct dma_chan *acpi_dma_request_slave_chan_by_index(struct device *dev, | |||
358 | int found; | 356 | int found; |
359 | 357 | ||
360 | /* Check if the device was enumerated by ACPI */ | 358 | /* Check if the device was enumerated by ACPI */ |
361 | if (!dev || !ACPI_HANDLE(dev)) | 359 | if (!dev) |
362 | return ERR_PTR(-ENODEV); | 360 | return ERR_PTR(-ENODEV); |
363 | 361 | ||
364 | if (acpi_bus_get_device(ACPI_HANDLE(dev), &adev)) | 362 | adev = ACPI_COMPANION(dev); |
363 | if (!adev) | ||
365 | return ERR_PTR(-ENODEV); | 364 | return ERR_PTR(-ENODEV); |
366 | 365 | ||
367 | memset(&pdata, 0, sizeof(pdata)); | 366 | memset(&pdata, 0, sizeof(pdata)); |