summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-06-11 23:29:45 -0600
committerSimon Glass <sjg@chromium.org>2014-06-20 11:55:18 -0600
commitae7f4513087e7f7996cebc9db642917dde9ea561 (patch)
treeadea348bafc0fdb98c684d32b943637515e4843a /include
parent5957ac2a9f668370bfcd9e5520de4bde346878a4 (diff)
downloadu-boot-imx-ae7f4513087e7f7996cebc9db642917dde9ea561.zip
u-boot-imx-ae7f4513087e7f7996cebc9db642917dde9ea561.tar.gz
u-boot-imx-ae7f4513087e7f7996cebc9db642917dde9ea561.tar.bz2
dm: Rename struct device_id to udevice_id
It is best to avoid having any occurence of 'struct device' in driver model, so rename to achieve this. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/dm/device.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/dm/device.h b/include/dm/device.h
index ec04982..19f2039 100644
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -75,11 +75,11 @@ struct udevice {
#define device_active(dev) ((dev)->flags & DM_FLAG_ACTIVATED)
/**
- * struct device_id - Lists the compatible strings supported by a driver
+ * struct udevice_id - Lists the compatible strings supported by a driver
* @compatible: Compatible string
* @data: Data for this compatible string
*/
-struct device_id {
+struct udevice_id {
const char *compatible;
ulong data;
};
@@ -121,7 +121,7 @@ struct device_id {
struct driver {
char *name;
enum uclass_id id;
- const struct device_id *of_match;
+ const struct udevice_id *of_match;
int (*bind)(struct udevice *dev);
int (*probe)(struct udevice *dev);
int (*remove)(struct udevice *dev);