]> git.sur5r.net Git - u-boot/commitdiff
dm: systemace: Reorder function to avoid forward declarataions
authorSimon Glass <sjg@chromium.org>
Sun, 1 May 2016 17:36:30 +0000 (11:36 -0600)
committerSimon Glass <sjg@chromium.org>
Tue, 17 May 2016 15:54:43 +0000 (09:54 -0600)
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>
drivers/block/systemace.c

index 79e1263a872f7d267964bde3ba6430aecfb14533..eeba7f08900385a32c7eeefde208833961160bc8 100644 (file)
@@ -68,10 +68,6 @@ static u16 ace_readw(unsigned 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 int get_cf_lock(void)
@@ -103,33 +99,6 @@ static void release_cf_lock(void)
        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
  * 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;
 }
 
+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) = {
        .if_typename    = "ace",
        .if_type        = IF_TYPE_SYSTEMACE,