summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-09-28 23:32:01 -0600
committerSimon Glass <sjg@chromium.org>2015-10-23 09:42:28 -0600
commitbcbe3d157904d3dd4d6b18a81859db45a5da2678 (patch)
treea0d6577e593f6f0cf95f9f55271f17bf1946b1b3 /include
parent9f13b6d147dc74f2400ce18d9d4005ba53f21fd3 (diff)
downloadblackbird-obmc-uboot-bcbe3d157904d3dd4d6b18a81859db45a5da2678.tar.gz
blackbird-obmc-uboot-bcbe3d157904d3dd4d6b18a81859db45a5da2678.zip
dm: Rename dev_get_parentdata() to dev_get_parent_priv()
The current name is inconsistent with other driver model data access functions. Rename it and fix up all users. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'include')
-rw-r--r--include/dm/device.h10
-rw-r--r--include/pci.h2
-rw-r--r--include/spi.h2
-rw-r--r--include/usb.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/include/dm/device.h b/include/dm/device.h
index 85196124b4..f152008ae7 100644
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -233,18 +233,18 @@ void *dev_get_parent_platdata(struct udevice *dev);
void *dev_get_uclass_platdata(struct udevice *dev);
/**
- * dev_get_parentdata() - Get the parent data for a device
+ * dev_get_parent_priv() - Get the parent private data for a device
*
- * The parent data is data stored in the device but owned by the parent.
- * For example, a USB device may have parent data which contains information
- * about how to talk to the device over USB.
+ * The parent private data is data stored in the device but owned by the
+ * parent. For example, a USB device may have parent data which contains
+ * information about how to talk to the device over USB.
*
* This checks that dev is not NULL, but no other checks for now
*
* @dev Device to check
* @return parent data, or NULL if none
*/
-void *dev_get_parentdata(struct udevice *dev);
+void *dev_get_parent_priv(struct udevice *dev);
/**
* dev_get_priv() - Get the private data for a device
diff --git a/include/pci.h b/include/pci.h
index e24c970130..ed135a5122 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -797,7 +797,7 @@ struct udevice;
*
* Every device on a PCI bus has this per-child data.
*
- * It can be accessed using dev_get_parentdata(dev) if dev->parent is a
+ * It can be accessed using dev_get_parent_priv(dev) if dev->parent is a
* PCI bus (i.e. UCLASS_PCI)
*
* @devfn: Encoded device and function index - see PCI_DEVFN()
diff --git a/include/spi.h b/include/spi.h
index 51fdfd6d73..b4d27232ec 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -88,7 +88,7 @@ struct dm_spi_slave_platdata {
* struct spi_slave - Representation of a SPI slave
*
* For driver model this is the per-child data used by the SPI bus. It can
- * be accessed using dev_get_parentdata() on the slave device. The SPI uclass
+ * be accessed using dev_get_parent_priv() on the slave device. The SPI uclass
* sets uip per_child_auto_alloc_size to sizeof(struct spi_slave), and the
* driver should not override it. Two platform data fields (max_hz and mode)
* are copied into this structure to provide an initial value. This allows
diff --git a/include/usb.h b/include/usb.h
index 88ebbe6e3f..3d0facbed9 100644
--- a/include/usb.h
+++ b/include/usb.h
@@ -96,7 +96,7 @@ enum {
* (the hubs) have this as parent data. Hubs are children of controllers or
* other hubs and there is always a single root hub for each controller.
* Therefore struct usb_device can always be accessed with
- * dev_get_parentdata(dev), where dev is a USB device.
+ * dev_get_parent_priv(dev), where dev is a USB device.
*
* Pointers exist for obtaining both the device (could be any uclass) and
* controller (UCLASS_USB) from this structure. The controller does not have
OpenPOWER on IntegriCloud