From c4e197bbcecc7233aa9e553e7047fa50e4e1fe77 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 25 Jun 2018 15:52:34 +0200 Subject: [PATCH 33/33] spi: ath79: drop pdata support The target is being converted to pure OF. We can therefore drop all of the platform data code from the driver. Cc: linux-spi@vger.kernel.org Acked-by: Mark Brown Signed-off-by: John Crispin --- arch/mips/include/asm/mach-ath79/ath79_spi_platform.h | 19 ------------------- drivers/spi/spi-ath79.c | 8 -------- 2 files changed, 27 deletions(-) delete mode 100644 arch/mips/include/asm/mach-ath79/ath79_spi_platform.h --- a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Platform data definition for Atheros AR71XX/AR724X/AR913X SPI controller - * - * Copyright (C) 2008-2010 Gabor Juhos - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. - */ - -#ifndef _ATH79_SPI_PLATFORM_H -#define _ATH79_SPI_PLATFORM_H - -struct ath79_spi_platform_data { - unsigned bus_num; - unsigned num_chipselect; -}; - -#endif /* _ATH79_SPI_PLATFORM_H */ --- a/drivers/spi/spi-ath79.c +++ b/drivers/spi/spi-ath79.c @@ -26,7 +26,6 @@ #include #include -#include #define DRV_NAME "ath79-spi" @@ -208,7 +207,6 @@ static int ath79_spi_probe(struct platfo { struct spi_master *master; struct ath79_spi *sp; - struct ath79_spi_platform_data *pdata; struct resource *r; unsigned long rate; int ret; @@ -223,15 +221,9 @@ static int ath79_spi_probe(struct platfo master->dev.of_node = pdev->dev.of_node; platform_set_drvdata(pdev, sp); - pdata = dev_get_platdata(&pdev->dev); - master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32); master->setup = ath79_spi_setup; master->cleanup = ath79_spi_cleanup; - if (pdata) { - master->bus_num = pdata->bus_num; - master->num_chipselect = pdata->num_chipselect; - } sp->bitbang.master = master; sp->bitbang.chipselect = ath79_spi_chipselect;