block: pass block dev not num to read/write/erase()
This will allow the implementation to make use of data in the block_dev structure beyond the base device number. This will be useful so that eMMC block devices can encompass the HW partition ID rather than treating this out-of-band. Equally, the existence of the priv field is crying out for this patch to exist. Signed-off-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -29,7 +29,7 @@ int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr)
|
||||
return 1;
|
||||
|
||||
/* read out the first block, get the config data information */
|
||||
n = mmc->block_dev.block_read(mmc->block_dev.dev, 0, 1, tmp_buf);
|
||||
n = mmc->block_dev.block_read(&mmc->block_dev, 0, 1, tmp_buf);
|
||||
if (!n) {
|
||||
free(tmp_buf);
|
||||
return 1;
|
||||
|
||||
@@ -232,7 +232,7 @@ static int ccdm_mmc_read(struct mmc *mmc, u64 src, u8 *dst, int size)
|
||||
ofs = src % blk_len;
|
||||
|
||||
if (ofs) {
|
||||
n = mmc->block_dev.block_read(mmc->block_dev.dev, block_no++, 1,
|
||||
n = mmc->block_dev.block_read(&mmc->block_dev, block_no++, 1,
|
||||
tmp_buf);
|
||||
if (!n)
|
||||
goto failure;
|
||||
@@ -243,7 +243,7 @@ static int ccdm_mmc_read(struct mmc *mmc, u64 src, u8 *dst, int size)
|
||||
}
|
||||
cnt = size / blk_len;
|
||||
if (cnt) {
|
||||
n = mmc->block_dev.block_read(mmc->block_dev.dev, block_no, cnt,
|
||||
n = mmc->block_dev.block_read(&mmc->block_dev, block_no, cnt,
|
||||
dst);
|
||||
if (n != cnt)
|
||||
goto failure;
|
||||
@@ -253,7 +253,7 @@ static int ccdm_mmc_read(struct mmc *mmc, u64 src, u8 *dst, int size)
|
||||
block_no += cnt;
|
||||
}
|
||||
if (size) {
|
||||
n = mmc->block_dev.block_read(mmc->block_dev.dev, block_no++, 1,
|
||||
n = mmc->block_dev.block_read(&mmc->block_dev, block_no++, 1,
|
||||
tmp_buf);
|
||||
if (!n)
|
||||
goto failure;
|
||||
|
||||
@@ -43,7 +43,7 @@ int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr)
|
||||
return 1;
|
||||
|
||||
/* read out the first block, get the config data information */
|
||||
n = mmc->block_dev.block_read(mmc->block_dev.dev, 0, 1, tmp_buf);
|
||||
n = mmc->block_dev.block_read(&mmc->block_dev, 0, 1, tmp_buf);
|
||||
if (!n) {
|
||||
free(tmp_buf);
|
||||
return 1;
|
||||
|
||||
Reference in New Issue
Block a user