1 From d2943c4ee1c52cb2c9802be194ca90442e4fe34f Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Tue, 16 Feb 2016 08:47:56 +0000
4 Subject: [PATCH 153/170] Revert "Add blk_pos parameter to mmc multi_io_quirk
7 This reverts commit aab95f9b10e8c3d32de2bf163b86f220c88214fe.
9 The bcm2835-sdhost driver no longer needs this patch.
11 drivers/mmc/card/block.c | 1 -
12 drivers/mmc/host/omap_hsmmc.c | 4 +---
13 drivers/mmc/host/sh_mobile_sdhi.c | 4 +---
14 drivers/mmc/host/tmio_mmc_pio.c | 4 +---
15 include/linux/mmc/host.h | 4 +---
16 5 files changed, 4 insertions(+), 13 deletions(-)
18 --- a/drivers/mmc/card/block.c
19 +++ b/drivers/mmc/card/block.c
20 @@ -1518,7 +1518,6 @@ static void mmc_blk_rw_rq_prep(struct mm
21 brq->data.blocks = card->host->ops->multi_io_quirk(card,
22 (rq_data_dir(req) == READ) ?
23 MMC_DATA_READ : MMC_DATA_WRITE,
28 --- a/drivers/mmc/host/omap_hsmmc.c
29 +++ b/drivers/mmc/host/omap_hsmmc.c
30 @@ -1832,9 +1832,7 @@ static void omap_hsmmc_conf_bus_power(st
33 static int omap_hsmmc_multi_io_quirk(struct mmc_card *card,
34 - unsigned int direction,
37 + unsigned int direction, int blk_size)
39 /* This controller can't do multiblock reads due to hw bugs */
40 if (direction == MMC_DATA_READ)
41 --- a/drivers/mmc/host/sh_mobile_sdhi.c
42 +++ b/drivers/mmc/host/sh_mobile_sdhi.c
43 @@ -170,9 +170,7 @@ static int sh_mobile_sdhi_write16_hook(s
46 static int sh_mobile_sdhi_multi_io_quirk(struct mmc_card *card,
47 - unsigned int direction,
50 + unsigned int direction, int blk_size)
53 * In Renesas controllers, when performing a
54 --- a/drivers/mmc/host/tmio_mmc_pio.c
55 +++ b/drivers/mmc/host/tmio_mmc_pio.c
56 @@ -1003,9 +1003,7 @@ static int tmio_mmc_get_ro(struct mmc_ho
59 static int tmio_multi_io_quirk(struct mmc_card *card,
60 - unsigned int direction,
63 + unsigned int direction, int blk_size)
65 struct tmio_mmc_host *host = mmc_priv(card->host);
67 --- a/include/linux/mmc/host.h
68 +++ b/include/linux/mmc/host.h
69 @@ -143,9 +143,7 @@ struct mmc_host_ops {
70 * I/O. Returns the number of supported blocks for the request.
72 int (*multi_io_quirk)(struct mmc_card *card,
73 - unsigned int direction,
76 + unsigned int direction, int blk_size);