| Message ID | 20190726131421.70545-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] i2c: base: Drop unneeded check for of_node | expand |
On Fri, Jul 26, 2019 at 04:14:21PM +0300, Andy Shevchenko wrote: > of_find_property() will return NULL if of_node is NULL, > thus of_irq_get_by_name() returns -EINVAL which we ignore, > so no need to double check. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Applied to for-next, thanks!
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index f26ed495d384..b4d84bd475da 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -350,13 +350,11 @@ static int i2c_device_probe(struct device *dev) return -ENODEV; if (client->flags & I2C_CLIENT_WAKE) { - int wakeirq = -ENOENT; + int wakeirq; - if (dev->of_node) { - wakeirq = of_irq_get_byname(dev->of_node, "wakeup"); - if (wakeirq == -EPROBE_DEFER) - return wakeirq; - } + wakeirq = of_irq_get_byname(dev->of_node, "wakeup"); + if (wakeirq == -EPROBE_DEFER) + return wakeirq; device_init_wakeup(&client->dev, true);
of_find_property() will return NULL if of_node is NULL, thus of_irq_get_by_name() returns -EINVAL which we ignore, so no need to double check. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- - dropped other hunk from the patch (Wolfram) drivers/i2c/i2c-core-base.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)