ums: remove ums_disk_init()

Now that ums_disk_init() is so simple, there's no need for it to be a
separate function. Instead, just add it to the tail end of ums_init().

Cc: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Przemyslaw Marczak <p.marczak@samsung.com>
master
Stephen Warren 10 years ago committed by Lukasz Majewski
parent dc1e746c42
commit 36ff05c4f9
  1. 17
      board/samsung/common/ums.c

@ -36,8 +36,14 @@ static struct ums ums_dev = {
.name = "UMS disk",
};
static struct ums *ums_disk_init(struct mmc *mmc)
struct ums *ums_init(unsigned int dev_num)
{
struct mmc *mmc = NULL;
mmc = find_mmc_device(dev_num);
if (!mmc || mmc_init(mmc))
return NULL;
ums_dev.block_dev = &mmc->block_dev;
ums_dev.start_sector = 0;
ums_dev.num_sectors = mmc->capacity / SECTOR_SIZE;
@ -47,12 +53,3 @@ static struct ums *ums_disk_init(struct mmc *mmc)
return &ums_dev;
}
struct ums *ums_init(unsigned int dev_num)
{
struct mmc *mmc = find_mmc_device(dev_num);
if (!mmc || mmc_init(mmc))
return NULL;
return ums_disk_init(mmc);
}

Loading…
Cancel
Save