Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ac0fd00 authored by Markus Elfring's avatar Markus Elfring Committed by David S. Miller
Browse files

IBM-EMAC: Deletion of unnecessary checks before the function call "of_dev_put" 



The of_dev_put() function tests whether its argument is NULL and then
returns immediately. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 312df74c

drivers/net/ethernet/ibm/emac/core.c

+8 −16
Original line number Diff line number Diff line
@@ -2323,15 +2323,10 @@ static int emac_check_deps(struct emac_instance *dev, 


static void emac_put_deps(struct emac_instance *dev)

{

	if (dev->mal_dev)

	of_dev_put(dev->mal_dev);

	if (dev->zmii_dev)

	of_dev_put(dev->zmii_dev);

	if (dev->rgmii_dev)

	of_dev_put(dev->rgmii_dev);

	if (dev->mdio_dev)

	of_dev_put(dev->mdio_dev);

	if (dev->tah_dev)

	of_dev_put(dev->tah_dev);

}
@@ -2371,7 +2366,6 @@ static int emac_wait_deps(struct emac_instance *dev) 
	bus_unregister_notifier(&platform_bus_type, &emac_of_bus_notifier);

	err = emac_check_deps(dev, deps) ? 0 : -ENODEV;

	for (i = 0; i < EMAC_DEP_COUNT; i++) {

		if (deps[i].node)

		of_node_put(deps[i].node);

		if (err && deps[i].ofdev)

			of_dev_put(deps[i].ofdev);
@@ -2383,7 +2377,6 @@ static int emac_wait_deps(struct emac_instance *dev) 
		dev->tah_dev = deps[EMAC_DEP_TAH_IDX].ofdev;

		dev->mdio_dev = deps[EMAC_DEP_MDIO_IDX].ofdev;

	}

	if (deps[EMAC_DEP_PREV_IDX].ofdev)

	of_dev_put(deps[EMAC_DEP_PREV_IDX].ofdev);

	return err;

}
@@ -3113,7 +3106,6 @@ static void __exit emac_exit(void) 


	/* Destroy EMAC boot list */

	for (i = 0; i < EMAC_BOOT_LIST_SIZE; i++)

		if (emac_boot_list[i])

		of_node_put(emac_boot_list[i]);

}