summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-altera.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 13:48:44 +0100
committerMark Brown <broonie@linaro.org>2013-09-01 13:48:44 +0100
commitb29bc3df37afa440290f4b8e50cf5dce429ce22f (patch)
tree2ba216f8d2e3157c535a3535d821133f977e7067 /drivers/spi/spi-altera.c
parentc3dbe2b76a835fb4b2633645b0c49359b49eb128 (diff)
parent2e29db400c4898ff72e2ea87d262921df00f1c87 (diff)
downloadlinux-b29bc3df37afa440290f4b8e50cf5dce429ce22f.tar.bz2
Merge remote-tracking branch 'spi/topic/bitbang' into spi-next
Diffstat (limited to 'drivers/spi/spi-altera.c')
-rw-r--r--drivers/spi/spi-altera.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index 523f2f649e26..156eb888655e 100644
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -103,16 +103,6 @@ static void altera_spi_chipsel(struct spi_device *spi, int value)
}
}
-static int altera_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t)
-{
- return 0;
-}
-
-static int altera_spi_setup(struct spi_device *spi)
-{
- return 0;
-}
-
static inline unsigned int hw_txbyte(struct altera_spi *hw, int count)
{
if (hw->tx) {
@@ -224,7 +214,6 @@ 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->setup = altera_spi_setup;
hw = spi_master_get_devdata(master);
platform_set_drvdata(pdev, hw);
@@ -233,7 +222,6 @@ static int altera_spi_probe(struct platform_device *pdev)
hw->bitbang.master = spi_master_get(master);
if (!hw->bitbang.master)
return err;
- hw->bitbang.setup_transfer = altera_spi_setupxfer;
hw->bitbang.chipselect = altera_spi_chipsel;
hw->bitbang.txrx_bufs = altera_spi_txrx;