diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-31 10:38:08 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-09-16 08:32:10 +0200 |
commit | ed6e965824303255cacc1c1a195d3684caa26bce (patch) | |
tree | 26e2b1b78498675ceae4dd2e990836c26ec1d5ec /drivers/clk | |
parent | 5bdc82c54a3306f2ae151a00f2df54f9240395b8 (diff) | |
download | barebox-ed6e965824303255cacc1c1a195d3684caa26bce.tar.gz barebox-ed6e965824303255cacc1c1a195d3684caa26bce.tar.xz |
resource: Let dev_request_mem_region return an error pointer
For all users fix or add the error check.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/clk-ar933x.c | 4 | ||||
-rw-r--r-- | drivers/clk/mvebu/common.c | 5 | ||||
-rw-r--r-- | drivers/clk/mxs/clk-imx23.c | 2 | ||||
-rw-r--r-- | drivers/clk/mxs/clk-imx28.c | 2 | ||||
-rw-r--r-- | drivers/clk/socfpga.c | 4 | ||||
-rw-r--r-- | drivers/clk/tegra/clk-tegra124.c | 4 | ||||
-rw-r--r-- | drivers/clk/tegra/clk-tegra20.c | 4 | ||||
-rw-r--r-- | drivers/clk/tegra/clk-tegra30.c | 4 |
8 files changed, 17 insertions, 12 deletions
diff --git a/drivers/clk/clk-ar933x.c b/drivers/clk/clk-ar933x.c index d983387a93..79b257133c 100644 --- a/drivers/clk/clk-ar933x.c +++ b/drivers/clk/clk-ar933x.c @@ -140,8 +140,8 @@ static int ar933x_clk_probe(struct device_d *dev) void __iomem *base; base = dev_request_mem_region(dev, 0); - if (!base) - return -EBUSY; + if (IS_ERR(base)) + return PTR_ERR(base); ar933x_ref_clk_init(base); ar933x_pll_init(base); diff --git a/drivers/clk/mvebu/common.c b/drivers/clk/mvebu/common.c index f3be5f2974..0e7f65c488 100644 --- a/drivers/clk/mvebu/common.c +++ b/drivers/clk/mvebu/common.c @@ -15,6 +15,7 @@ #include <init.h> #include <of.h> #include <linux/clk.h> +#include <linux/err.h> #include <linux/clkdev.h> #include "common.h" @@ -166,8 +167,8 @@ int mvebu_clk_gating_probe(struct device_d *dev) desc = (const struct clk_gating_soc_desc *)match->data; base = dev_request_mem_region(dev, 0); - if (!base) - return -EINVAL; + if (IS_ERR(base)) + return PTR_ERR(base); clk = of_clk_get(np, 0); if (IS_ERR(clk)) diff --git a/drivers/clk/mxs/clk-imx23.c b/drivers/clk/mxs/clk-imx23.c index 4b153503a4..1f84e9f6e9 100644 --- a/drivers/clk/mxs/clk-imx23.c +++ b/drivers/clk/mxs/clk-imx23.c @@ -129,6 +129,8 @@ static int imx23_ccm_probe(struct device_d *dev) void __iomem *regs; regs = dev_request_mem_region(dev, 0); + if (IS_ERR(regs)) + return PTR_ERR(regs); mx23_clocks_init(regs); diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c index 36b71f6870..aa2924c70e 100644 --- a/drivers/clk/mxs/clk-imx28.c +++ b/drivers/clk/mxs/clk-imx28.c @@ -169,6 +169,8 @@ static int imx28_ccm_probe(struct device_d *dev) void __iomem *regs; regs = dev_request_mem_region(dev, 0); + if (IS_ERR(regs)) + return PTR_ERR(regs); mx28_clocks_init(regs); diff --git a/drivers/clk/socfpga.c b/drivers/clk/socfpga.c index f4257fdb5c..be97d13fa6 100644 --- a/drivers/clk/socfpga.c +++ b/drivers/clk/socfpga.c @@ -358,8 +358,8 @@ static int socfpga_ccm_probe(struct device_d *dev) struct device_node *clknode; regs = dev_request_mem_region(dev, 0); - if (!regs) - return -EBUSY; + if (IS_ERR(regs)) + return PTR_ERR(regs); clk_mgr_base_addr = regs; diff --git a/drivers/clk/tegra/clk-tegra124.c b/drivers/clk/tegra/clk-tegra124.c index 1e89bee036..514b22a784 100644 --- a/drivers/clk/tegra/clk-tegra124.c +++ b/drivers/clk/tegra/clk-tegra124.c @@ -301,8 +301,8 @@ static struct tegra_clk_init_table init_table[] = { static int tegra124_car_probe(struct device_d *dev) { car_base = dev_request_mem_region(dev, 0); - if (!car_base) - return -EBUSY; + if (IS_ERR(car_base)) + return PTR_ERR(car_base); tegra124_osc_clk_init(); tegra124_pll_init(); diff --git a/drivers/clk/tegra/clk-tegra20.c b/drivers/clk/tegra/clk-tegra20.c index 5803414b93..5b4365d492 100644 --- a/drivers/clk/tegra/clk-tegra20.c +++ b/drivers/clk/tegra/clk-tegra20.c @@ -339,8 +339,8 @@ static struct tegra_clk_init_table init_table[] = { static int tegra20_car_probe(struct device_d *dev) { car_base = dev_request_mem_region(dev, 0); - if (!car_base) - return -EBUSY; + if (IS_ERR(car_base)) + return PTR_ERR(car_base); tegra20_osc_clk_init(); tegra20_pll_init(); diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c index 3b508304c5..ed6d73625c 100644 --- a/drivers/clk/tegra/clk-tegra30.c +++ b/drivers/clk/tegra/clk-tegra30.c @@ -336,8 +336,8 @@ static struct tegra_clk_init_table init_table[] = { static int tegra30_car_probe(struct device_d *dev) { car_base = dev_request_mem_region(dev, 0); - if (!car_base) - return -EBUSY; + if (IS_ERR(car_base)) + return PTR_ERR(car_base); tegra30_osc_clk_init(); tegra30_pll_init(); |