From c2474d9c718dea4f26067e85d356644a3aed26c2 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Mon, 5 May 2014 10:40:12 -0600 Subject: ums: remove UMS_{NUM,START}_SECTORS + UMS_START_SECTOR These values aren't set anywhere at present, and hence have no effect. The concept of a single global offset/number of sectors to expose through USB Mass Storage doesn't even make sense in the face of multiple storage devices. Remove these defines to simplify the code. Cc: Lukasz Majewski Signed-off-by: Stephen Warren Acked-by: Przemyslaw Marczak --- board/samsung/common/ums.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'board/samsung/common/ums.c') diff --git a/board/samsung/common/ums.c b/board/samsung/common/ums.c index ffe6368583..1f7dda4362 100644 --- a/board/samsung/common/ums.c +++ b/board/samsung/common/ums.c @@ -39,7 +39,6 @@ static struct ums ums_dev = { static struct ums *ums_disk_init(struct mmc *mmc) { uint64_t mmc_end_sector = mmc->capacity / SECTOR_SIZE; - uint64_t ums_end_sector = UMS_NUM_SECTORS + UMS_START_SECTOR; if (!mmc_end_sector) { error("MMC capacity is not valid"); @@ -47,17 +46,8 @@ static struct ums *ums_disk_init(struct mmc *mmc) } ums_dev.block_dev = &mmc->block_dev; - - if (ums_end_sector <= mmc_end_sector) { - ums_dev.start_sector = UMS_START_SECTOR; - if (UMS_NUM_SECTORS) - ums_dev.num_sectors = UMS_NUM_SECTORS; - else - ums_dev.num_sectors = mmc_end_sector - UMS_START_SECTOR; - } else { - ums_dev.num_sectors = mmc_end_sector; - puts("UMS: defined bad disk parameters. Using default.\n"); - } + ums_dev.start_sector = 0; + ums_dev.num_sectors = mmc_end_sector; printf("UMS: disk start sector: %#x, count: %#x\n", ums_dev.start_sector, ums_dev.num_sectors); -- cgit v1.2.1