mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
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 <[email protected]> Reviewed-by: David S. Miller <[email protected]>
This commit is contained in:
Grant Likely
parent
fc1caf6eaf
commit
2dc1158137
158 changed files with 519 additions and 527 deletions
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
struct mpc5xxx_can_data {
|
||||
unsigned int type;
|
||||
u32 (*get_clock)(struct of_device *ofdev, const char *clock_name,
|
||||
u32 (*get_clock)(struct platform_device *ofdev, const char *clock_name,
|
||||
int *mscan_clksrc);
|
||||
};
|
||||
|
||||
|
|
@ -48,7 +48,7 @@ static struct of_device_id __devinitdata mpc52xx_cdm_ids[] = {
|
|||
{}
|
||||
};
|
||||
|
||||
static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev,
|
||||
static u32 __devinit mpc52xx_can_get_clock(struct platform_device *ofdev,
|
||||
const char *clock_name,
|
||||
int *mscan_clksrc)
|
||||
{
|
||||
|
|
@ -101,7 +101,7 @@ static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev,
|
|||
return freq;
|
||||
}
|
||||
#else /* !CONFIG_PPC_MPC52xx */
|
||||
static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev,
|
||||
static u32 __devinit mpc52xx_can_get_clock(struct platform_device *ofdev,
|
||||
const char *clock_name,
|
||||
int *mscan_clksrc)
|
||||
{
|
||||
|
|
@ -129,7 +129,7 @@ static struct of_device_id __devinitdata mpc512x_clock_ids[] = {
|
|||
{}
|
||||
};
|
||||
|
||||
static u32 __devinit mpc512x_can_get_clock(struct of_device *ofdev,
|
||||
static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev,
|
||||
const char *clock_name,
|
||||
int *mscan_clksrc)
|
||||
{
|
||||
|
|
@ -239,7 +239,7 @@ exit_unmap:
|
|||
return freq;
|
||||
}
|
||||
#else /* !CONFIG_PPC_MPC512x */
|
||||
static u32 __devinit mpc512x_can_get_clock(struct of_device *ofdev,
|
||||
static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev,
|
||||
const char *clock_name,
|
||||
int *mscan_clksrc)
|
||||
{
|
||||
|
|
@ -247,7 +247,7 @@ static u32 __devinit mpc512x_can_get_clock(struct of_device *ofdev,
|
|||
}
|
||||
#endif /* CONFIG_PPC_MPC512x */
|
||||
|
||||
static int __devinit mpc5xxx_can_probe(struct of_device *ofdev,
|
||||
static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *id)
|
||||
{
|
||||
struct mpc5xxx_can_data *data = (struct mpc5xxx_can_data *)id->data;
|
||||
|
|
@ -317,7 +317,7 @@ exit_unmap_mem:
|
|||
return err;
|
||||
}
|
||||
|
||||
static int __devexit mpc5xxx_can_remove(struct of_device *ofdev)
|
||||
static int __devexit mpc5xxx_can_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct net_device *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct mscan_priv *priv = netdev_priv(dev);
|
||||
|
|
@ -334,7 +334,7 @@ static int __devexit mpc5xxx_can_remove(struct of_device *ofdev)
|
|||
|
||||
#ifdef CONFIG_PM
|
||||
static struct mscan_regs saved_regs;
|
||||
static int mpc5xxx_can_suspend(struct of_device *ofdev, pm_message_t state)
|
||||
static int mpc5xxx_can_suspend(struct platform_device *ofdev, pm_message_t state)
|
||||
{
|
||||
struct net_device *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct mscan_priv *priv = netdev_priv(dev);
|
||||
|
|
@ -345,7 +345,7 @@ static int mpc5xxx_can_suspend(struct of_device *ofdev, pm_message_t state)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int mpc5xxx_can_resume(struct of_device *ofdev)
|
||||
static int mpc5xxx_can_resume(struct platform_device *ofdev)
|
||||
{
|
||||
struct net_device *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct mscan_priv *priv = netdev_priv(dev);
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ static void sja1000_ofp_write_reg(const struct sja1000_priv *priv,
|
|||
out_8(priv->reg_base + reg, val);
|
||||
}
|
||||
|
||||
static int __devexit sja1000_ofp_remove(struct of_device *ofdev)
|
||||
static int __devexit sja1000_ofp_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct net_device *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct sja1000_priv *priv = netdev_priv(dev);
|
||||
|
|
@ -87,7 +87,7 @@ static int __devexit sja1000_ofp_remove(struct of_device *ofdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit sja1000_ofp_probe(struct of_device *ofdev,
|
||||
static int __devinit sja1000_ofp_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *id)
|
||||
{
|
||||
struct device_node *np = ofdev->dev.of_node;
|
||||
|
|
|
|||
|
|
@ -413,7 +413,7 @@ struct ehea_port_res {
|
|||
|
||||
struct ehea_adapter {
|
||||
u64 handle;
|
||||
struct of_device *ofdev;
|
||||
struct platform_device *ofdev;
|
||||
struct ehea_port *port[EHEA_MAX_PORTS];
|
||||
struct ehea_eq *neq; /* notification event queue */
|
||||
struct tasklet_struct neq_tasklet;
|
||||
|
|
@ -465,7 +465,7 @@ struct ehea_port {
|
|||
struct net_device *netdev;
|
||||
struct net_device_stats stats;
|
||||
struct ehea_port_res port_res[EHEA_MAX_PORT_RES];
|
||||
struct of_device ofdev; /* Open Firmware Device */
|
||||
struct platform_device ofdev; /* Open Firmware Device */
|
||||
struct ehea_mc_list *mc_list; /* Multicast MAC addresses */
|
||||
struct vlan_group *vgrp;
|
||||
struct ehea_eq *qp_eq;
|
||||
|
|
|
|||
|
|
@ -107,10 +107,10 @@ struct ehea_fw_handle_array ehea_fw_handles;
|
|||
struct ehea_bcmc_reg_array ehea_bcmc_regs;
|
||||
|
||||
|
||||
static int __devinit ehea_probe_adapter(struct of_device *dev,
|
||||
static int __devinit ehea_probe_adapter(struct platform_device *dev,
|
||||
const struct of_device_id *id);
|
||||
|
||||
static int __devexit ehea_remove(struct of_device *dev);
|
||||
static int __devexit ehea_remove(struct platform_device *dev);
|
||||
|
||||
static struct of_device_id ehea_device_table[] = {
|
||||
{
|
||||
|
|
@ -3376,7 +3376,7 @@ static ssize_t ehea_remove_port(struct device *dev,
|
|||
static DEVICE_ATTR(probe_port, S_IWUSR, NULL, ehea_probe_port);
|
||||
static DEVICE_ATTR(remove_port, S_IWUSR, NULL, ehea_remove_port);
|
||||
|
||||
int ehea_create_device_sysfs(struct of_device *dev)
|
||||
int ehea_create_device_sysfs(struct platform_device *dev)
|
||||
{
|
||||
int ret = device_create_file(&dev->dev, &dev_attr_probe_port);
|
||||
if (ret)
|
||||
|
|
@ -3387,13 +3387,13 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
void ehea_remove_device_sysfs(struct of_device *dev)
|
||||
void ehea_remove_device_sysfs(struct platform_device *dev)
|
||||
{
|
||||
device_remove_file(&dev->dev, &dev_attr_probe_port);
|
||||
device_remove_file(&dev->dev, &dev_attr_remove_port);
|
||||
}
|
||||
|
||||
static int __devinit ehea_probe_adapter(struct of_device *dev,
|
||||
static int __devinit ehea_probe_adapter(struct platform_device *dev,
|
||||
const struct of_device_id *id)
|
||||
{
|
||||
struct ehea_adapter *adapter;
|
||||
|
|
@ -3492,7 +3492,7 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit ehea_remove(struct of_device *dev)
|
||||
static int __devexit ehea_remove(struct platform_device *dev)
|
||||
{
|
||||
struct ehea_adapter *adapter = dev_get_drvdata(&dev->dev);
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -850,7 +850,7 @@ static const struct net_device_ops mpc52xx_fec_netdev_ops = {
|
|||
/* ======================================================================== */
|
||||
|
||||
static int __devinit
|
||||
mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
|
||||
mpc52xx_fec_probe(struct platform_device *op, const struct of_device_id *match)
|
||||
{
|
||||
int rv;
|
||||
struct net_device *ndev;
|
||||
|
|
@ -995,7 +995,7 @@ err_netdev:
|
|||
}
|
||||
|
||||
static int
|
||||
mpc52xx_fec_remove(struct of_device *op)
|
||||
mpc52xx_fec_remove(struct platform_device *op)
|
||||
{
|
||||
struct net_device *ndev;
|
||||
struct mpc52xx_fec_priv *priv;
|
||||
|
|
@ -1025,7 +1025,7 @@ mpc52xx_fec_remove(struct of_device *op)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int mpc52xx_fec_of_suspend(struct of_device *op, pm_message_t state)
|
||||
static int mpc52xx_fec_of_suspend(struct platform_device *op, pm_message_t state)
|
||||
{
|
||||
struct net_device *dev = dev_get_drvdata(&op->dev);
|
||||
|
||||
|
|
@ -1035,7 +1035,7 @@ static int mpc52xx_fec_of_suspend(struct of_device *op, pm_message_t state)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int mpc52xx_fec_of_resume(struct of_device *op)
|
||||
static int mpc52xx_fec_of_resume(struct platform_device *op)
|
||||
{
|
||||
struct net_device *dev = dev_get_drvdata(&op->dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ static int mpc52xx_fec_mdio_write(struct mii_bus *bus, int phy_id, int reg,
|
|||
data | FEC_MII_WRITE_FRAME);
|
||||
}
|
||||
|
||||
static int mpc52xx_fec_mdio_probe(struct of_device *of,
|
||||
static int mpc52xx_fec_mdio_probe(struct platform_device *of,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct device *dev = &of->dev;
|
||||
|
|
@ -122,7 +122,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
|
|||
return err;
|
||||
}
|
||||
|
||||
static int mpc52xx_fec_mdio_remove(struct of_device *of)
|
||||
static int mpc52xx_fec_mdio_remove(struct platform_device *of)
|
||||
{
|
||||
struct device *dev = &of->dev;
|
||||
struct mii_bus *bus = dev_get_drvdata(dev);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ static int get_ucc_id_for_range(u64 start, u64 end, u32 *ucc_id)
|
|||
#endif
|
||||
|
||||
|
||||
static int fsl_pq_mdio_probe(struct of_device *ofdev,
|
||||
static int fsl_pq_mdio_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *np = ofdev->dev.of_node;
|
||||
|
|
@ -425,7 +425,7 @@ err_free_priv:
|
|||
}
|
||||
|
||||
|
||||
static int fsl_pq_mdio_remove(struct of_device *ofdev)
|
||||
static int fsl_pq_mdio_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct device *device = &ofdev->dev;
|
||||
struct mii_bus *bus = dev_get_drvdata(device);
|
||||
|
|
|
|||
|
|
@ -122,9 +122,9 @@ static irqreturn_t gfar_interrupt(int irq, void *dev_id);
|
|||
static void adjust_link(struct net_device *dev);
|
||||
static void init_registers(struct net_device *dev);
|
||||
static int init_phy(struct net_device *dev);
|
||||
static int gfar_probe(struct of_device *ofdev,
|
||||
static int gfar_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *match);
|
||||
static int gfar_remove(struct of_device *ofdev);
|
||||
static int gfar_remove(struct platform_device *ofdev);
|
||||
static void free_skb_resources(struct gfar_private *priv);
|
||||
static void gfar_set_multi(struct net_device *dev);
|
||||
static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr);
|
||||
|
|
@ -605,7 +605,7 @@ static int gfar_parse_group(struct device_node *np,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int gfar_of_init(struct of_device *ofdev, struct net_device **pdev)
|
||||
static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
|
||||
{
|
||||
const char *model;
|
||||
const char *ctype;
|
||||
|
|
@ -959,7 +959,7 @@ static void gfar_detect_errata(struct gfar_private *priv)
|
|||
|
||||
/* Set up the ethernet device structure, private data,
|
||||
* and anything else we need before we start */
|
||||
static int gfar_probe(struct of_device *ofdev,
|
||||
static int gfar_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
u32 tempval;
|
||||
|
|
@ -1238,7 +1238,7 @@ register_fail:
|
|||
return err;
|
||||
}
|
||||
|
||||
static int gfar_remove(struct of_device *ofdev)
|
||||
static int gfar_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct gfar_private *priv = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -1054,7 +1054,7 @@ struct gfar_private {
|
|||
|
||||
struct device_node *node;
|
||||
struct net_device *ndev;
|
||||
struct of_device *ofdev;
|
||||
struct platform_device *ofdev;
|
||||
enum gfar_errata errata;
|
||||
|
||||
struct gfar_priv_grp gfargrp[MAXGROUPS];
|
||||
|
|
|
|||
|
|
@ -1373,7 +1373,7 @@ error:
|
|||
}
|
||||
|
||||
/* Initialize the GRETH MAC */
|
||||
static int __devinit greth_of_probe(struct of_device *ofdev, const struct of_device_id *match)
|
||||
static int __devinit greth_of_probe(struct platform_device *ofdev, const struct of_device_id *match)
|
||||
{
|
||||
struct net_device *dev;
|
||||
struct greth_private *greth;
|
||||
|
|
@ -1572,7 +1572,7 @@ error1:
|
|||
return err;
|
||||
}
|
||||
|
||||
static int __devexit greth_of_remove(struct of_device *of_dev)
|
||||
static int __devexit greth_of_remove(struct platform_device *of_dev)
|
||||
{
|
||||
struct net_device *ndev = dev_get_drvdata(&of_dev->dev);
|
||||
struct greth_private *greth = netdev_priv(ndev);
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ struct greth_private {
|
|||
|
||||
int irq;
|
||||
|
||||
struct device *dev; /* Pointer to of_device->dev */
|
||||
struct device *dev; /* Pointer to platform_device->dev */
|
||||
struct net_device *netdev;
|
||||
struct napi_struct napi;
|
||||
spinlock_t devlock;
|
||||
|
|
|
|||
|
|
@ -2245,7 +2245,7 @@ static int emac_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
|
|||
struct emac_depentry {
|
||||
u32 phandle;
|
||||
struct device_node *node;
|
||||
struct of_device *ofdev;
|
||||
struct platform_device *ofdev;
|
||||
void *drvdata;
|
||||
};
|
||||
|
||||
|
|
@ -2719,7 +2719,7 @@ static const struct net_device_ops emac_gige_netdev_ops = {
|
|||
.ndo_change_mtu = emac_change_mtu,
|
||||
};
|
||||
|
||||
static int __devinit emac_probe(struct of_device *ofdev,
|
||||
static int __devinit emac_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct net_device *ndev;
|
||||
|
|
@ -2941,7 +2941,7 @@ static int __devinit emac_probe(struct of_device *ofdev,
|
|||
return err;
|
||||
}
|
||||
|
||||
static int __devexit emac_remove(struct of_device *ofdev)
|
||||
static int __devexit emac_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct emac_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -170,12 +170,12 @@ struct emac_instance {
|
|||
struct net_device *ndev;
|
||||
struct resource rsrc_regs;
|
||||
struct emac_regs __iomem *emacp;
|
||||
struct of_device *ofdev;
|
||||
struct platform_device *ofdev;
|
||||
struct device_node **blist; /* bootlist entry */
|
||||
|
||||
/* MAL linkage */
|
||||
u32 mal_ph;
|
||||
struct of_device *mal_dev;
|
||||
struct platform_device *mal_dev;
|
||||
u32 mal_rx_chan;
|
||||
u32 mal_tx_chan;
|
||||
struct mal_instance *mal;
|
||||
|
|
@ -196,24 +196,24 @@ struct emac_instance {
|
|||
|
||||
/* Shared MDIO if any */
|
||||
u32 mdio_ph;
|
||||
struct of_device *mdio_dev;
|
||||
struct platform_device *mdio_dev;
|
||||
struct emac_instance *mdio_instance;
|
||||
struct mutex mdio_lock;
|
||||
|
||||
/* ZMII infos if any */
|
||||
u32 zmii_ph;
|
||||
u32 zmii_port;
|
||||
struct of_device *zmii_dev;
|
||||
struct platform_device *zmii_dev;
|
||||
|
||||
/* RGMII infos if any */
|
||||
u32 rgmii_ph;
|
||||
u32 rgmii_port;
|
||||
struct of_device *rgmii_dev;
|
||||
struct platform_device *rgmii_dev;
|
||||
|
||||
/* TAH infos if any */
|
||||
u32 tah_ph;
|
||||
u32 tah_port;
|
||||
struct of_device *tah_dev;
|
||||
struct platform_device *tah_dev;
|
||||
|
||||
/* IRQs */
|
||||
int wol_irq;
|
||||
|
|
|
|||
|
|
@ -517,7 +517,7 @@ void *mal_dump_regs(struct mal_instance *mal, void *buf)
|
|||
return regs + 1;
|
||||
}
|
||||
|
||||
static int __devinit mal_probe(struct of_device *ofdev,
|
||||
static int __devinit mal_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct mal_instance *mal;
|
||||
|
|
@ -730,7 +730,7 @@ static int __devinit mal_probe(struct of_device *ofdev,
|
|||
return err;
|
||||
}
|
||||
|
||||
static int __devexit mal_remove(struct of_device *ofdev)
|
||||
static int __devexit mal_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct mal_instance *mal = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ struct mal_instance {
|
|||
dma_addr_t bd_dma;
|
||||
struct mal_descriptor *bd_virt;
|
||||
|
||||
struct of_device *ofdev;
|
||||
struct platform_device *ofdev;
|
||||
int index;
|
||||
spinlock_t lock;
|
||||
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ static inline u32 rgmii_mode_mask(int mode, int input)
|
|||
}
|
||||
}
|
||||
|
||||
int __devinit rgmii_attach(struct of_device *ofdev, int input, int mode)
|
||||
int __devinit rgmii_attach(struct platform_device *ofdev, int input, int mode)
|
||||
{
|
||||
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct rgmii_regs __iomem *p = dev->base;
|
||||
|
|
@ -122,7 +122,7 @@ int __devinit rgmii_attach(struct of_device *ofdev, int input, int mode)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void rgmii_set_speed(struct of_device *ofdev, int input, int speed)
|
||||
void rgmii_set_speed(struct platform_device *ofdev, int input, int speed)
|
||||
{
|
||||
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct rgmii_regs __iomem *p = dev->base;
|
||||
|
|
@ -144,7 +144,7 @@ void rgmii_set_speed(struct of_device *ofdev, int input, int speed)
|
|||
mutex_unlock(&dev->lock);
|
||||
}
|
||||
|
||||
void rgmii_get_mdio(struct of_device *ofdev, int input)
|
||||
void rgmii_get_mdio(struct platform_device *ofdev, int input)
|
||||
{
|
||||
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct rgmii_regs __iomem *p = dev->base;
|
||||
|
|
@ -165,7 +165,7 @@ void rgmii_get_mdio(struct of_device *ofdev, int input)
|
|||
DBG2(dev, " fer = 0x%08x\n", fer);
|
||||
}
|
||||
|
||||
void rgmii_put_mdio(struct of_device *ofdev, int input)
|
||||
void rgmii_put_mdio(struct platform_device *ofdev, int input)
|
||||
{
|
||||
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct rgmii_regs __iomem *p = dev->base;
|
||||
|
|
@ -186,7 +186,7 @@ void rgmii_put_mdio(struct of_device *ofdev, int input)
|
|||
mutex_unlock(&dev->lock);
|
||||
}
|
||||
|
||||
void rgmii_detach(struct of_device *ofdev, int input)
|
||||
void rgmii_detach(struct platform_device *ofdev, int input)
|
||||
{
|
||||
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct rgmii_regs __iomem *p;
|
||||
|
|
@ -206,13 +206,13 @@ void rgmii_detach(struct of_device *ofdev, int input)
|
|||
mutex_unlock(&dev->lock);
|
||||
}
|
||||
|
||||
int rgmii_get_regs_len(struct of_device *ofdev)
|
||||
int rgmii_get_regs_len(struct platform_device *ofdev)
|
||||
{
|
||||
return sizeof(struct emac_ethtool_regs_subhdr) +
|
||||
sizeof(struct rgmii_regs);
|
||||
}
|
||||
|
||||
void *rgmii_dump_regs(struct of_device *ofdev, void *buf)
|
||||
void *rgmii_dump_regs(struct platform_device *ofdev, void *buf)
|
||||
{
|
||||
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct emac_ethtool_regs_subhdr *hdr = buf;
|
||||
|
|
@ -228,7 +228,7 @@ void *rgmii_dump_regs(struct of_device *ofdev, void *buf)
|
|||
}
|
||||
|
||||
|
||||
static int __devinit rgmii_probe(struct of_device *ofdev,
|
||||
static int __devinit rgmii_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *np = ofdev->dev.of_node;
|
||||
|
|
@ -293,7 +293,7 @@ static int __devinit rgmii_probe(struct of_device *ofdev,
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int __devexit rgmii_remove(struct of_device *ofdev)
|
||||
static int __devexit rgmii_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -51,20 +51,20 @@ struct rgmii_instance {
|
|||
int users;
|
||||
|
||||
/* OF device instance */
|
||||
struct of_device *ofdev;
|
||||
struct platform_device *ofdev;
|
||||
};
|
||||
|
||||
#ifdef CONFIG_IBM_NEW_EMAC_RGMII
|
||||
|
||||
extern int rgmii_init(void);
|
||||
extern void rgmii_exit(void);
|
||||
extern int rgmii_attach(struct of_device *ofdev, int input, int mode);
|
||||
extern void rgmii_detach(struct of_device *ofdev, int input);
|
||||
extern void rgmii_get_mdio(struct of_device *ofdev, int input);
|
||||
extern void rgmii_put_mdio(struct of_device *ofdev, int input);
|
||||
extern void rgmii_set_speed(struct of_device *ofdev, int input, int speed);
|
||||
extern int rgmii_get_regs_len(struct of_device *ofdev);
|
||||
extern void *rgmii_dump_regs(struct of_device *ofdev, void *buf);
|
||||
extern int rgmii_attach(struct platform_device *ofdev, int input, int mode);
|
||||
extern void rgmii_detach(struct platform_device *ofdev, int input);
|
||||
extern void rgmii_get_mdio(struct platform_device *ofdev, int input);
|
||||
extern void rgmii_put_mdio(struct platform_device *ofdev, int input);
|
||||
extern void rgmii_set_speed(struct platform_device *ofdev, int input, int speed);
|
||||
extern int rgmii_get_regs_len(struct platform_device *ofdev);
|
||||
extern void *rgmii_dump_regs(struct platform_device *ofdev, void *buf);
|
||||
|
||||
#else
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include "emac.h"
|
||||
#include "core.h"
|
||||
|
||||
int __devinit tah_attach(struct of_device *ofdev, int channel)
|
||||
int __devinit tah_attach(struct platform_device *ofdev, int channel)
|
||||
{
|
||||
struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ int __devinit tah_attach(struct of_device *ofdev, int channel)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void tah_detach(struct of_device *ofdev, int channel)
|
||||
void tah_detach(struct platform_device *ofdev, int channel)
|
||||
{
|
||||
struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ void tah_detach(struct of_device *ofdev, int channel)
|
|||
mutex_unlock(&dev->lock);
|
||||
}
|
||||
|
||||
void tah_reset(struct of_device *ofdev)
|
||||
void tah_reset(struct platform_device *ofdev)
|
||||
{
|
||||
struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct tah_regs __iomem *p = dev->base;
|
||||
|
|
@ -66,13 +66,13 @@ void tah_reset(struct of_device *ofdev)
|
|||
TAH_MR_DIG);
|
||||
}
|
||||
|
||||
int tah_get_regs_len(struct of_device *ofdev)
|
||||
int tah_get_regs_len(struct platform_device *ofdev)
|
||||
{
|
||||
return sizeof(struct emac_ethtool_regs_subhdr) +
|
||||
sizeof(struct tah_regs);
|
||||
}
|
||||
|
||||
void *tah_dump_regs(struct of_device *ofdev, void *buf)
|
||||
void *tah_dump_regs(struct platform_device *ofdev, void *buf)
|
||||
{
|
||||
struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct emac_ethtool_regs_subhdr *hdr = buf;
|
||||
|
|
@ -87,7 +87,7 @@ void *tah_dump_regs(struct of_device *ofdev, void *buf)
|
|||
return regs + 1;
|
||||
}
|
||||
|
||||
static int __devinit tah_probe(struct of_device *ofdev,
|
||||
static int __devinit tah_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *np = ofdev->dev.of_node;
|
||||
|
|
@ -139,7 +139,7 @@ static int __devinit tah_probe(struct of_device *ofdev,
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int __devexit tah_remove(struct of_device *ofdev)
|
||||
static int __devexit tah_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ struct tah_instance {
|
|||
int users;
|
||||
|
||||
/* OF device instance */
|
||||
struct of_device *ofdev;
|
||||
struct platform_device *ofdev;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -74,11 +74,11 @@ struct tah_instance {
|
|||
|
||||
extern int tah_init(void);
|
||||
extern void tah_exit(void);
|
||||
extern int tah_attach(struct of_device *ofdev, int channel);
|
||||
extern void tah_detach(struct of_device *ofdev, int channel);
|
||||
extern void tah_reset(struct of_device *ofdev);
|
||||
extern int tah_get_regs_len(struct of_device *ofdev);
|
||||
extern void *tah_dump_regs(struct of_device *ofdev, void *buf);
|
||||
extern int tah_attach(struct platform_device *ofdev, int channel);
|
||||
extern void tah_detach(struct platform_device *ofdev, int channel);
|
||||
extern void tah_reset(struct platform_device *ofdev);
|
||||
extern int tah_get_regs_len(struct platform_device *ofdev);
|
||||
extern void *tah_dump_regs(struct platform_device *ofdev, void *buf);
|
||||
|
||||
#else
|
||||
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ static inline u32 zmii_mode_mask(int mode, int input)
|
|||
}
|
||||
}
|
||||
|
||||
int __devinit zmii_attach(struct of_device *ofdev, int input, int *mode)
|
||||
int __devinit zmii_attach(struct platform_device *ofdev, int input, int *mode)
|
||||
{
|
||||
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct zmii_regs __iomem *p = dev->base;
|
||||
|
|
@ -148,7 +148,7 @@ int __devinit zmii_attach(struct of_device *ofdev, int input, int *mode)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void zmii_get_mdio(struct of_device *ofdev, int input)
|
||||
void zmii_get_mdio(struct platform_device *ofdev, int input)
|
||||
{
|
||||
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
u32 fer;
|
||||
|
|
@ -161,7 +161,7 @@ void zmii_get_mdio(struct of_device *ofdev, int input)
|
|||
out_be32(&dev->base->fer, fer | ZMII_FER_MDI(input));
|
||||
}
|
||||
|
||||
void zmii_put_mdio(struct of_device *ofdev, int input)
|
||||
void zmii_put_mdio(struct platform_device *ofdev, int input)
|
||||
{
|
||||
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
|
|
@ -170,7 +170,7 @@ void zmii_put_mdio(struct of_device *ofdev, int input)
|
|||
}
|
||||
|
||||
|
||||
void zmii_set_speed(struct of_device *ofdev, int input, int speed)
|
||||
void zmii_set_speed(struct platform_device *ofdev, int input, int speed)
|
||||
{
|
||||
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
u32 ssr;
|
||||
|
|
@ -191,7 +191,7 @@ void zmii_set_speed(struct of_device *ofdev, int input, int speed)
|
|||
mutex_unlock(&dev->lock);
|
||||
}
|
||||
|
||||
void zmii_detach(struct of_device *ofdev, int input)
|
||||
void zmii_detach(struct platform_device *ofdev, int input)
|
||||
{
|
||||
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
|
|
@ -210,13 +210,13 @@ void zmii_detach(struct of_device *ofdev, int input)
|
|||
mutex_unlock(&dev->lock);
|
||||
}
|
||||
|
||||
int zmii_get_regs_len(struct of_device *ofdev)
|
||||
int zmii_get_regs_len(struct platform_device *ofdev)
|
||||
{
|
||||
return sizeof(struct emac_ethtool_regs_subhdr) +
|
||||
sizeof(struct zmii_regs);
|
||||
}
|
||||
|
||||
void *zmii_dump_regs(struct of_device *ofdev, void *buf)
|
||||
void *zmii_dump_regs(struct platform_device *ofdev, void *buf)
|
||||
{
|
||||
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct emac_ethtool_regs_subhdr *hdr = buf;
|
||||
|
|
@ -231,7 +231,7 @@ void *zmii_dump_regs(struct of_device *ofdev, void *buf)
|
|||
return regs + 1;
|
||||
}
|
||||
|
||||
static int __devinit zmii_probe(struct of_device *ofdev,
|
||||
static int __devinit zmii_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *np = ofdev->dev.of_node;
|
||||
|
|
@ -286,7 +286,7 @@ static int __devinit zmii_probe(struct of_device *ofdev,
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int __devexit zmii_remove(struct of_device *ofdev)
|
||||
static int __devexit zmii_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -48,20 +48,20 @@ struct zmii_instance {
|
|||
u32 fer_save;
|
||||
|
||||
/* OF device instance */
|
||||
struct of_device *ofdev;
|
||||
struct platform_device *ofdev;
|
||||
};
|
||||
|
||||
#ifdef CONFIG_IBM_NEW_EMAC_ZMII
|
||||
|
||||
extern int zmii_init(void);
|
||||
extern void zmii_exit(void);
|
||||
extern int zmii_attach(struct of_device *ofdev, int input, int *mode);
|
||||
extern void zmii_detach(struct of_device *ofdev, int input);
|
||||
extern void zmii_get_mdio(struct of_device *ofdev, int input);
|
||||
extern void zmii_put_mdio(struct of_device *ofdev, int input);
|
||||
extern void zmii_set_speed(struct of_device *ofdev, int input, int speed);
|
||||
extern int zmii_get_regs_len(struct of_device *ocpdev);
|
||||
extern void *zmii_dump_regs(struct of_device *ofdev, void *buf);
|
||||
extern int zmii_attach(struct platform_device *ofdev, int input, int *mode);
|
||||
extern void zmii_detach(struct platform_device *ofdev, int input);
|
||||
extern void zmii_get_mdio(struct platform_device *ofdev, int input);
|
||||
extern void zmii_put_mdio(struct platform_device *ofdev, int input);
|
||||
extern void zmii_set_speed(struct platform_device *ofdev, int input, int speed);
|
||||
extern int zmii_get_regs_len(struct platform_device *ocpdev);
|
||||
extern void *zmii_dump_regs(struct platform_device *ofdev, void *buf);
|
||||
|
||||
#else
|
||||
# define zmii_init() 0
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ static void temac_dma_dcr_out(struct temac_local *lp, int reg, u32 value)
|
|||
* temac_dcr_setup - If the DMA is DCR based, then setup the address and
|
||||
* I/O functions
|
||||
*/
|
||||
static int temac_dcr_setup(struct temac_local *lp, struct of_device *op,
|
||||
static int temac_dcr_setup(struct temac_local *lp, struct platform_device *op,
|
||||
struct device_node *np)
|
||||
{
|
||||
unsigned int dcrs;
|
||||
|
|
@ -184,7 +184,7 @@ static int temac_dcr_setup(struct temac_local *lp, struct of_device *op,
|
|||
* temac_dcr_setup - This is a stub for when DCR is not supported,
|
||||
* such as with MicroBlaze
|
||||
*/
|
||||
static int temac_dcr_setup(struct temac_local *lp, struct of_device *op,
|
||||
static int temac_dcr_setup(struct temac_local *lp, struct platform_device *op,
|
||||
struct device_node *np)
|
||||
{
|
||||
return -1;
|
||||
|
|
@ -952,7 +952,7 @@ static const struct attribute_group temac_attr_group = {
|
|||
};
|
||||
|
||||
static int __init
|
||||
temac_of_probe(struct of_device *op, const struct of_device_id *match)
|
||||
temac_of_probe(struct platform_device *op, const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *np;
|
||||
struct temac_local *lp;
|
||||
|
|
@ -1094,7 +1094,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int __devexit temac_of_remove(struct of_device *op)
|
||||
static int __devexit temac_of_remove(struct platform_device *op)
|
||||
{
|
||||
struct net_device *ndev = dev_get_drvdata(&op->dev);
|
||||
struct temac_local *lp = netdev_priv(ndev);
|
||||
|
|
|
|||
|
|
@ -926,7 +926,7 @@ static const struct net_device_ops myri_ops = {
|
|||
.ndo_validate_addr = eth_validate_addr,
|
||||
};
|
||||
|
||||
static int __devinit myri_sbus_probe(struct of_device *op, const struct of_device_id *match)
|
||||
static int __devinit myri_sbus_probe(struct platform_device *op, const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *dp = op->dev.of_node;
|
||||
static unsigned version_printed;
|
||||
|
|
@ -1124,7 +1124,7 @@ err:
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
static int __devexit myri_sbus_remove(struct of_device *op)
|
||||
static int __devexit myri_sbus_remove(struct platform_device *op)
|
||||
{
|
||||
struct myri_eth *mp = dev_get_drvdata(&op->dev);
|
||||
struct net_device *net_dev = mp->dev;
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ struct myri_eth {
|
|||
struct myri_eeprom eeprom; /* Local copy of EEPROM. */
|
||||
unsigned int reg_size; /* Size of register space. */
|
||||
unsigned int shmem_base; /* Offset to shared ram. */
|
||||
struct of_device *myri_op; /* Our OF device struct. */
|
||||
struct platform_device *myri_op; /* Our OF device struct. */
|
||||
};
|
||||
|
||||
/* We use this to acquire receive skb's that we can DMA directly into. */
|
||||
|
|
|
|||
|
|
@ -9103,7 +9103,7 @@ retry:
|
|||
static int __devinit niu_n2_irq_init(struct niu *np, u8 *ldg_num_map)
|
||||
{
|
||||
#ifdef CONFIG_SPARC64
|
||||
struct of_device *op = np->op;
|
||||
struct platform_device *op = np->op;
|
||||
const u32 *int_prop;
|
||||
int i;
|
||||
|
||||
|
|
@ -9688,7 +9688,7 @@ static void __devinit niu_driver_version(void)
|
|||
|
||||
static struct net_device * __devinit niu_alloc_and_init(
|
||||
struct device *gen_dev, struct pci_dev *pdev,
|
||||
struct of_device *op, const struct niu_ops *ops,
|
||||
struct platform_device *op, const struct niu_ops *ops,
|
||||
u8 port)
|
||||
{
|
||||
struct net_device *dev;
|
||||
|
|
@ -10064,7 +10064,7 @@ static const struct niu_ops niu_phys_ops = {
|
|||
.unmap_single = niu_phys_unmap_single,
|
||||
};
|
||||
|
||||
static int __devinit niu_of_probe(struct of_device *op,
|
||||
static int __devinit niu_of_probe(struct platform_device *op,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
union niu_parent_id parent_id;
|
||||
|
|
@ -10179,7 +10179,7 @@ err_out:
|
|||
return err;
|
||||
}
|
||||
|
||||
static int __devexit niu_of_remove(struct of_device *op)
|
||||
static int __devexit niu_of_remove(struct platform_device *op)
|
||||
{
|
||||
struct net_device *dev = dev_get_drvdata(&op->dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -188,7 +188,7 @@ static int __devexit mdio_gpio_remove(struct platform_device *pdev)
|
|||
|
||||
#ifdef CONFIG_OF_GPIO
|
||||
|
||||
static int __devinit mdio_ofgpio_probe(struct of_device *ofdev,
|
||||
static int __devinit mdio_ofgpio_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct mdio_gpio_platform_data *pdata;
|
||||
|
|
@ -224,7 +224,7 @@ out_free:
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
static int __devexit mdio_ofgpio_remove(struct of_device *ofdev)
|
||||
static int __devexit mdio_ofgpio_remove(struct platform_device *ofdev)
|
||||
{
|
||||
mdio_gpio_bus_destroy(&ofdev->dev);
|
||||
kfree(ofdev->dev.platform_data);
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ static int qec_global_reset(void __iomem *gregs)
|
|||
|
||||
static void qec_init(struct bigmac *bp)
|
||||
{
|
||||
struct of_device *qec_op = bp->qec_op;
|
||||
struct platform_device *qec_op = bp->qec_op;
|
||||
void __iomem *gregs = bp->gregs;
|
||||
u8 bsizes = bp->bigmac_bursts;
|
||||
u32 regval;
|
||||
|
|
@ -1083,8 +1083,8 @@ static const struct net_device_ops bigmac_ops = {
|
|||
.ndo_validate_addr = eth_validate_addr,
|
||||
};
|
||||
|
||||
static int __devinit bigmac_ether_init(struct of_device *op,
|
||||
struct of_device *qec_op)
|
||||
static int __devinit bigmac_ether_init(struct platform_device *op,
|
||||
struct platform_device *qec_op)
|
||||
{
|
||||
static int version_printed;
|
||||
struct net_device *dev;
|
||||
|
|
@ -1242,25 +1242,25 @@ fail_and_cleanup:
|
|||
/* QEC can be the parent of either QuadEthernet or a BigMAC. We want
|
||||
* the latter.
|
||||
*/
|
||||
static int __devinit bigmac_sbus_probe(struct of_device *op,
|
||||
static int __devinit bigmac_sbus_probe(struct platform_device *op,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct device *parent = op->dev.parent;
|
||||
struct of_device *qec_op;
|
||||
struct platform_device *qec_op;
|
||||
|
||||
qec_op = to_of_device(parent);
|
||||
qec_op = to_platform_device(parent);
|
||||
|
||||
return bigmac_ether_init(op, qec_op);
|
||||
}
|
||||
|
||||
static int __devexit bigmac_sbus_remove(struct of_device *op)
|
||||
static int __devexit bigmac_sbus_remove(struct platform_device *op)
|
||||
{
|
||||
struct bigmac *bp = dev_get_drvdata(&op->dev);
|
||||
struct device *parent = op->dev.parent;
|
||||
struct net_device *net_dev = bp->dev;
|
||||
struct of_device *qec_op;
|
||||
struct platform_device *qec_op;
|
||||
|
||||
qec_op = to_of_device(parent);
|
||||
qec_op = to_platform_device(parent);
|
||||
|
||||
unregister_netdev(net_dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -329,8 +329,8 @@ struct bigmac {
|
|||
unsigned int timer_ticks;
|
||||
|
||||
struct net_device_stats enet_stats;
|
||||
struct of_device *qec_op;
|
||||
struct of_device *bigmac_op;
|
||||
struct platform_device *qec_op;
|
||||
struct platform_device *bigmac_op;
|
||||
struct net_device *dev;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1591,7 +1591,7 @@ static int happy_meal_init(struct happy_meal *hp)
|
|||
*/
|
||||
#ifdef CONFIG_SBUS
|
||||
if ((hp->happy_flags & HFLAG_PCI) == 0) {
|
||||
struct of_device *op = hp->happy_dev;
|
||||
struct platform_device *op = hp->happy_dev;
|
||||
if (sbus_can_dma_64bit()) {
|
||||
sbus_set_sbus64(&op->dev,
|
||||
hp->happy_bursts);
|
||||
|
|
@ -2480,7 +2480,7 @@ static void hme_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info
|
|||
#ifdef CONFIG_SBUS
|
||||
else {
|
||||
const struct linux_prom_registers *regs;
|
||||
struct of_device *op = hp->happy_dev;
|
||||
struct platform_device *op = hp->happy_dev;
|
||||
regs = of_get_property(op->dev.of_node, "regs", NULL);
|
||||
if (regs)
|
||||
sprintf(info->bus_info, "SBUS:%d",
|
||||
|
|
@ -2515,13 +2515,13 @@ static int hme_version_printed;
|
|||
*
|
||||
* Return NULL on failure.
|
||||
*/
|
||||
static struct quattro * __devinit quattro_sbus_find(struct of_device *child)
|
||||
static struct quattro * __devinit quattro_sbus_find(struct platform_device *child)
|
||||
{
|
||||
struct device *parent = child->dev.parent;
|
||||
struct of_device *op;
|
||||
struct platform_device *op;
|
||||
struct quattro *qp;
|
||||
|
||||
op = to_of_device(parent);
|
||||
op = to_platform_device(parent);
|
||||
qp = dev_get_drvdata(&op->dev);
|
||||
if (qp)
|
||||
return qp;
|
||||
|
|
@ -2551,7 +2551,7 @@ static int __init quattro_sbus_register_irqs(void)
|
|||
struct quattro *qp;
|
||||
|
||||
for (qp = qfe_sbus_list; qp != NULL; qp = qp->next) {
|
||||
struct of_device *op = qp->quattro_dev;
|
||||
struct platform_device *op = qp->quattro_dev;
|
||||
int err, qfe_slot, skip = 0;
|
||||
|
||||
for (qfe_slot = 0; qfe_slot < 4; qfe_slot++) {
|
||||
|
|
@ -2580,7 +2580,7 @@ static void quattro_sbus_free_irqs(void)
|
|||
struct quattro *qp;
|
||||
|
||||
for (qp = qfe_sbus_list; qp != NULL; qp = qp->next) {
|
||||
struct of_device *op = qp->quattro_dev;
|
||||
struct platform_device *op = qp->quattro_dev;
|
||||
int qfe_slot, skip = 0;
|
||||
|
||||
for (qfe_slot = 0; qfe_slot < 4; qfe_slot++) {
|
||||
|
|
@ -2639,7 +2639,7 @@ static const struct net_device_ops hme_netdev_ops = {
|
|||
};
|
||||
|
||||
#ifdef CONFIG_SBUS
|
||||
static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)
|
||||
static int __devinit happy_meal_sbus_probe_one(struct platform_device *op, int is_qfe)
|
||||
{
|
||||
struct device_node *dp = op->dev.of_node, *sbus_dp;
|
||||
struct quattro *qp = NULL;
|
||||
|
|
@ -2648,7 +2648,7 @@ static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)
|
|||
int i, qfe_slot = -1;
|
||||
int err = -ENODEV;
|
||||
|
||||
sbus_dp = to_of_device(op->dev.parent)->dev.of_node;
|
||||
sbus_dp = op->dev.parent->of_node;
|
||||
|
||||
/* We can match PCI devices too, do not accept those here. */
|
||||
if (strcmp(sbus_dp->name, "sbus"))
|
||||
|
|
@ -3235,7 +3235,7 @@ static void happy_meal_pci_exit(void)
|
|||
#endif
|
||||
|
||||
#ifdef CONFIG_SBUS
|
||||
static int __devinit hme_sbus_probe(struct of_device *op, const struct of_device_id *match)
|
||||
static int __devinit hme_sbus_probe(struct platform_device *op, const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *dp = op->dev.of_node;
|
||||
const char *model = of_get_property(dp, "model", NULL);
|
||||
|
|
@ -3247,7 +3247,7 @@ static int __devinit hme_sbus_probe(struct of_device *op, const struct of_device
|
|||
return happy_meal_sbus_probe_one(op, is_qfe);
|
||||
}
|
||||
|
||||
static int __devexit hme_sbus_remove(struct of_device *op)
|
||||
static int __devexit hme_sbus_remove(struct platform_device *op)
|
||||
{
|
||||
struct happy_meal *hp = dev_get_drvdata(&op->dev);
|
||||
struct net_device *net_dev = hp->dev;
|
||||
|
|
|
|||
|
|
@ -407,7 +407,7 @@ struct happy_meal {
|
|||
void (*write_rxd)(struct happy_meal_rxd *, u32, u32);
|
||||
#endif
|
||||
|
||||
/* This is either an of_device or a pci_dev. */
|
||||
/* This is either an platform_device or a pci_dev. */
|
||||
void *happy_dev;
|
||||
struct device *dma_dev;
|
||||
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@ struct lance_private {
|
|||
int rx_new, tx_new;
|
||||
int rx_old, tx_old;
|
||||
|
||||
struct of_device *ledma; /* If set this points to ledma */
|
||||
struct platform_device *ledma; /* If set this points to ledma */
|
||||
char tpe; /* cable-selection is TPE */
|
||||
char auto_select; /* cable-selection by carrier */
|
||||
char burst_sizes; /* ledma SBus burst sizes */
|
||||
|
|
@ -265,8 +265,8 @@ struct lance_private {
|
|||
char *name;
|
||||
dma_addr_t init_block_dvma;
|
||||
struct net_device *dev; /* Backpointer */
|
||||
struct of_device *op;
|
||||
struct of_device *lebuffer;
|
||||
struct platform_device *op;
|
||||
struct platform_device *lebuffer;
|
||||
struct timer_list multicast_timer;
|
||||
};
|
||||
|
||||
|
|
@ -1272,7 +1272,7 @@ static void lance_free_hwresources(struct lance_private *lp)
|
|||
if (lp->lregs)
|
||||
of_iounmap(&lp->op->resource[0], lp->lregs, LANCE_REG_SIZE);
|
||||
if (lp->dregs) {
|
||||
struct of_device *ledma = lp->ledma;
|
||||
struct platform_device *ledma = lp->ledma;
|
||||
|
||||
of_iounmap(&ledma->resource[0], lp->dregs,
|
||||
resource_size(&ledma->resource[0]));
|
||||
|
|
@ -1319,9 +1319,9 @@ static const struct net_device_ops sparc_lance_ops = {
|
|||
.ndo_validate_addr = eth_validate_addr,
|
||||
};
|
||||
|
||||
static int __devinit sparc_lance_probe_one(struct of_device *op,
|
||||
struct of_device *ledma,
|
||||
struct of_device *lebuffer)
|
||||
static int __devinit sparc_lance_probe_one(struct platform_device *op,
|
||||
struct platform_device *ledma,
|
||||
struct platform_device *lebuffer)
|
||||
{
|
||||
struct device_node *dp = op->dev.of_node;
|
||||
static unsigned version_printed;
|
||||
|
|
@ -1503,9 +1503,9 @@ fail:
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
static int __devinit sunlance_sbus_probe(struct of_device *op, const struct of_device_id *match)
|
||||
static int __devinit sunlance_sbus_probe(struct platform_device *op, const struct of_device_id *match)
|
||||
{
|
||||
struct of_device *parent = to_of_device(op->dev.parent);
|
||||
struct platform_device *parent = to_platform_device(op->dev.parent);
|
||||
struct device_node *parent_dp = parent->dev.of_node;
|
||||
int err;
|
||||
|
||||
|
|
@ -1519,7 +1519,7 @@ static int __devinit sunlance_sbus_probe(struct of_device *op, const struct of_d
|
|||
return err;
|
||||
}
|
||||
|
||||
static int __devexit sunlance_sbus_remove(struct of_device *op)
|
||||
static int __devexit sunlance_sbus_remove(struct platform_device *op)
|
||||
{
|
||||
struct lance_private *lp = dev_get_drvdata(&op->dev);
|
||||
struct net_device *net_dev = lp->dev;
|
||||
|
|
|
|||
|
|
@ -689,7 +689,7 @@ static void qe_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
|
|||
{
|
||||
const struct linux_prom_registers *regs;
|
||||
struct sunqe *qep = netdev_priv(dev);
|
||||
struct of_device *op;
|
||||
struct platform_device *op;
|
||||
|
||||
strcpy(info->driver, "sunqe");
|
||||
strcpy(info->version, "3.0");
|
||||
|
|
@ -720,7 +720,7 @@ static const struct ethtool_ops qe_ethtool_ops = {
|
|||
};
|
||||
|
||||
/* This is only called once at boot time for each card probed. */
|
||||
static void qec_init_once(struct sunqec *qecp, struct of_device *op)
|
||||
static void qec_init_once(struct sunqec *qecp, struct platform_device *op)
|
||||
{
|
||||
u8 bsizes = qecp->qec_bursts;
|
||||
|
||||
|
|
@ -770,9 +770,9 @@ static u8 __devinit qec_get_burst(struct device_node *dp)
|
|||
return bsizes;
|
||||
}
|
||||
|
||||
static struct sunqec * __devinit get_qec(struct of_device *child)
|
||||
static struct sunqec * __devinit get_qec(struct platform_device *child)
|
||||
{
|
||||
struct of_device *op = to_of_device(child->dev.parent);
|
||||
struct platform_device *op = to_platform_device(child->dev.parent);
|
||||
struct sunqec *qecp;
|
||||
|
||||
qecp = dev_get_drvdata(&op->dev);
|
||||
|
|
@ -836,7 +836,7 @@ static const struct net_device_ops qec_ops = {
|
|||
.ndo_validate_addr = eth_validate_addr,
|
||||
};
|
||||
|
||||
static int __devinit qec_ether_init(struct of_device *op)
|
||||
static int __devinit qec_ether_init(struct platform_device *op)
|
||||
{
|
||||
static unsigned version_printed;
|
||||
struct net_device *dev;
|
||||
|
|
@ -941,12 +941,12 @@ fail:
|
|||
return res;
|
||||
}
|
||||
|
||||
static int __devinit qec_sbus_probe(struct of_device *op, const struct of_device_id *match)
|
||||
static int __devinit qec_sbus_probe(struct platform_device *op, const struct of_device_id *match)
|
||||
{
|
||||
return qec_ether_init(op);
|
||||
}
|
||||
|
||||
static int __devexit qec_sbus_remove(struct of_device *op)
|
||||
static int __devexit qec_sbus_remove(struct platform_device *op)
|
||||
{
|
||||
struct sunqe *qp = dev_get_drvdata(&op->dev);
|
||||
struct net_device *net_dev = qp->dev;
|
||||
|
|
@ -997,7 +997,7 @@ static void __exit qec_exit(void)
|
|||
|
||||
while (root_qec_dev) {
|
||||
struct sunqec *next = root_qec_dev->next_module;
|
||||
struct of_device *op = root_qec_dev->op;
|
||||
struct platform_device *op = root_qec_dev->op;
|
||||
|
||||
free_irq(op->archdata.irqs[0], (void *) root_qec_dev);
|
||||
of_iounmap(&op->resource[0], root_qec_dev->gregs,
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ struct sunqec {
|
|||
void __iomem *gregs; /* QEC Global Registers */
|
||||
struct sunqe *qes[4]; /* Each child MACE */
|
||||
unsigned int qec_bursts; /* Support burst sizes */
|
||||
struct of_device *op; /* QEC's OF device */
|
||||
struct platform_device *op; /* QEC's OF device */
|
||||
struct sunqec *next_module; /* List of all QECs in system */
|
||||
};
|
||||
|
||||
|
|
@ -342,7 +342,7 @@ struct sunqe {
|
|||
__u32 buffers_dvma; /* DVMA visible address. */
|
||||
struct sunqec *parent;
|
||||
u8 mconfig; /* Base MACE mconfig value */
|
||||
struct of_device *op; /* QE's OF device struct */
|
||||
struct platform_device *op; /* QE's OF device struct */
|
||||
struct net_device *dev; /* QE's netdevice struct */
|
||||
int channel; /* Who am I? */
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3601,7 +3601,7 @@ static void ucc_geth_timeout(struct net_device *dev)
|
|||
|
||||
#ifdef CONFIG_PM
|
||||
|
||||
static int ucc_geth_suspend(struct of_device *ofdev, pm_message_t state)
|
||||
static int ucc_geth_suspend(struct platform_device *ofdev, pm_message_t state)
|
||||
{
|
||||
struct net_device *ndev = dev_get_drvdata(&ofdev->dev);
|
||||
struct ucc_geth_private *ugeth = netdev_priv(ndev);
|
||||
|
|
@ -3629,7 +3629,7 @@ static int ucc_geth_suspend(struct of_device *ofdev, pm_message_t state)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int ucc_geth_resume(struct of_device *ofdev)
|
||||
static int ucc_geth_resume(struct platform_device *ofdev)
|
||||
{
|
||||
struct net_device *ndev = dev_get_drvdata(&ofdev->dev);
|
||||
struct ucc_geth_private *ugeth = netdev_priv(ndev);
|
||||
|
|
@ -3732,7 +3732,7 @@ static const struct net_device_ops ucc_geth_netdev_ops = {
|
|||
#endif
|
||||
};
|
||||
|
||||
static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)
|
||||
static int ucc_geth_probe(struct platform_device* ofdev, const struct of_device_id *match)
|
||||
{
|
||||
struct device *device = &ofdev->dev;
|
||||
struct device_node *np = ofdev->dev.of_node;
|
||||
|
|
@ -3954,7 +3954,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int ucc_geth_remove(struct of_device* ofdev)
|
||||
static int ucc_geth_remove(struct platform_device* ofdev)
|
||||
{
|
||||
struct device *device = &ofdev->dev;
|
||||
struct net_device *dev = dev_get_drvdata(device);
|
||||
|
|
|
|||
|
|
@ -1086,7 +1086,7 @@ static void xemaclite_remove_ndev(struct net_device *ndev)
|
|||
*
|
||||
* Return: Value of the parameter if the parameter is found, or 0 otherwise
|
||||
*/
|
||||
static bool get_bool(struct of_device *ofdev, const char *s)
|
||||
static bool get_bool(struct platform_device *ofdev, const char *s)
|
||||
{
|
||||
u32 *p = (u32 *)of_get_property(ofdev->dev.of_node, s, NULL);
|
||||
|
||||
|
|
@ -1115,7 +1115,7 @@ static struct net_device_ops xemaclite_netdev_ops;
|
|||
* Return: 0, if the driver is bound to the Emaclite device, or
|
||||
* a negative error if there is failure.
|
||||
*/
|
||||
static int __devinit xemaclite_of_probe(struct of_device *ofdev,
|
||||
static int __devinit xemaclite_of_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct resource r_irq; /* Interrupt resources */
|
||||
|
|
@ -1240,7 +1240,7 @@ error2:
|
|||
*
|
||||
* Return: 0, always.
|
||||
*/
|
||||
static int __devexit xemaclite_of_remove(struct of_device *of_dev)
|
||||
static int __devexit xemaclite_of_remove(struct platform_device *of_dev)
|
||||
{
|
||||
struct device *dev = &of_dev->dev;
|
||||
struct net_device *ndev = dev_get_drvdata(dev);
|
||||
|
|
|
|||
Loading…
Reference in a new issue