Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/init', 'spi/topic/mpc512x...

[linux-2.6-block.git] / drivers / spi / spi-altera.c

diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index 1928b835e870ff97ea4e9c58d4c0bc7134c3d063..5b5709a5c95725276a3942745e9edbf6dc2fb53e 100644 (file)
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -199,7 +199,6 @@ static irqreturn_t altera_spi_irq(int irq, void *dev)
 
 static int altera_spi_probe(struct platform_device *pdev)
 {
-       struct altera_spi_platform_data *platp = dev_get_platdata(&pdev->dev);
        struct altera_spi *hw;
        struct spi_master *master;
        struct resource *res;
@@ -213,6 +212,8 @@ static int altera_spi_probe(struct platform_device *pdev)
        master->bus_num = pdev->id;
        master->num_chipselect = 16;
        master->mode_bits = SPI_CS_HIGH;
+       master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 16);
+       master->dev.of_node = pdev->dev.of_node;
 
        hw = spi_master_get_devdata(master);
        platform_set_drvdata(pdev, hw);
@@ -244,9 +245,6 @@ static int altera_spi_probe(struct platform_device *pdev)
                if (err)
                        goto exit;
        }
-       /* find platform data */
-       if (!platp)
-               hw->bitbang.master->dev.of_node = pdev->dev.of_node;
 
        /* register our spi controller */
        err = spi_bitbang_start(&hw->bitbang);