1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index d47d3636227f..59ae3ed16658 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -1407,9 +1407,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;
 
@@ -1422,7 +1422,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;
         }
@@ -1458,7 +1458,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;
         }