Skip to content

Commit ad4dfcd

Browse files
author
Phil Elwell
committed
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 7676c4c commit ad4dfcd

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
@@ -1425,7 +1425,6 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
14251425
brq->data.blocks = card->host->ops->multi_io_quirk(card,
14261426
(rq_data_dir(req) == READ) ?
14271427
MMC_DATA_READ : MMC_DATA_WRITE,
1428-
blk_rq_pos(req),
14291428
brq->data.blocks);
14301429
}
14311430

drivers/mmc/host/omap_hsmmc.c

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

17311731
static int omap_hsmmc_multi_io_quirk(struct mmc_card *card,
1732-
unsigned int direction,
1733-
u32 blk_pos,
1734-
int blk_size)
1732+
unsigned int direction, int blk_size)
17351733
{
17361734
/* This controller can't do multiblock reads due to hw bugs */
17371735
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
@@ -1001,9 +1001,7 @@ static int tmio_mmc_get_ro(struct mmc_host *mmc)
10011001
}
10021002

10031003
static int tmio_multi_io_quirk(struct mmc_card *card,
1004-
unsigned int direction,
1005-
u32 blk_pos,
1006-
int blk_size)
1004+
unsigned int direction, int blk_size)
10071005
{
10081006
struct tmio_mmc_host *host = mmc_priv(card->host);
10091007

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)