From: Tom Rini <trini@konsulko.com>
Date: Sat, 10 Jun 2017 14:01:05 +0000 (-0400)
Subject: dm: blk: Fix warning on !CONFIG_BLK
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=4bdb49a7487d1c46c04e3da3f1f370cde1566aea;p=u-boot.git

dm: blk: Fix warning on !CONFIG_BLK

When we don't have CONFIG_BLK defined we don't have a forward
declaration of struct udevice, and thus get a warning about it on
blk_get_from_parent(), which we only have when CONFIG_BLK is set.  Move
the declaration of blk_get_from_parent() to be with the other CONFIG_BLK
parts.

Fixes 9f103b9cb5f8 ("dm: blk: Add a way to obtain a block device from ...")
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/include/blk.h b/include/blk.h
index 4d60987f61..ef29a07ee2 100644
--- a/include/blk.h
+++ b/include/blk.h
@@ -377,6 +377,13 @@ int blk_find_max_devnum(enum if_type if_type);
  */
 int blk_select_hwpart(struct udevice *dev, int hwpart);
 
+/**
+ * blk_get_from_parent() - obtain a block device by looking up its parent
+ *
+ * All devices with
+ */
+int blk_get_from_parent(struct udevice *parent, struct udevice **devp);
+
 #else
 #include <errno.h>
 /*
@@ -616,11 +623,4 @@ ulong blk_write_devnum(enum if_type if_type, int devnum, lbaint_t start,
  */
 int blk_select_hwpart_devnum(enum if_type if_type, int devnum, int hwpart);
 
-/**
- * blk_get_from_parent() - obtain a block device by looking up its parent
- *
- * All devices with
- */
-int blk_get_from_parent(struct udevice *parent, struct udevice **devp);
-
 #endif