diff options
| author | Simon Glass <sjg@chromium.org> | 2014-06-11 23:29:45 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-06-20 11:55:18 -0600 |
| commit | ae7f4513087e7f7996cebc9db642917dde9ea561 (patch) | |
| tree | adea348bafc0fdb98c684d32b943637515e4843a /drivers | |
| parent | 5957ac2a9f668370bfcd9e5520de4bde346878a4 (diff) | |
| download | talos-obmc-uboot-ae7f4513087e7f7996cebc9db642917dde9ea561.tar.gz talos-obmc-uboot-ae7f4513087e7f7996cebc9db642917dde9ea561.zip | |
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 'drivers')
| -rw-r--r-- | drivers/core/lists.c | 2 | ||||
| -rw-r--r-- | drivers/demo/demo-shape.c | 2 | ||||
| -rw-r--r-- | drivers/demo/demo-simple.c | 2 | ||||
| -rw-r--r-- | drivers/gpio/sandbox.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/core/lists.c b/drivers/core/lists.c index 205b140ef3..9f2917f4bb 100644 --- a/drivers/core/lists.c +++ b/drivers/core/lists.c @@ -94,7 +94,7 @@ int lists_bind_drivers(struct udevice *parent) * tree error */ static int driver_check_compatible(const void *blob, int offset, - const struct device_id *of_match) + const struct udevice_id *of_match) { int ret; diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c index a68cc1092c..3fa9c59947 100644 --- a/drivers/demo/demo-shape.c +++ b/drivers/demo/demo-shape.c @@ -111,7 +111,7 @@ static int shape_ofdata_to_platdata(struct udevice *dev) return 0; } -static const struct device_id demo_shape_id[] = { +static const struct udevice_id demo_shape_id[] = { { "demo-shape", 0 }, { }, }; diff --git a/drivers/demo/demo-simple.c b/drivers/demo/demo-simple.c index 11def86032..2bcb7dfb47 100644 --- a/drivers/demo/demo-simple.c +++ b/drivers/demo/demo-simple.c @@ -32,7 +32,7 @@ static int demo_shape_ofdata_to_platdata(struct udevice *dev) return demo_parse_dt(dev); } -static const struct device_id demo_shape_id[] = { +static const struct udevice_id demo_shape_id[] = { { "demo-simple", 0 }, { }, }; diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c index 09cebe2286..75ada5d387 100644 --- a/drivers/gpio/sandbox.c +++ b/drivers/gpio/sandbox.c @@ -239,7 +239,7 @@ static int gpio_sandbox_probe(struct udevice *dev) return 0; } -static const struct device_id sandbox_gpio_ids[] = { +static const struct udevice_id sandbox_gpio_ids[] = { { .compatible = "sandbox,gpio" }, { } }; |
