diff options
Diffstat (limited to 'drivers/of/barebox.c')
| -rw-r--r-- | drivers/of/barebox.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/drivers/of/barebox.c b/drivers/of/barebox.c index aa0cfb6194..560d9c0d15 100644 --- a/drivers/of/barebox.c +++ b/drivers/of/barebox.c @@ -1,17 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * barebox.c * * Copyright (c) 2013 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * */ #include <common.h> @@ -19,7 +10,6 @@ #include <io.h> #include <of.h> #include <malloc.h> -#include <partition.h> #include <envfs.h> #include <fs.h> @@ -28,7 +18,7 @@ /* If dev describes a file on a fs, mount the fs and change devpath to * point to the file's path. Otherwise leave devpath alone. Does * nothing in env in a file support isn't enabled. */ -static int environment_check_mount(struct device_d *dev, char **devpath) +static int environment_check_mount(struct device *dev, char **devpath) { const char *filepath; int ret; @@ -36,7 +26,7 @@ static int environment_check_mount(struct device_d *dev, char **devpath) if (!IS_ENABLED(CONFIG_OF_BAREBOX_ENV_IN_FS)) return 0; - ret = of_property_read_string(dev->device_node, "file-path", &filepath); + ret = of_property_read_string(dev->of_node, "file-path", &filepath); if (ret == -EINVAL) { /* No file-path so just use device-path */ return 0; @@ -62,12 +52,13 @@ static int environment_check_mount(struct device_d *dev, char **devpath) return 0; } -static int environment_probe(struct device_d *dev) +static int environment_probe(struct device *dev) { char *path; int ret; - ret = of_find_path(dev->device_node, "device-path", &path, OF_FIND_PATH_FLAGS_BB); + ret = of_find_path(dev->of_node, "device-path", &path, + OF_FIND_PATH_FLAGS_BB); if (ret) return ret; @@ -89,8 +80,9 @@ static struct of_device_id environment_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, environment_dt_ids); -static struct driver_d environment_driver = { +static struct driver environment_driver = { .name = "barebox-environment", .probe = environment_probe, .of_compatible = environment_dt_ids, |