target/linux/ath79/patches-4.19/0033-spi-ath79-drop-pdata-support.patch

   1 From c4e197bbcecc7233aa9e553e7047fa50e4e1fe77 Mon Sep 17 00:00:00 2001
   2 From: John Crispin <john@phrozen.org>
   3 Date: Mon, 25 Jun 2018 15:52:34 +0200
   4 Subject: [PATCH 33/33] spi: ath79: drop pdata support
   5
   6 The target is being converted to pure OF. We can therefore drop all of the
   7 platform data code from the driver.
   8
   9 Cc: linux-spi@vger.kernel.org
  10 Acked-by: Mark Brown <broonie@kernel.org>
  11 Signed-off-by: John Crispin <john@phrozen.org>
  12 ---
  13  arch/mips/include/asm/mach-ath79/ath79_spi_platform.h | 19 -------------------
  14  drivers/spi/spi-ath79.c                               |  8 --------
  15  2 files changed, 27 deletions(-)
  16  delete mode 100644 arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
  17
  18 --- a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
  19 +++ /dev/null
  20 @@ -1,19 +0,0 @@
  21 -/*
  22 - *  Platform data definition for Atheros AR71XX/AR724X/AR913X SPI controller
  23 - *
  24 - *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
  25 - *
  26 - *  This program is free software; you can redistribute it and/or modify it
  27 - *  under the terms of the GNU General Public License version 2 as published
  28 - *  by the Free Software Foundation.
  29 - */
  30 -
  31 -#ifndef _ATH79_SPI_PLATFORM_H
  32 -#define _ATH79_SPI_PLATFORM_H
  33 -
  34 -struct ath79_spi_platform_data {
  35 -       unsigned        bus_num;
  36 -       unsigned        num_chipselect;
  37 -};
  38 -
  39 -#endif /* _ATH79_SPI_PLATFORM_H */
  40 --- a/drivers/spi/spi-ath79.c
  41 +++ b/drivers/spi/spi-ath79.c
  42 @@ -26,7 +26,6 @@
  43  #include <linux/err.h>
  44
  45  #include <asm/mach-ath79/ar71xx_regs.h>
  46 -#include <asm/mach-ath79/ath79_spi_platform.h>
  47
  48  #define DRV_NAME       "ath79-spi"
  49
  50 @@ -208,7 +207,6 @@ static int ath79_spi_probe(struct platfo
  51  {
  52         struct spi_master *master;
  53         struct ath79_spi *sp;
  54 -       struct ath79_spi_platform_data *pdata;
  55         struct resource *r;
  56         unsigned long rate;
  57         int ret;
  58 @@ -223,15 +221,9 @@ static int ath79_spi_probe(struct platfo
  59         master->dev.of_node = pdev->dev.of_node;
  60         platform_set_drvdata(pdev, sp);
  61
  62 -       pdata = dev_get_platdata(&pdev->dev);
  63 -
  64         master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);
  65         master->setup = ath79_spi_setup;
  66         master->cleanup = ath79_spi_cleanup;
  67 -       if (pdata) {
  68 -               master->bus_num = pdata->bus_num;
  69 -               master->num_chipselect = pdata->num_chipselect;
  70 -       }
  71
  72         sp->bitbang.master = master;
  73         sp->bitbang.chipselect = ath79_spi_chipselect;