mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 01:49:46 +00:00
Revert "Add blk_pos parameter to mmc multi_io_quirk callback"
This reverts commit aab95f9b10.
The bcm2835-sdhost driver no longer needs this patch.
This commit is contained in:
@@ -1415,7 +1415,6 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
|
||||
brq->data.blocks = card->host->ops->multi_io_quirk(card,
|
||||
(rq_data_dir(req) == READ) ?
|
||||
MMC_DATA_READ : MMC_DATA_WRITE,
|
||||
blk_rq_pos(req),
|
||||
brq->data.blocks);
|
||||
}
|
||||
|
||||
|
||||
@@ -1749,9 +1749,7 @@ static void omap_hsmmc_conf_bus_power(struct omap_hsmmc_host *host)
|
||||
}
|
||||
|
||||
static int omap_hsmmc_multi_io_quirk(struct mmc_card *card,
|
||||
unsigned int direction,
|
||||
u32 blk_pos,
|
||||
int blk_size)
|
||||
unsigned int direction, int blk_size)
|
||||
{
|
||||
/* This controller can't do multiblock reads due to hw bugs */
|
||||
if (direction == MMC_DATA_READ)
|
||||
|
||||
@@ -170,9 +170,7 @@ static int sh_mobile_sdhi_write16_hook(struct tmio_mmc_host *host, int addr)
|
||||
}
|
||||
|
||||
static int sh_mobile_sdhi_multi_io_quirk(struct mmc_card *card,
|
||||
unsigned int direction,
|
||||
u32 blk_pos,
|
||||
int blk_size)
|
||||
unsigned int direction, int blk_size)
|
||||
{
|
||||
/*
|
||||
* In Renesas controllers, when performing a
|
||||
|
||||
@@ -1001,9 +1001,7 @@ static int tmio_mmc_get_ro(struct mmc_host *mmc)
|
||||
}
|
||||
|
||||
static int tmio_multi_io_quirk(struct mmc_card *card,
|
||||
unsigned int direction,
|
||||
u32 blk_pos,
|
||||
int blk_size)
|
||||
unsigned int direction, int blk_size)
|
||||
{
|
||||
struct tmio_mmc_host *host = mmc_priv(card->host);
|
||||
|
||||
|
||||
@@ -140,9 +140,7 @@ struct mmc_host_ops {
|
||||
* I/O. Returns the number of supported blocks for the request.
|
||||
*/
|
||||
int (*multi_io_quirk)(struct mmc_card *card,
|
||||
unsigned int direction,
|
||||
u32 blk_pos,
|
||||
int blk_size);
|
||||
unsigned int direction, int blk_size);
|
||||
};
|
||||
|
||||
struct mmc_card;
|
||||
|
||||
Reference in New Issue
Block a user