u-boot/drivers/core/syscon-uclass.c
Simon Glass 532f2435cf syscon: Avoid returning a device on failure
If the device cannot be probed, syscon_get_by_driver_data() will still
return a useful value in its devp parameter. Ensure that it returns NULL
instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2016-03-17 10:27:24 +08:00

84 lines
1.7 KiB
C

/*
* Copyright (C) 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <syscon.h>
#include <dm.h>
#include <errno.h>
#include <regmap.h>
#include <dm/device-internal.h>
#include <dm/lists.h>
#include <dm/root.h>
#include <linux/err.h>
struct regmap *syscon_get_regmap(struct udevice *dev)
{
struct syscon_uc_info *priv;
if (device_get_uclass_id(dev) != UCLASS_SYSCON)
return ERR_PTR(-ENOEXEC);
priv = dev_get_uclass_priv(dev);
return priv->regmap;
}
static int syscon_pre_probe(struct udevice *dev)
{
struct syscon_uc_info *priv = dev_get_uclass_priv(dev);
return regmap_init_mem(dev, &priv->regmap);
}
int syscon_get_by_driver_data(ulong driver_data, struct udevice **devp)
{
struct udevice *dev;
struct uclass *uc;
int ret;
*devp = NULL;
ret = uclass_get(UCLASS_SYSCON, &uc);
if (ret)
return ret;
uclass_foreach_dev(dev, uc) {
if (dev->driver_data == driver_data) {
*devp = dev;
return device_probe(dev);
}
}
return -ENODEV;
}
struct regmap *syscon_get_regmap_by_driver_data(ulong driver_data)
{
struct syscon_uc_info *priv;
struct udevice *dev;
int ret;
ret = syscon_get_by_driver_data(driver_data, &dev);
if (ret)
return ERR_PTR(ret);
priv = dev_get_uclass_priv(dev);
return priv->regmap;
}
void *syscon_get_first_range(ulong driver_data)
{
struct regmap *map;
map = syscon_get_regmap_by_driver_data(driver_data);
if (IS_ERR(map))
return map;
return regmap_get_range(map, 0);
}
UCLASS_DRIVER(syscon) = {
.id = UCLASS_SYSCON,
.name = "syscon",
.per_device_auto_alloc_size = sizeof(struct syscon_uc_info),
.pre_probe = syscon_pre_probe,
};