LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: systemace: Reorder function to avoid forward declarataions 

Move the systemace_get_dev() function below systemace_read() so that we can
avoid a forward declaration.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2016-05-01 11:36:30 -06:00
parent 9107c973d3
commit a0ff24c467
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/block/systemace.c
View File

@ -68,10 +68,6 @@ static u16 ace_readw(unsigned off)
return in16(base + off); return in16(base + off);
} }
static unsigned long systemace_read(struct blk_desc *block_dev,
unsigned long start, lbaint_t blkcnt,
void *buffer);
static struct blk_desc systemace_dev = { 0 }; static struct blk_desc systemace_dev = { 0 };
static int get_cf_lock(void) static int get_cf_lock(void)
@ -103,33 +99,6 @@ static void release_cf_lock(void)
ace_writew((val & 0xffff), 0x18); ace_writew((val & 0xffff), 0x18);
} }
static int systemace_get_dev(int dev, struct blk_desc **descp)
{
/* The first time through this, the systemace_dev object is
not yet initialized. In that case, fill it in. */
if (systemace_dev.blksz == 0) {
systemace_dev.if_type = IF_TYPE_UNKNOWN;
systemace_dev.devnum = 0;
systemace_dev.part_type = PART_TYPE_UNKNOWN;
systemace_dev.type = DEV_TYPE_HARDDISK;
systemace_dev.blksz = 512;
systemace_dev.log2blksz = LOG2(systemace_dev.blksz);
systemace_dev.removable = 1;
systemace_dev.block_read = systemace_read;
/*
* Ensure the correct bus mode (8/16 bits) gets enabled
*/
ace_writew(width == 8 ? 0 : 0x0001, 0);
part_init(&systemace_dev);
}
*descp = &systemace_dev;
return 0;
}
/* /*
* This function is called (by dereferencing the block_read pointer in * This function is called (by dereferencing the block_read pointer in
* the dev_desc) to read blocks of data. The return value is the * the dev_desc) to read blocks of data. The return value is the
@ -256,6 +225,32 @@ static unsigned long systemace_read(struct blk_desc *block_dev,
return blkcnt; return blkcnt;
} }
static int systemace_get_dev(int dev, struct blk_desc **descp)
{
/* The first time through this, the systemace_dev object is
not yet initialized. In that case, fill it in. */
if (systemace_dev.blksz == 0) {
systemace_dev.if_type = IF_TYPE_UNKNOWN;
systemace_dev.devnum = 0;
systemace_dev.part_type = PART_TYPE_UNKNOWN;
systemace_dev.type = DEV_TYPE_HARDDISK;
systemace_dev.blksz = 512;
systemace_dev.log2blksz = LOG2(systemace_dev.blksz);
systemace_dev.removable = 1;
systemace_dev.block_read = systemace_read;
/*
* Ensure the correct bus mode (8/16 bits) gets enabled
*/
ace_writew(width == 8 ? 0 : 0x0001, 0);
part_init(&systemace_dev);
}
*descp = &systemace_dev;
return 0;
}
U_BOOT_LEGACY_BLK(systemace) = { U_BOOT_LEGACY_BLK(systemace) = {
.if_typename = "ace", .if_typename = "ace",
.if_type = IF_TYPE_SYSTEMACE, .if_type = IF_TYPE_SYSTEMACE,