diff options
Diffstat (limited to 'drivers/misc/storage-by-uuid.c')
| -rw-r--r-- | drivers/misc/storage-by-uuid.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/misc/storage-by-uuid.c b/drivers/misc/storage-by-uuid.c index 12a06076a2..5548f477a4 100644 --- a/drivers/misc/storage-by-uuid.c +++ b/drivers/misc/storage-by-uuid.c @@ -4,7 +4,6 @@ #include <io.h> #include <of.h> #include <malloc.h> -#include <partition.h> #include <envfs.h> #include <fs.h> @@ -12,7 +11,7 @@ static LIST_HEAD(sbu_list); struct sbu { char *uuid; - struct device_d *dev; + struct device *dev; struct cdev *rcdev; struct cdev cdev; struct list_head list; @@ -133,7 +132,7 @@ static void storage_by_uuid_add_partitions(struct sbu *sbu, struct cdev *rcdev) return; } - of_parse_partitions(&sbu->cdev, sbu->dev->device_node); + of_parse_partitions(&sbu->cdev, sbu->dev->of_node); } static void check_exist(struct sbu *sbu) @@ -141,14 +140,14 @@ static void check_exist(struct sbu *sbu) struct cdev *cdev; for_each_cdev(cdev) { - if (!strcmp(cdev->uuid, sbu->uuid)) { - dev_dbg(sbu->dev, "Found %s %s\n", cdev->name, cdev->uuid); + if (!strcmp(cdev->diskuuid, sbu->uuid)) { + dev_dbg(sbu->dev, "Found %s %s\n", cdev->name, cdev->diskuuid); storage_by_uuid_add_partitions(sbu, cdev); } } } -static int sbu_detect(struct device_d *dev) +static int sbu_detect(struct device *dev) { struct sbu *sbu = dev->priv; @@ -159,7 +158,7 @@ static int sbu_detect(struct device_d *dev) return 0; } -static int storage_by_uuid_probe(struct device_d *dev) +static int storage_by_uuid_probe(struct device *dev) { struct sbu *sbu; int ret; @@ -167,7 +166,7 @@ static int storage_by_uuid_probe(struct device_d *dev) sbu = xzalloc(sizeof(*sbu)); - ret = of_property_read_string(dev->device_node, "uuid", &uuid); + ret = of_property_read_string(dev->of_node, "uuid", &uuid); if (ret) return ret; @@ -190,8 +189,9 @@ static struct of_device_id storage_by_uuid_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, storage_by_uuid_dt_ids); -static struct driver_d storage_by_uuid_driver = { +static struct driver storage_by_uuid_driver = { .name = "storage-by-uuid", .probe = storage_by_uuid_probe, .of_compatible = storage_by_uuid_dt_ids, |