summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-09-28 23:32:02 -0600
committerSimon Glass <sjg@chromium.org>2015-10-23 09:42:28 -0600
commit9a79f6e6d51f35eca9fff34dd5e4689dfd2c59a8 (patch)
treec34227e774da5af6a5ed57a35be0375cdafc2843
parentbcbe3d157904d3dd4d6b18a81859db45a5da2678 (diff)
downloadu-boot-imx-9a79f6e6d51f35eca9fff34dd5e4689dfd2c59a8.zip
u-boot-imx-9a79f6e6d51f35eca9fff34dd5e4689dfd2c59a8.tar.gz
u-boot-imx-9a79f6e6d51f35eca9fff34dd5e4689dfd2c59a8.tar.bz2
dm: core: Adjust device.h header file order
Move a few functions around so that the ordering is consistent. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--include/dm/device.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/include/dm/device.h b/include/dm/device.h
index f152008..e09f897 100644
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -233,6 +233,16 @@ void *dev_get_parent_platdata(struct udevice *dev);
void *dev_get_uclass_platdata(struct udevice *dev);
/**
+ * dev_get_priv() - Get the private data for a device
+ *
+ * This checks that dev is not NULL, but no other checks for now
+ *
+ * @dev Device to check
+ * @return private data, or NULL if none
+ */
+void *dev_get_priv(struct udevice *dev);
+
+/**
* dev_get_parent_priv() - Get the parent private data for a device
*
* The parent private data is data stored in the device but owned by the
@@ -247,14 +257,14 @@ void *dev_get_uclass_platdata(struct udevice *dev);
void *dev_get_parent_priv(struct udevice *dev);
/**
- * dev_get_priv() - Get the private data for a device
+ * dev_get_uclass_priv() - Get the private uclass data for a device
*
* This checks that dev is not NULL, but no other checks for now
*
* @dev Device to check
- * @return private data, or NULL if none
+ * @return private uclass data for this device, or NULL if none
*/
-void *dev_get_priv(struct udevice *dev);
+void *dev_get_uclass_priv(struct udevice *dev);
/**
* struct dev_get_parent() - Get the parent of a device
@@ -265,16 +275,6 @@ void *dev_get_priv(struct udevice *dev);
struct udevice *dev_get_parent(struct udevice *child);
/**
- * dev_get_uclass_priv() - Get the private uclass data for a device
- *
- * This checks that dev is not NULL, but no other checks for now
- *
- * @dev Device to check
- * @return private uclass data for this device, or NULL if none
- */
-void *dev_get_uclass_priv(struct udevice *dev);
-
-/**
* dev_get_driver_data() - get the driver data used to bind a device
*
* When a device is bound using a device tree node, it matches a