Commit 9b4aea51 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Chanwoo Choi
Browse files

extcon: Use dev_of_node(dev) instead of dev->of_node 



The dev_of_node function should be preferred.
In the result we may drop unneeded NULL check
of the pointer to the device object.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent 0146f56b

drivers/extcon/extcon.c

+4 −8
Original line number Diff line number Diff line
@@ -1423,21 +1423,17 @@ struct extcon_dev *extcon_find_edev_by_node(struct device_node *node) 
 */

struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev, int index)

{

	struct device_node *node;

	struct device_node *node, *np = dev_of_node(dev);

	struct extcon_dev *edev;



	if (!dev)

		return ERR_PTR(-EINVAL);



	if (!dev->of_node) {

	if (!np) {

		dev_dbg(dev, "device does not have a device node entry\n");

		return ERR_PTR(-EINVAL);

	}



	node = of_parse_phandle(dev->of_node, "extcon", index);

	node = of_parse_phandle(np, "extcon", index);

	if (!node) {

		dev_dbg(dev, "failed to get phandle in %pOF node\n",

			dev->of_node);

		dev_dbg(dev, "failed to get phandle in %pOF node\n", np);

		return ERR_PTR(-ENODEV);

	}