lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

trivial: pinctrl core: remove extraneous code lines

Browse Source 
In function pinctrl_get_locked, pointer p is returned on
error, and also return on no_error.
So, we just return it with no error test.

It's pretty the same in function pinctrl_lookup_state_locked:
state is returned in every case, so we drop the error test
and just return state.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
This commit is contained in:
Richard Genoud
2012-08-10 16:53:49 +02:00
committed by Linus Walleij
parent ac5aa7f9e0
commit d599bfb324
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/pinctrl/core.c
View File

@@ -657,11 +657,7 @@ static struct pinctrl *pinctrl_get_locked(struct device *dev)
if (p != NULL) if (p != NULL)
return ERR_PTR(-EBUSY); return ERR_PTR(-EBUSY);
p = create_pinctrl(dev); return create_pinctrl(dev);
if (IS_ERR(p))
return p;
return p;
} }
/** /**
@@ -738,11 +734,8 @@ static struct pinctrl_state *pinctrl_lookup_state_locked(struct pinctrl *p,
dev_dbg(p->dev, "using pinctrl dummy state (%s)\n", dev_dbg(p->dev, "using pinctrl dummy state (%s)\n",
name); name);
state = create_state(p, name); state = create_state(p, name);
if (IS_ERR(state)) } else
return state; state = ERR_PTR(-ENODEV);
} else {
return ERR_PTR(-ENODEV);
}
} }
return state; return state;