We always pass 8 for the number of chip selects, so we can as well
hardcode it to this number.
Signed-off-by: Jonas Gorski <jogo@xxxxxxxxxxx>
---
v1 -> v2
* remove the platform_data member as well.
arch/mips/bcm63xx/dev-spi.c | 1 -
arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 1 -
drivers/spi/spi-bcm63xx.c | 4 +++-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/mips/bcm63xx/dev-spi.c b/arch/mips/bcm63xx/dev-spi.c
index ad448e4..438df08 100644
--- a/arch/mips/bcm63xx/dev-spi.c
+++ b/arch/mips/bcm63xx/dev-spi.c
@@ -55,7 +55,6 @@ static struct resource spi_resources[] = {
static struct bcm63xx_spi_pdata spi_pdata = {
.bus_num = 0,
- .num_chipselect = 8,
};
static struct platform_device bcm63xx_spi_device = {
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
index 2573765..40dab9d 100644
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
@@ -12,7 +12,6 @@ struct bcm63xx_spi_pdata {
unsigned int msg_type_shift;
unsigned int msg_ctl_width;
int bus_num;
- int num_chipselect;
};
enum bcm63xx_regs_spi {
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index 2b908db..a997c64 100644
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -31,6 +31,8 @@
#define BCM63XX_SPI_MAX_PREPEND 15
+#define BCM63XX_SPI_MAX_CS 8
+
struct bcm63xx_spi {
struct completion done;
@@ -368,7 +370,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
}
master->bus_num = pdata->bus_num;
- master->num_chipselect = pdata->num_chipselect;
+ master->num_chipselect = BCM63XX_SPI_MAX_CS;
master->transfer_one_message = bcm63xx_spi_transfer_one;
master->mode_bits = MODEBITS;
master->bits_per_word_mask = SPI_BPW_MASK(8);
--
2.1.4
