@@ -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;
@@ -214,6 +213,7 @@ static int altera_spi_probe(struct platform_device *pdev)
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);
@@ -245,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);
The definition of struct altera_spi_platform_data does not exist in current tree. So remove the code to get platform_data which is never used. Signed-off-by: Axel Lin <axel.lin@ingics.com> --- I just google it and found: There is a include/linux/spi/spi_altera.h in [PATCH v2] spi: New driver for Altera SPI. https://lkml.org/lkml/2011/1/17/16 And it got removed in [PATCH v3] spi: New driver for Altera SPI. https://lkml.org/lkml/2011/1/17/25 (It's based on Grant's comment to remove it: https://lkml.org/lkml/2011/1/17/20) drivers/spi/spi-altera.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)