From: Mark Brown <broonie@kernel.org>
Date: Fri, 3 Oct 2014 15:33:42 +0000 (+0100)
Subject: Merge remote-tracking branches 'spi/topic/pl022', 'spi/topic/pxa2xx', 'spi/topic... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bab4d751f70bcecdcaad56dad9785224a5a6f9db;p=openwrt%2Fstaging%2Fblogic.git

Merge remote-tracking branches 'spi/topic/pl022', 'spi/topic/pxa2xx', 'spi/topic/rspi', 'spi/topic/sh-msiof' and 'spi/topic/sirf' into spi-next
---

bab4d751f70bcecdcaad56dad9785224a5a6f9db
diff --cc drivers/spi/spi-sirf.c
index 6f0602fd7401,95ac276eaafe,95ac276eaafe,95ac276eaafe,95ac276eaafe,adbabbdfc7f0..39e2c0a55a28
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@@@@@@ -641,19 -638,19 -638,19 -638,19 -638,19 -643,10 +646,10 @@@@@@@ static int spi_sirfsoc_probe(struct pla
      	struct sirfsoc_spi *sspi;
      	struct spi_master *master;
      	struct resource *mem_res;
----- 	int num_cs, cs_gpio, irq;
----- 	int i;
----- 	int ret;
-     
-     	ret = of_property_read_u32(pdev->dev.of_node,
-     			"sirf,spi-num-chipselects", &num_cs);
-     	if (ret < 0) {
-     		dev_err(&pdev->dev, "Unable to get chip select number\n");
-     		goto err_cs;
-     	}
+++++ 	int irq;
+++++ 	int i, ret;
      
 ---- 	ret = of_property_read_u32(pdev->dev.of_node,
 ---- 			"sirf,spi-num-chipselects", &num_cs);
 ---- 	if (ret < 0) {
 ---- 		dev_err(&pdev->dev, "Unable to get chip select number\n");
 ---- 		goto err_cs;
 ---- 	}
 ---- 
----- 	master = spi_alloc_master(&pdev->dev,
----- 			sizeof(*sspi) + sizeof(int) * num_cs);
+++++ 	master = spi_alloc_master(&pdev->dev, sizeof(*sspi));
      	if (!master) {
      		dev_err(&pdev->dev, "Unable to allocate SPI master\n");
      		return -ENOMEM;