Skip to content

Commit 5cc44eb

Browse files
Phil Elwellpopcornmix
Phil Elwell
authored andcommitted
Revert "Add blk_pos parameter to mmc multi_io_quirk callback"
This reverts commit aab95f9. The bcm2835-sdhost driver no longer needs this patch.
1 parent a739de6 commit 5cc44eb

File tree

5 files changed

+4
-13
lines changed

5 files changed

+4
-13
lines changed

drivers/mmc/card/block.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1505,7 +1505,6 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
15051505
brq->data.blocks = card->host->ops->multi_io_quirk(card,
15061506
(rq_data_dir(req) == READ) ?
15071507
MMC_DATA_READ : MMC_DATA_WRITE,
1508-
blk_rq_pos(req),
15091508
brq->data.blocks);
15101509
}
15111510

drivers/mmc/host/omap_hsmmc.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,9 +1832,7 @@ static void omap_hsmmc_conf_bus_power(struct omap_hsmmc_host *host)
18321832
}
18331833

18341834
static int omap_hsmmc_multi_io_quirk(struct mmc_card *card,
1835-
unsigned int direction,
1836-
u32 blk_pos,
1837-
int blk_size)
1835+
unsigned int direction, int blk_size)
18381836
{
18391837
/* This controller can't do multiblock reads due to hw bugs */
18401838
if (direction == MMC_DATA_READ)

drivers/mmc/host/sh_mobile_sdhi.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,7 @@ static int sh_mobile_sdhi_write16_hook(struct tmio_mmc_host *host, int addr)
170170
}
171171

172172
static int sh_mobile_sdhi_multi_io_quirk(struct mmc_card *card,
173-
unsigned int direction,
174-
u32 blk_pos,
175-
int blk_size)
173+
unsigned int direction, int blk_size)
176174
{
177175
/*
178176
* In Renesas controllers, when performing a

drivers/mmc/host/tmio_mmc_pio.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,9 +1003,7 @@ static int tmio_mmc_get_ro(struct mmc_host *mmc)
10031003
}
10041004

10051005
static int tmio_multi_io_quirk(struct mmc_card *card,
1006-
unsigned int direction,
1007-
u32 blk_pos,
1008-
int blk_size)
1006+
unsigned int direction, int blk_size)
10091007
{
10101008
struct tmio_mmc_host *host = mmc_priv(card->host);
10111009

include/linux/mmc/host.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,7 @@ struct mmc_host_ops {
143143
* I/O. Returns the number of supported blocks for the request.
144144
*/
145145
int (*multi_io_quirk)(struct mmc_card *card,
146-
unsigned int direction,
147-
u32 blk_pos,
148-
int blk_size);
146+
unsigned int direction, int blk_size);
149147
};
150148

151149
struct mmc_card;

0 commit comments

Comments
 (0)