Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

dm: Rename struct device_id to udevice_id

Browse source 
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>
This commit is contained in:
Simon Glass 2014-06-11 23:29:45 -06:00
parent 5957ac2a9f
commit ae7f451308
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/driver-model/README.txt
View file

@ -315,7 +315,7 @@ is little or no 'driver model' code to write.
- Moved some data from code into data structure - e.g. store a pointer to
the driver operations structure in the driver, rather than passing it
to the driver bind function.
- Rename some structures to make them more similar to Linux (struct device
- Rename some structures to make them more similar to Linux (struct udevice
instead of struct instance, struct platdata, etc.)
- Change the name 'core' to 'uclass', meaning U-Boot class. It seems that
this concept relates to a class of drivers (or a subsystem). We shouldn't

2
drivers/core/lists.c
View file

@ -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;

2
drivers/demo/demo-shape.c
View file

@ -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 },
{ },
};

2
drivers/demo/demo-simple.c
View file

@ -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 },
{ },
};

2
drivers/gpio/sandbox.c
View file

@ -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" },
{ }
};

6
include/dm/device.h
View file

@ -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);

2
test/dm/test-fdt.c
View file

@ -53,7 +53,7 @@ static int testfdt_drv_probe(struct udevice *dev)
return 0;
}
static const struct device_id testfdt_ids[] = {
static const struct udevice_id testfdt_ids[] = {
{
.compatible = "denx,u-boot-fdt-test",
.data = DM_TEST_TYPE_FIRST },