Skip to content

Commit

Permalink
usb: dwc3: drd: Improve dwc3_get_extcon() style
Browse files Browse the repository at this point in the history
The previous change ("usb: dwc3: drd: Avoid error when extcon is
missing") changed the code flow in dwc3_get_extcon() function, leading
to unnecessary if-branch. This patch does housekeeping by reworking the
code for obtaining an extcon device from the "port" node.

Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Link: https://lore.kernel.org/r/20201214110741.8512-3-semen.protsenko@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Sam Protsenko authored and Greg Kroah-Hartman committed Dec 28, 2020
1 parent c824c73 commit cb4d9b5
Showing 1 changed file with 9 additions and 12 deletions.
21 changes: 9 additions & 12 deletions drivers/usb/dwc3/drd.c
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,8 @@ static int dwc3_drd_notifier(struct notifier_block *nb,
static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc)
{
struct device *dev = dwc->dev;
struct device_node *np_phy, *np_conn;
struct extcon_dev *edev;
struct device_node *np_phy;
struct extcon_dev *edev = NULL;
const char *name;

if (device_property_read_bool(dev, "extcon"))
Expand Down Expand Up @@ -470,17 +470,14 @@ static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc)
* or OTG mode.
*/
np_phy = of_parse_phandle(dev->of_node, "phys", 0);
if (of_graph_is_present(np_phy))
np_conn = of_graph_get_remote_node(np_phy, -1, -1);
else
np_conn = NULL;

if (np_conn)
edev = extcon_find_edev_by_node(np_conn);
else
edev = NULL;
if (of_graph_is_present(np_phy)) {
struct device_node *np_conn;

of_node_put(np_conn);
np_conn = of_graph_get_remote_node(np_phy, -1, -1);
if (np_conn)
edev = extcon_find_edev_by_node(np_conn);
of_node_put(np_conn);
}
of_node_put(np_phy);

return edev;
Expand Down

0 comments on commit cb4d9b5

Please sign in to comment.