public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] pxa2xx_spi.c: remove redundant initialization, spelling fix, more verbose error
@ 2008-06-04 14:47 Guennadi Liakhovetski
  2008-06-04 19:32 ` David Brownell
  0 siblings, 1 reply; 2+ messages in thread
From: Guennadi Liakhovetski @ 2008-06-04 14:47 UTC (permalink / raw)
  To: dbrownell; +Cc: linux-kernel, spi-devel-general

Minor fixes: remove redundant local variable initialization, fix "can not" to
what I _think_ is a preferred spelling, output IRQ number if requesting it
failed.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>

---

Nothing urgent, just, please, queue it for 2.6.27. Thanks

diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 0c452c4..4cf72e9 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -1342,9 +1342,9 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	struct pxa2xx_spi_master *platform_info;
 	struct spi_master *master;
-	struct driver_data *drv_data = NULL;
+	struct driver_data *drv_data;
 	struct ssp_device *ssp;
-	int status = 0;
+	int status;
 
 	platform_info = dev->platform_data;
 
@@ -1357,7 +1357,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
 	/* Allocate master with space for drv_data and null dma buffer */
 	master = spi_alloc_master(dev, sizeof(struct driver_data) + 16);
 	if (!master) {
-		dev_err(&pdev->dev, "can not alloc spi_master\n");
+		dev_err(&pdev->dev, "cannot alloc spi_master\n");
 		ssp_free(ssp);
 		return -ENOMEM;
 	}
@@ -1393,7 +1393,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
 
 	status = request_irq(ssp->irq, ssp_int, 0, dev->bus_id, drv_data);
 	if (status < 0) {
-		dev_err(&pdev->dev, "can not get IRQ\n");
+		dev_err(&pdev->dev, "cannot get IRQ %d\n", ssp->irq);
 		goto out_error_master_alloc;
 	}
 

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] pxa2xx_spi.c: remove redundant initialization, spelling fix, more verbose error
  2008-06-04 14:47 [PATCH] pxa2xx_spi.c: remove redundant initialization, spelling fix, more verbose error Guennadi Liakhovetski
@ 2008-06-04 19:32 ` David Brownell
  0 siblings, 0 replies; 2+ messages in thread
From: David Brownell @ 2008-06-04 19:32 UTC (permalink / raw)
  To: Guennadi Liakhovetski; +Cc: linux-kernel, spi-devel-general

On Wednesday 04 June 2008, Guennadi Liakhovetski wrote:
> Minor fixes: remove redundant local variable initialization, fix "can not" to
> what I _think_ is a preferred spelling, output IRQ number if requesting it
> failed.
> 
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>

Acked-by: David Brownell <dbrownell@users.sourceforge.net>

> 
> ---
> 
> Nothing urgent, just, please, queue it for 2.6.27. Thanks
> 
> diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
> index 0c452c4..4cf72e9 100644
> --- a/drivers/spi/pxa2xx_spi.c
> +++ b/drivers/spi/pxa2xx_spi.c
> @@ -1342,9 +1342,9 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
>  	struct device *dev = &pdev->dev;
>  	struct pxa2xx_spi_master *platform_info;
>  	struct spi_master *master;
> -	struct driver_data *drv_data = NULL;
> +	struct driver_data *drv_data;
>  	struct ssp_device *ssp;
> -	int status = 0;
> +	int status;
>  
>  	platform_info = dev->platform_data;
>  
> @@ -1357,7 +1357,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
>  	/* Allocate master with space for drv_data and null dma buffer */
>  	master = spi_alloc_master(dev, sizeof(struct driver_data) + 16);
>  	if (!master) {
> -		dev_err(&pdev->dev, "can not alloc spi_master\n");
> +		dev_err(&pdev->dev, "cannot alloc spi_master\n");
>  		ssp_free(ssp);
>  		return -ENOMEM;
>  	}
> @@ -1393,7 +1393,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
>  
>  	status = request_irq(ssp->irq, ssp_int, 0, dev->bus_id, drv_data);
>  	if (status < 0) {
> -		dev_err(&pdev->dev, "can not get IRQ\n");
> +		dev_err(&pdev->dev, "cannot get IRQ %d\n", ssp->irq);
>  		goto out_error_master_alloc;
>  	}
>  
> 



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-06-04 19:52 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-04 14:47 [PATCH] pxa2xx_spi.c: remove redundant initialization, spelling fix, more verbose error Guennadi Liakhovetski
2008-06-04 19:32 ` David Brownell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox