diff options
| author | Heiko Schocher <hs@denx.de> | 2014-05-22 12:43:05 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-27 10:21:32 -0400 |
| commit | 54c5d08a09e631f88738db54c75395c6457c2157 (patch) | |
| tree | 989241d18408f19062618bc380ef5948154f2334 /include/dm/device-internal.h | |
| parent | 9665fa8f9e1488209d5e01d0792c243e0a220c5a (diff) | |
| download | u-boot-imx-54c5d08a09e631f88738db54c75395c6457c2157.zip u-boot-imx-54c5d08a09e631f88738db54c75395c6457c2157.tar.gz u-boot-imx-54c5d08a09e631f88738db54c75395c6457c2157.tar.bz2 | |
dm: rename device struct to udevice
using UBI and DM together leads in compiler error, as
both define a "struct device", so rename "struct device"
in include/dm/device.h to "struct udevice", as we use
linux code (MTD/UBI/UBIFS some USB code,...) and cannot
change the linux "struct device"
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Marek Vasut <marex@denx.de>
Diffstat (limited to 'include/dm/device-internal.h')
| -rw-r--r-- | include/dm/device-internal.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h index c026e8e..ea3df36 100644 --- a/include/dm/device-internal.h +++ b/include/dm/device-internal.h @@ -11,7 +11,7 @@ #ifndef _DM_DEVICE_INTERNAL_H #define _DM_DEVICE_INTERNAL_H -struct device; +struct udevice; /** * device_bind() - Create a device and bind it to a driver @@ -34,9 +34,9 @@ struct device; * @devp: Returns a pointer to the bound device * @return 0 if OK, -ve on error */ -int device_bind(struct device *parent, struct driver *drv, +int device_bind(struct udevice *parent, struct driver *drv, const char *name, void *platdata, int of_offset, - struct device **devp); + struct udevice **devp); /** * device_bind_by_name: Create a device and bind it to a driver @@ -49,8 +49,8 @@ int device_bind(struct device *parent, struct driver *drv, * @devp: Returns a pointer to the bound device * @return 0 if OK, -ve on error */ -int device_bind_by_name(struct device *parent, const struct driver_info *info, - struct device **devp); +int device_bind_by_name(struct udevice *parent, const struct driver_info *info, + struct udevice **devp); /** * device_probe() - Probe a device, activating it @@ -61,7 +61,7 @@ int device_bind_by_name(struct device *parent, const struct driver_info *info, * @dev: Pointer to device to probe * @return 0 if OK, -ve on error */ -int device_probe(struct device *dev); +int device_probe(struct udevice *dev); /** * device_remove() - Remove a device, de-activating it @@ -72,7 +72,7 @@ int device_probe(struct device *dev); * @dev: Pointer to device to remove * @return 0 if OK, -ve on error (an error here is normally a very bad thing) */ -int device_remove(struct device *dev); +int device_remove(struct udevice *dev); /** * device_unbind() - Unbind a device, destroying it @@ -82,6 +82,6 @@ int device_remove(struct device *dev); * @dev: Pointer to device to unbind * @return 0 if OK, -ve on error */ -int device_unbind(struct device *dev); +int device_unbind(struct udevice *dev); #endif |