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;