[PATCH 1/2] dma: imx-sdma: Let the driver be probed even if no firware is found

[PATCH 1/2] dma: imx-sdma: Let the driver be probed even if no firware is found

[Fabio Estevam]

On the device tree case the code bails out when the firmware name cannot be found
or if the firmware fails to be requested.

Fix this behaviour as the SDMA engine can still operate with the built-in
ROM scripts.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/dma/imx-sdma.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index bf736ad..130b994 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1397,15 +1397,12 @@ static int __init sdma_probe(struct platform_device *pdev)
 		 */
 		ret = of_property_read_string(np, "fsl,sdma-ram-script-name",
 					      &fw_name);
-		if (ret) {
+		if (ret)
 			dev_err(&pdev->dev, "failed to get firmware name\n");
-			goto err_init;
-		}
-
-		ret = sdma_get_firmware(sdma, fw_name);
-		if (ret) {
-			dev_err(&pdev->dev, "failed to get firmware\n");
-			goto err_init;
+		else {
+			ret = sdma_get_firmware(sdma, fw_name);
+			if (ret)
+				dev_err(&pdev->dev, "failed to get firmware\n");
 		}
 	}
 
-- 
1.7.1

[PATCH 2/2] dma: imx-sdma: Print a message when firmare fails to be requested

[Fabio Estevam]

Print a message when firmare fails to be requested in the case of platform data being used.

While at it, distinguish between the error messages of the device tree and platform data cases.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/dma/imx-sdma.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 130b994..f0bfc0e 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1388,7 +1388,9 @@ static int __init sdma_probe(struct platform_device *pdev)
 		sdma_add_scripts(sdma, pdata->script_addrs);
 
 	if (pdata) {
-		sdma_get_firmware(sdma, pdata->fw_name);
+		ret = sdma_get_firmware(sdma, pdata->fw_name);
+		if (ret)
+			dev_err(&pdev->dev, "failed to get firmware from platform data\n");
 	} else {
 		/*
 		 * Because that device tree does not encode ROM script address,
@@ -1402,7 +1404,7 @@ static int __init sdma_probe(struct platform_device *pdev)
 		else {
 			ret = sdma_get_firmware(sdma, fw_name);
 			if (ret)
-				dev_err(&pdev->dev, "failed to get firmware\n");
+				dev_err(&pdev->dev, "failed to get firmware from device tree\n");
 		}
 	}
 
-- 
1.7.1

Re: [PATCH 1/2] dma: imx-sdma: Let the driver be probed even if no firware is found

[Sascha Hauer]

On Wed, Feb 29, 2012 at 11:20:37AM -0300, Fabio Estevam wrote:
> On the device tree case the code bails out when the firmware name cannot be found
> or if the firmware fails to be requested.
> 
> Fix this behaviour as the SDMA engine can still operate with the built-in
> ROM scripts.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Both patches:

Acked-by: Sascha Hauer <s.hauer@pengutronix.de>


> ---
>  drivers/dma/imx-sdma.c |   13 +++++--------
>  1 files changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index bf736ad..130b994 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -1397,15 +1397,12 @@ static int __init sdma_probe(struct platform_device *pdev)
>  		 */
>  		ret = of_property_read_string(np, "fsl,sdma-ram-script-name",
>  					      &fw_name);
> -		if (ret) {
> +		if (ret)
>  			dev_err(&pdev->dev, "failed to get firmware name\n");
> -			goto err_init;
> -		}
> -
> -		ret = sdma_get_firmware(sdma, fw_name);
> -		if (ret) {
> -			dev_err(&pdev->dev, "failed to get firmware\n");
> -			goto err_init;
> +		else {
> +			ret = sdma_get_firmware(sdma, fw_name);
> +			if (ret)
> +				dev_err(&pdev->dev, "failed to get firmware\n");
>  		}
>  	}
>  
> -- 
> 1.7.1
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH 1/2] dma: imx-sdma: Let the driver be probed even if no firware is found

[Vinod Koul]

On Wed, 2012-02-29 at 11:20 -0300, Fabio Estevam wrote:
> On the device tree case the code bails out when the firmware name cannot be found
> or if the firmware fails to be requested.
> 
> Fix this behaviour as the SDMA engine can still operate with the built-in
> ROM scripts.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Both Applied, Thanks
> ---
>  drivers/dma/imx-sdma.c |   13 +++++--------
>  1 files changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index bf736ad..130b994 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -1397,15 +1397,12 @@ static int __init sdma_probe(struct platform_device *pdev)
>  		 */
>  		ret = of_property_read_string(np, "fsl,sdma-ram-script-name",
>  					      &fw_name);
> -		if (ret) {
> +		if (ret)
>  			dev_err(&pdev->dev, "failed to get firmware name\n");
> -			goto err_init;
> -		}
> -
> -		ret = sdma_get_firmware(sdma, fw_name);
> -		if (ret) {
> -			dev_err(&pdev->dev, "failed to get firmware\n");
> -			goto err_init;
> +		else {
> +			ret = sdma_get_firmware(sdma, fw_name);
> +			if (ret)
> +				dev_err(&pdev->dev, "failed to get firmware\n");
>  		}
>  	}
>  


-- 
~Vinod