[PATCH] acpi-dma: Use ACPI_COMPANION() instead of acpi_bus_get_device()

[PATCH] acpi-dma: Use ACPI_COMPANION() instead of acpi_bus_get_device()

[Jarkko Nikula]

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>
---
 drivers/dma/acpi-dma.c | 11 +++++------
 1 file 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,
 		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));
-- 
2.5.1

Re: [PATCH] acpi-dma: Use ACPI_COMPANION() instead of acpi_bus_get_device()

[Rafael J. Wysocki]

On Friday, September 04, 2015 04:12:30 PM Jarkko Nikula wrote:
> 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>

> ---
>  drivers/dma/acpi-dma.c | 11 +++++------
>  1 file 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,
>  		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));
> 

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

Re: [PATCH] acpi-dma: Use ACPI_COMPANION() instead of acpi_bus_get_device()

[Vinod Koul]

On Fri, Sep 04, 2015 at 04:12:30PM +0300, Jarkko Nikula wrote:
> 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().

Applied aftre fixing the right subsystem name. Please ensure you send
patches with right tags


-- 
~Vinod