]> git.karo-electronics.de Git - linux-beck.git/commitdiff
dmaengine: acpi: Use ACPI_COMPANION() instead of acpi_bus_get_device()
authorJarkko Nikula <jarkko.nikula@linux.intel.com>
Fri, 4 Sep 2015 13:12:30 +0000 (16:12 +0300)
committerVinod Koul <vinod.koul@intel.com>
Wed, 30 Sep 2015 06:51:27 +0000 (12:21 +0530)
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>
drivers/dma/acpi-dma.c

index 5a635646e05cfe87a9f92083c5864827c669ccee..04257432c482c7b2d0bd6bdadefaff0d1323050d 100644 (file)
@@ -160,10 +160,8 @@ int acpi_dma_controller_register(struct device *dev,
                return -EINVAL;
 
        /* Check if the device was enumerated by ACPI */
-       if (!ACPI_HANDLE(dev))
-               return -EINVAL;
-
-       if (acpi_bus_get_device(ACPI_HANDLE(dev), &adev))
+       adev = ACPI_COMPANION(dev);
+       if (!adev)
                return -EINVAL;
 
        adma = kzalloc(sizeof(*adma), GFP_KERNEL);
@@ -358,10 +356,11 @@ struct dma_chan *acpi_dma_request_slave_chan_by_index(struct device *dev,
        int found;
 
        /* Check if the device was enumerated by ACPI */
-       if (!dev || !ACPI_HANDLE(dev))
+       if (!dev)
                return ERR_PTR(-ENODEV);
 
-       if (acpi_bus_get_device(ACPI_HANDLE(dev), &adev))
+       adev = ACPI_COMPANION(dev);
+       if (!adev)
                return ERR_PTR(-ENODEV);
 
        memset(&pdata, 0, sizeof(pdata));