in spi-for-next Remove the implementation of handle_err, the function of which was introduced to spi-for-next with patch b716c4ff Signed-off-by: Martin Sperl <kernel@xxxxxxxxxxxxxxxx> Tested-by: Martin Sperl <kernel@xxxxxxxxxxxxxxxx> --- drivers/spi/spi-bcm2835.c | 7 ------- 1 file changed, 7 deletions(-) Applies against spi - topic/bcm2835 diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c index 0dbe544..552a633 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -216,12 +216,6 @@ static int bcm2835_spi_transfer_one(struct spi_master *master, return 1; } -static void bcm2835_spi_handle_err(struct spi_master *master, - struct spi_message *msg) -{ - bcm2835_spi_reset_hw(master); -} - static void bcm2835_spi_set_cs(struct spi_device *spi, bool gpio_level) { /* @@ -315,7 +309,6 @@ static int bcm2835_spi_probe(struct platform_device *pdev) master->setup = bcm2835_spi_setup; master->set_cs = bcm2835_spi_set_cs; master->transfer_one = bcm2835_spi_transfer_one; - master->handle_err = bcm2835_spi_handle_err; master->dev.of_node = pdev->dev.of_node; bs = spi_master_get_devdata(master); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html