of/device: Replace struct of_device with struct platform_device
of_device is just an alias for platform_device, so remove it entirely. Also replace to_of_device() with to_platform_device() and update comment blocks. This patch was initially generated from the following semantic patch, and then edited by hand to pick up the bits that coccinelle didn't catch. @@ @@ -struct of_device +struct platform_device Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Reviewed-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -997,7 +997,7 @@ static const struct net_device_ops fs_enet_netdev_ops = {
|
||||
#endif
|
||||
};
|
||||
|
||||
static int __devinit fs_enet_probe(struct of_device *ofdev,
|
||||
static int __devinit fs_enet_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct net_device *ndev;
|
||||
@@ -1105,7 +1105,7 @@ out_free_fpi:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int fs_enet_remove(struct of_device *ofdev)
|
||||
static int fs_enet_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct net_device *ndev = dev_get_drvdata(&ofdev->dev);
|
||||
struct fs_enet_private *fep = netdev_priv(ndev);
|
||||
|
@@ -84,7 +84,7 @@ static inline int fcc_cr_cmd(struct fs_enet_private *fep, u32 op)
|
||||
|
||||
static int do_pd_setup(struct fs_enet_private *fep)
|
||||
{
|
||||
struct of_device *ofdev = to_of_device(fep->dev);
|
||||
struct platform_device *ofdev = to_platform_device(fep->dev);
|
||||
struct fs_platform_info *fpi = fep->fpi;
|
||||
int ret = -EINVAL;
|
||||
|
||||
|
@@ -96,7 +96,7 @@ static int whack_reset(struct fec __iomem *fecp)
|
||||
|
||||
static int do_pd_setup(struct fs_enet_private *fep)
|
||||
{
|
||||
struct of_device *ofdev = to_of_device(fep->dev);
|
||||
struct platform_device *ofdev = to_platform_device(fep->dev);
|
||||
|
||||
fep->interrupt = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
|
||||
if (fep->interrupt == NO_IRQ)
|
||||
|
@@ -96,7 +96,7 @@ static inline int scc_cr_cmd(struct fs_enet_private *fep, u32 op)
|
||||
|
||||
static int do_pd_setup(struct fs_enet_private *fep)
|
||||
{
|
||||
struct of_device *ofdev = to_of_device(fep->dev);
|
||||
struct platform_device *ofdev = to_platform_device(fep->dev);
|
||||
|
||||
fep->interrupt = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
|
||||
if (fep->interrupt == NO_IRQ)
|
||||
|
@@ -150,7 +150,7 @@ static int __devinit fs_mii_bitbang_init(struct mii_bus *bus,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,
|
||||
static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct mii_bus *new_bus;
|
||||
@@ -200,7 +200,7 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int fs_enet_mdio_remove(struct of_device *ofdev)
|
||||
static int fs_enet_mdio_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct mii_bus *bus = dev_get_drvdata(&ofdev->dev);
|
||||
struct bb_info *bitbang = bus->priv;
|
||||
|
@@ -101,7 +101,7 @@ static int fs_enet_fec_mii_reset(struct mii_bus *bus)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,
|
||||
static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct resource res;
|
||||
@@ -192,7 +192,7 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int fs_enet_mdio_remove(struct of_device *ofdev)
|
||||
static int fs_enet_mdio_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct mii_bus *bus = dev_get_drvdata(&ofdev->dev);
|
||||
struct fec_info *fec = bus->priv;
|
||||
|
Reference in New Issue
Block a user