of: Remove of_dev_{get,put}()
of_dev_get() and of_dev_put are just wrappers for get_device()/put_device()
on a platform_device. There's also already platform_device_{get,put}()
wrappers for this purpose. Let's update the few users and remove
of_dev_{get,put}().
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Felipe Balbi <balbi@kernel.org>
Cc: Julia Lawall <Julia.Lawall@inria.fr>
Cc: Gilles Muller <Gilles.Muller@inria.fr>
Cc: Nicolas Palix <nicolas.palix@imag.fr>
Cc: Michal Marek <michal.lkml@markovi.net>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: netdev@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-usb@vger.kernel.org
Cc: cocci@systeme.lip6.fr
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20210211232745.1498137-2-robh@kernel.org
This commit is contained in:
@@ -38,6 +38,7 @@
|
||||
#include <linux/of_irq.h>
|
||||
#include <linux/of_net.h>
|
||||
#include <linux/of_mdio.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
#include <asm/processor.h>
|
||||
@@ -2390,11 +2391,11 @@ static int emac_check_deps(struct emac_instance *dev,
|
||||
|
||||
static void emac_put_deps(struct emac_instance *dev)
|
||||
{
|
||||
of_dev_put(dev->mal_dev);
|
||||
of_dev_put(dev->zmii_dev);
|
||||
of_dev_put(dev->rgmii_dev);
|
||||
of_dev_put(dev->mdio_dev);
|
||||
of_dev_put(dev->tah_dev);
|
||||
platform_device_put(dev->mal_dev);
|
||||
platform_device_put(dev->zmii_dev);
|
||||
platform_device_put(dev->rgmii_dev);
|
||||
platform_device_put(dev->mdio_dev);
|
||||
platform_device_put(dev->tah_dev);
|
||||
}
|
||||
|
||||
static int emac_of_bus_notify(struct notifier_block *nb, unsigned long action,
|
||||
@@ -2435,7 +2436,7 @@ static int emac_wait_deps(struct emac_instance *dev)
|
||||
for (i = 0; i < EMAC_DEP_COUNT; i++) {
|
||||
of_node_put(deps[i].node);
|
||||
if (err)
|
||||
of_dev_put(deps[i].ofdev);
|
||||
platform_device_put(deps[i].ofdev);
|
||||
}
|
||||
if (err == 0) {
|
||||
dev->mal_dev = deps[EMAC_DEP_MAL_IDX].ofdev;
|
||||
@@ -2444,7 +2445,7 @@ 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;
|
||||
}
|
||||
of_dev_put(deps[EMAC_DEP_PREV_IDX].ofdev);
|
||||
platform_device_put(deps[EMAC_DEP_PREV_IDX].ofdev);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user