hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i2c: stm32f7: fix the get_irq error cases 

During probe, return the "get_irq" error value instead of -EINVAL which
allows the driver to be deferred probed if needed.
Fix also the case where of_irq_get() returns a negative value.
Note :
On failure of_irq_get() returns 0 or a negative value while
platform_get_irq() returns a negative value.

Fixes: aeb068c572 ("i2c: i2c-stm32f7: add driver")
Reviewed-by: Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com>
Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Fabrice Gasnier 2019-06-17 09:53:01 +02:00 committed by Wolfram Sang
parent af668d6518
commit 79b4499524
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/i2c/busses/i2c-stm32f7.c
View File

@ -25,7 +25,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pinctrl/consumer.h> #include <linux/pinctrl/consumer.h>
@ -1816,15 +1815,14 @@ static struct i2c_algorithm stm32f7_i2c_algo = {
static int stm32f7_i2c_probe(struct platform_device *pdev) static int stm32f7_i2c_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node;
struct stm32f7_i2c_dev *i2c_dev; struct stm32f7_i2c_dev *i2c_dev;
const struct stm32f7_i2c_setup *setup; const struct stm32f7_i2c_setup *setup;
struct resource *res; struct resource *res;
u32 irq_error, irq_event, clk_rate, rise_time, fall_time; u32 clk_rate, rise_time, fall_time;
struct i2c_adapter *adap; struct i2c_adapter *adap;
struct reset_control *rst; struct reset_control *rst;
dma_addr_t phy_addr; dma_addr_t phy_addr;
int ret; int irq_error, irq_event, ret;
i2c_dev = devm_kzalloc(&pdev->dev, sizeof(*i2c_dev), GFP_KERNEL); i2c_dev = devm_kzalloc(&pdev->dev, sizeof(*i2c_dev), GFP_KERNEL);
if (!i2c_dev) if (!i2c_dev)
@ -1836,16 +1834,20 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
return PTR_ERR(i2c_dev->base); return PTR_ERR(i2c_dev->base);
phy_addr = (dma_addr_t)res->start; phy_addr = (dma_addr_t)res->start;
irq_event = irq_of_parse_and_map(np, 0); irq_event = platform_get_irq(pdev, 0);
if (!irq_event) { if (irq_event <= 0) {
dev_err(&pdev->dev, "IRQ event missing or invalid\n"); if (irq_event != -EPROBE_DEFER)
return -EINVAL; dev_err(&pdev->dev, "Failed to get IRQ event: %d\n",
irq_event);
return irq_event ? : -ENOENT;
} }
irq_error = irq_of_parse_and_map(np, 1); irq_error = platform_get_irq(pdev, 1);
if (!irq_error) { if (irq_error <= 0) {
dev_err(&pdev->dev, "IRQ error missing or invalid\n"); if (irq_error != -EPROBE_DEFER)
return -EINVAL; dev_err(&pdev->dev, "Failed to get IRQ error: %d\n",
irq_error);
return irq_error ? : -ENOENT;
} }
i2c_dev->clk = devm_clk_get(&pdev->dev, NULL); i2c_dev->clk = devm_clk_get(&pdev->dev, NULL);