Permalink
Browse files

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>
  • Loading branch information...
1 parent fc1caf6 commit 2dc11581376829303b98eadb2de253bee065a56a @glikely glikely committed Aug 6, 2010
Showing with 519 additions and 527 deletions.
  1. +1 −1 arch/powerpc/platforms/83xx/mpc837x_mds.c
  2. +1 −1 arch/powerpc/platforms/83xx/mpc837x_rdb.c
  3. +1 −1 arch/powerpc/sysdev/fsl_rio.c
  4. +4 −4 drivers/ata/pata_mpc52xx.c
  5. +2 −2 drivers/ata/pata_of_platform.c
  6. +4 −4 drivers/ata/sata_fsl.c
  7. +13 −13 drivers/atm/fore200e.c
  8. +2 −2 drivers/block/xsysace.c
  9. +2 −2 drivers/char/hw_random/n2-drv.c
  10. +1 −1 drivers/char/hw_random/n2rng.h
  11. +2 −2 drivers/char/hw_random/pasemi-rng.c
  12. +2 −2 drivers/char/ipmi/ipmi_si_intf.c
  13. +1 −1 drivers/char/rtc.c
  14. +2 −2 drivers/char/xilinx_hwicap/xilinx_hwicap.c
  15. +2 −2 drivers/crypto/amcc/crypto4xx_core.c
  16. +1 −1 drivers/crypto/amcc/crypto4xx_core.h
  17. +11 −11 drivers/crypto/n2_core.c
  18. +3 −3 drivers/crypto/talitos.c
  19. +2 −2 drivers/dma/fsldma.c
  20. +2 −2 drivers/dma/mpc512x_dma.c
  21. +4 −4 drivers/dma/ppc4xx/adma.c
  22. +6 −6 drivers/edac/mpc85xx_edac.c
  23. +6 −6 drivers/edac/ppc4xx_edac.c
  24. +1 −1 drivers/hwmon/ams/ams.h
  25. +2 −2 drivers/hwmon/ultra45_env.c
  26. +4 −4 drivers/i2c/busses/i2c-cpm.c
  27. +3 −3 drivers/i2c/busses/i2c-ibm_iic.c
  28. +2 −2 drivers/i2c/busses/i2c-mpc.c
  29. +1 −1 drivers/infiniband/hw/ehca/ehca_classes.h
  30. +2 −2 drivers/infiniband/hw/ehca/ehca_main.c
  31. +5 −5 drivers/input/misc/sparcspkr.c
  32. +4 −4 drivers/input/serio/i8042-sparcio.h
  33. +2 −2 drivers/input/serio/xilinx_ps2.c
  34. +2 −2 drivers/leds/leds-gpio.c
  35. +3 −3 drivers/macintosh/macio_sysfs.c
  36. +3 −3 drivers/macintosh/smu.c
  37. +1 −1 drivers/macintosh/therm_adt746x.c
  38. +3 −3 drivers/macintosh/therm_pm72.c
  39. +3 −3 drivers/macintosh/therm_windtunnel.c
  40. +4 −4 drivers/media/video/fsl-viu.c
  41. +4 −4 drivers/mmc/host/sdhci-of-core.c
  42. +4 −4 drivers/mtd/maps/physmap_of.c
  43. +3 −3 drivers/mtd/maps/sun_uflash.c
  44. +2 −2 drivers/mtd/nand/fsl_elbc_nand.c
  45. +2 −2 drivers/mtd/nand/fsl_upm.c
  46. +2 −2 drivers/mtd/nand/mpc5121_nfc.c
  47. +3 −3 drivers/mtd/nand/ndfc.c
  48. +2 −2 drivers/mtd/nand/pasemi_nand.c
  49. +2 −2 drivers/mtd/nand/socrates_nand.c
  50. +9 −9 drivers/net/can/mscan/mpc5xxx_can.c
  51. +2 −2 drivers/net/can/sja1000/sja1000_of_platform.c
  52. +2 −2 drivers/net/ehea/ehea.h
  53. +6 −6 drivers/net/ehea/ehea_main.c
  54. +4 −4 drivers/net/fec_mpc52xx.c
  55. +2 −2 drivers/net/fec_mpc52xx_phy.c
  56. +2 −2 drivers/net/fs_enet/fs_enet-main.c
  57. +1 −1 drivers/net/fs_enet/mac-fcc.c
  58. +1 −1 drivers/net/fs_enet/mac-fec.c
  59. +1 −1 drivers/net/fs_enet/mac-scc.c
  60. +2 −2 drivers/net/fs_enet/mii-bitbang.c
  61. +2 −2 drivers/net/fs_enet/mii-fec.c
  62. +2 −2 drivers/net/fsl_pq_mdio.c
  63. +5 −5 drivers/net/gianfar.c
  64. +1 −1 drivers/net/gianfar.h
  65. +2 −2 drivers/net/greth.c
  66. +1 −1 drivers/net/greth.h
  67. +3 −3 drivers/net/ibm_newemac/core.c
  68. +6 −6 drivers/net/ibm_newemac/core.h
  69. +2 −2 drivers/net/ibm_newemac/mal.c
  70. +1 −1 drivers/net/ibm_newemac/mal.h
  71. +9 −9 drivers/net/ibm_newemac/rgmii.c
  72. +8 −8 drivers/net/ibm_newemac/rgmii.h
  73. +7 −7 drivers/net/ibm_newemac/tah.c
  74. +6 −6 drivers/net/ibm_newemac/tah.h
  75. +9 −9 drivers/net/ibm_newemac/zmii.c
  76. +8 −8 drivers/net/ibm_newemac/zmii.h
  77. +4 −4 drivers/net/ll_temac_main.c
  78. +2 −2 drivers/net/myri_sbus.c
  79. +1 −1 drivers/net/myri_sbus.h
  80. +4 −4 drivers/net/niu.c
  81. +2 −2 drivers/net/phy/mdio-gpio.c
  82. +9 −9 drivers/net/sunbmac.c
  83. +2 −2 drivers/net/sunbmac.h
  84. +11 −11 drivers/net/sunhme.c
  85. +1 −1 drivers/net/sunhme.h
  86. +10 −10 drivers/net/sunlance.c
  87. +8 −8 drivers/net/sunqe.c
  88. +2 −2 drivers/net/sunqe.h
  89. +4 −4 drivers/net/ucc_geth.c
  90. +3 −3 drivers/net/xilinx_emaclite.c
  91. +1 −1 drivers/of/device.c
  92. +2 −2 drivers/parport/parport_sunbpp.c
  93. +3 −3 drivers/pcmcia/electra_cf.c
  94. +2 −2 drivers/pcmcia/m8xx_pcmcia.c
  95. +2 −2 drivers/rtc/rtc-mpc5121.c
  96. +3 −3 drivers/sbus/char/bbc_envctrl.c
  97. +9 −9 drivers/sbus/char/bbc_i2c.c
  98. +5 −5 drivers/sbus/char/bbc_i2c.h
  99. +2 −2 drivers/sbus/char/display7seg.c
  100. +2 −2 drivers/sbus/char/envctrl.c
  101. +2 −2 drivers/sbus/char/flash.c
  102. +2 −2 drivers/sbus/char/uctrl.c
  103. +7 −7 drivers/scsi/qlogicpti.c
  104. +1 −1 drivers/scsi/qlogicpti.h
  105. +22 −22 drivers/scsi/sun_esp.c
  106. +1 −1 drivers/serial/apbuart.c
  107. +2 −2 drivers/serial/cpm_uart/cpm_uart_core.c
  108. +4 −4 drivers/serial/mpc52xx_uart.c
  109. +1 −1 drivers/serial/nwpserial.c
  110. +3 −3 drivers/serial/of_serial.c
  111. +2 −2 drivers/serial/sunhv.c
  112. +4 −4 drivers/serial/sunsab.c
  113. +4 −4 drivers/serial/sunsu.c
  114. +3 −3 drivers/serial/sunzilog.c
  115. +2 −2 drivers/serial/uartlite.c
  116. +2 −2 drivers/serial/ucc_uart.c
  117. +2 −2 drivers/spi/mpc512x_psc_spi.c
  118. +2 −2 drivers/spi/mpc52xx_psc_spi.c
  119. +2 −2 drivers/spi/mpc52xx_spi.c
  120. +2 −2 drivers/spi/spi_mpc8xxx.c
  121. +3 −3 drivers/spi/spi_ppc4xx.c
  122. +3 −3 drivers/spi/xilinx_spi_of.c
  123. +5 −5 drivers/usb/gadget/fsl_qe_udc.c
  124. +3 −3 drivers/usb/host/ehci-ppc-of.c
  125. +6 −6 drivers/usb/host/ehci-xilinx-of.c
  126. +2 −2 drivers/usb/host/fhci-hcd.c
  127. +2 −2 drivers/usb/host/isp1760-if.c
  128. +3 −3 drivers/usb/host/ohci-ppc-of.c
  129. +2 −2 drivers/video/bw2.c
  130. +3 −3 drivers/video/cg14.c
  131. +2 −2 drivers/video/cg3.c
  132. +3 −3 drivers/video/cg6.c
  133. +2 −2 drivers/video/ffb.c
  134. +4 −4 drivers/video/fsl-diu-fb.c
  135. +3 −3 drivers/video/leo.c
  136. +2 −2 drivers/video/mb862xx/mb862xxfb.c
  137. +2 −2 drivers/video/p9100.c
  138. +2 −2 drivers/video/platinumfb.c
  139. +2 −2 drivers/video/sunxvr1000.c
  140. +3 −3 drivers/video/tcx.c
  141. +2 −2 drivers/video/xilinxfb.c
  142. +2 −2 drivers/watchdog/cpwd.c
  143. +1 −1 drivers/watchdog/gef_wdt.c
  144. +2 −2 drivers/watchdog/mpc8xxx_wdt.c
  145. +2 −2 drivers/watchdog/riowd.c
  146. +0 −16 include/linux/of_device.h
  147. +11 −3 include/linux/of_platform.h
  148. +1 −1 sound/aoa/soundbus/core.c
  149. +1 −1 sound/aoa/soundbus/soundbus.h
  150. +1 −1 sound/aoa/soundbus/sysfs.c
  151. +2 −2 sound/soc/fsl/mpc5200_dma.c
  152. +2 −2 sound/soc/fsl/mpc5200_dma.h
  153. +2 −2 sound/soc/fsl/mpc5200_psc_ac97.c
  154. +2 −2 sound/soc/fsl/mpc5200_psc_i2s.c
  155. +2 −2 sound/soc/fsl/mpc8610_hpcd.c
  156. +4 −4 sound/sparc/amd7930.c
  157. +9 −9 sound/sparc/cs4231.c
  158. +4 −4 sound/sparc/dbri.c
@@ -102,7 +102,7 @@ static struct of_device_id mpc837x_ids[] = {
static int __init mpc837x_declare_of_platform_devices(void)
{
- /* Publish of_device */
+ /* Publish platform_device */
of_platform_bus_probe(NULL, mpc837x_ids, NULL);
return 0;
@@ -78,7 +78,7 @@ static struct of_device_id mpc837x_ids[] = {
static int __init mpc837x_declare_of_platform_devices(void)
{
- /* Publish of_device */
+ /* Publish platform_device */
of_platform_bus_probe(NULL, mpc837x_ids, NULL);
return 0;
@@ -1332,7 +1332,7 @@ static inline void fsl_rio_info(struct device *dev, u32 ccsr)
/**
* fsl_rio_setup - Setup Freescale PowerPC RapidIO interface
- * @dev: of_device pointer
+ * @dev: platform_device pointer
*
* Initializes MPC85xx RapidIO hardware interface, configures
* master port with system-specific info, and registers the
@@ -680,7 +680,7 @@ mpc52xx_ata_remove_one(struct device *dev)
/* ======================================================================== */
static int __devinit
-mpc52xx_ata_probe(struct of_device *op, const struct of_device_id *match)
+mpc52xx_ata_probe(struct platform_device *op, const struct of_device_id *match)
{
unsigned int ipb_freq;
struct resource res_mem;
@@ -821,7 +821,7 @@ mpc52xx_ata_probe(struct of_device *op, const struct of_device_id *match)
}
static int
-mpc52xx_ata_remove(struct of_device *op)
+mpc52xx_ata_remove(struct platform_device *op)
{
struct mpc52xx_ata_priv *priv;
int task_irq;
@@ -848,15 +848,15 @@ mpc52xx_ata_remove(struct of_device *op)
#ifdef CONFIG_PM
static int
-mpc52xx_ata_suspend(struct of_device *op, pm_message_t state)
+mpc52xx_ata_suspend(struct platform_device *op, pm_message_t state)
{
struct ata_host *host = dev_get_drvdata(&op->dev);
return ata_host_suspend(host, state);
}
static int
-mpc52xx_ata_resume(struct of_device *op)
+mpc52xx_ata_resume(struct platform_device *op)
{
struct ata_host *host = dev_get_drvdata(&op->dev);
struct mpc52xx_ata_priv *priv = host->private_data;
@@ -14,7 +14,7 @@
#include <linux/of_platform.h>
#include <linux/ata_platform.h>
-static int __devinit pata_of_platform_probe(struct of_device *ofdev,
+static int __devinit pata_of_platform_probe(struct platform_device *ofdev,
const struct of_device_id *match)
{
int ret;
@@ -78,7 +78,7 @@ static int __devinit pata_of_platform_probe(struct of_device *ofdev,
reg_shift, pio_mask);
}
-static int __devexit pata_of_platform_remove(struct of_device *ofdev)
+static int __devexit pata_of_platform_remove(struct platform_device *ofdev)
{
return __pata_platform_remove(&ofdev->dev);
}
View
@@ -1296,7 +1296,7 @@ static const struct ata_port_info sata_fsl_port_info[] = {
},
};
-static int sata_fsl_probe(struct of_device *ofdev,
+static int sata_fsl_probe(struct platform_device *ofdev,
const struct of_device_id *match)
{
int retval = -ENXIO;
@@ -1370,7 +1370,7 @@ static int sata_fsl_probe(struct of_device *ofdev,
return retval;
}
-static int sata_fsl_remove(struct of_device *ofdev)
+static int sata_fsl_remove(struct platform_device *ofdev)
{
struct ata_host *host = dev_get_drvdata(&ofdev->dev);
struct sata_fsl_host_priv *host_priv = host->private_data;
@@ -1387,13 +1387,13 @@ static int sata_fsl_remove(struct of_device *ofdev)
}
#ifdef CONFIG_PM
-static int sata_fsl_suspend(struct of_device *op, pm_message_t state)
+static int sata_fsl_suspend(struct platform_device *op, pm_message_t state)
{
struct ata_host *host = dev_get_drvdata(&op->dev);
return ata_host_suspend(host, state);
}
-static int sata_fsl_resume(struct of_device *op)
+static int sata_fsl_resume(struct platform_device *op)
{
struct ata_host *host = dev_get_drvdata(&op->dev);
struct sata_fsl_host_priv *host_priv = host->private_data;
View
@@ -674,7 +674,7 @@ static void fore200e_sba_write(u32 val, volatile u32 __iomem *addr)
static u32 fore200e_sba_dma_map(struct fore200e *fore200e, void* virt_addr, int size, int direction)
{
- struct of_device *op = fore200e->bus_dev;
+ struct platform_device *op = fore200e->bus_dev;
u32 dma_addr;
dma_addr = dma_map_single(&op->dev, virt_addr, size, direction);
@@ -687,7 +687,7 @@ static u32 fore200e_sba_dma_map(struct fore200e *fore200e, void* virt_addr, int
static void fore200e_sba_dma_unmap(struct fore200e *fore200e, u32 dma_addr, int size, int direction)
{
- struct of_device *op = fore200e->bus_dev;
+ struct platform_device *op = fore200e->bus_dev;
DPRINTK(3, "SBUS DVMA unmapping: dma_addr = 0x%08x, size = %d, direction = %d,\n",
dma_addr, size, direction);
@@ -697,7 +697,7 @@ static void fore200e_sba_dma_unmap(struct fore200e *fore200e, u32 dma_addr, int
static void fore200e_sba_dma_sync_for_cpu(struct fore200e *fore200e, u32 dma_addr, int size, int direction)
{
- struct of_device *op = fore200e->bus_dev;
+ struct platform_device *op = fore200e->bus_dev;
DPRINTK(3, "SBUS DVMA sync: dma_addr = 0x%08x, size = %d, direction = %d\n", dma_addr, size, direction);
@@ -706,7 +706,7 @@ static void fore200e_sba_dma_sync_for_cpu(struct fore200e *fore200e, u32 dma_add
static void fore200e_sba_dma_sync_for_device(struct fore200e *fore200e, u32 dma_addr, int size, int direction)
{
- struct of_device *op = fore200e->bus_dev;
+ struct platform_device *op = fore200e->bus_dev;
DPRINTK(3, "SBUS DVMA sync: dma_addr = 0x%08x, size = %d, direction = %d\n", dma_addr, size, direction);
@@ -719,7 +719,7 @@ static void fore200e_sba_dma_sync_for_device(struct fore200e *fore200e, u32 dma_
static int fore200e_sba_dma_chunk_alloc(struct fore200e *fore200e, struct chunk *chunk,
int size, int nbr, int alignment)
{
- struct of_device *op = fore200e->bus_dev;
+ struct platform_device *op = fore200e->bus_dev;
chunk->alloc_size = chunk->align_size = size * nbr;
@@ -738,7 +738,7 @@ static int fore200e_sba_dma_chunk_alloc(struct fore200e *fore200e, struct chunk
/* free a DVMA consistent chunk of memory */
static void fore200e_sba_dma_chunk_free(struct fore200e *fore200e, struct chunk *chunk)
{
- struct of_device *op = fore200e->bus_dev;
+ struct platform_device *op = fore200e->bus_dev;
dma_free_coherent(&op->dev, chunk->alloc_size,
chunk->alloc_addr, chunk->dma_addr);
@@ -770,7 +770,7 @@ static void fore200e_sba_reset(struct fore200e *fore200e)
static int __init fore200e_sba_map(struct fore200e *fore200e)
{
- struct of_device *op = fore200e->bus_dev;
+ struct platform_device *op = fore200e->bus_dev;
unsigned int bursts;
/* gain access to the SBA specific registers */
@@ -800,7 +800,7 @@ static int __init fore200e_sba_map(struct fore200e *fore200e)
static void fore200e_sba_unmap(struct fore200e *fore200e)
{
- struct of_device *op = fore200e->bus_dev;
+ struct platform_device *op = fore200e->bus_dev;
of_iounmap(&op->resource[0], fore200e->regs.sba.hcr, SBA200E_HCR_LENGTH);
of_iounmap(&op->resource[1], fore200e->regs.sba.bsr, SBA200E_BSR_LENGTH);
@@ -816,7 +816,7 @@ static int __init fore200e_sba_configure(struct fore200e *fore200e)
static int __init fore200e_sba_prom_read(struct fore200e *fore200e, struct prom_data *prom)
{
- struct of_device *op = fore200e->bus_dev;
+ struct platform_device *op = fore200e->bus_dev;
const u8 *prop;
int len;
@@ -840,7 +840,7 @@ static int __init fore200e_sba_prom_read(struct fore200e *fore200e, struct prom_
static int fore200e_sba_proc_read(struct fore200e *fore200e, char *page)
{
- struct of_device *op = fore200e->bus_dev;
+ struct platform_device *op = fore200e->bus_dev;
const struct linux_prom_registers *regs;
regs = of_get_property(op->dev.of_node, "reg", NULL);
@@ -2513,7 +2513,7 @@ fore200e_load_and_start_fw(struct fore200e* fore200e)
device = &((struct pci_dev *) fore200e->bus_dev)->dev;
#ifdef CONFIG_SBUS
else if (strcmp(fore200e->bus->model_name, "SBA-200E") == 0)
- device = &((struct of_device *) fore200e->bus_dev)->dev;
+ device = &((struct platform_device *) fore200e->bus_dev)->dev;
#endif
else
return err;
@@ -2643,7 +2643,7 @@ fore200e_init(struct fore200e* fore200e)
}
#ifdef CONFIG_SBUS
-static int __devinit fore200e_sba_probe(struct of_device *op,
+static int __devinit fore200e_sba_probe(struct platform_device *op,
const struct of_device_id *match)
{
const struct fore200e_bus *bus = match->data;
@@ -2675,7 +2675,7 @@ static int __devinit fore200e_sba_probe(struct of_device *op,
return 0;
}
-static int __devexit fore200e_sba_remove(struct of_device *op)
+static int __devexit fore200e_sba_remove(struct platform_device *op)
{
struct fore200e *fore200e = dev_get_drvdata(&op->dev);
View
@@ -1188,7 +1188,7 @@ static struct platform_driver ace_platform_driver = {
#if defined(CONFIG_OF)
static int __devinit
-ace_of_probe(struct of_device *op, const struct of_device_id *match)
+ace_of_probe(struct platform_device *op, const struct of_device_id *match)
{
struct resource res;
resource_size_t physaddr;
@@ -1220,7 +1220,7 @@ ace_of_probe(struct of_device *op, const struct of_device_id *match)
return ace_alloc(&op->dev, id ? *id : 0, physaddr, irq, bus_width);
}
-static int __devexit ace_of_remove(struct of_device *op)
+static int __devexit ace_of_remove(struct platform_device *op)
{
ace_free(&op->dev);
return 0;
@@ -619,7 +619,7 @@ static void __devinit n2rng_driver_version(void)
pr_info("%s", version);
}
-static int __devinit n2rng_probe(struct of_device *op,
+static int __devinit n2rng_probe(struct platform_device *op,
const struct of_device_id *match)
{
int victoria_falls = (match->data != NULL);
@@ -714,7 +714,7 @@ static int __devinit n2rng_probe(struct of_device *op,
return err;
}
-static int __devexit n2rng_remove(struct of_device *op)
+static int __devexit n2rng_remove(struct platform_device *op)
{
struct n2rng *np = dev_get_drvdata(&op->dev);
@@ -65,7 +65,7 @@ struct n2rng_unit {
};
struct n2rng {
- struct of_device *op;
+ struct platform_device *op;
unsigned long flags;
#define N2RNG_FLAG_VF 0x00000001 /* Victoria Falls RNG, else N2 */
@@ -94,7 +94,7 @@ static struct hwrng pasemi_rng = {
.data_read = pasemi_rng_data_read,
};
-static int __devinit rng_probe(struct of_device *ofdev,
+static int __devinit rng_probe(struct platform_device *ofdev,
const struct of_device_id *match)
{
void __iomem *rng_regs;
@@ -123,7 +123,7 @@ static int __devinit rng_probe(struct of_device *ofdev,
return err;
}
-static int __devexit rng_remove(struct of_device *dev)
+static int __devexit rng_remove(struct platform_device *dev)
{
void __iomem *rng_regs = (void __iomem *)pasemi_rng.priv;
@@ -2502,7 +2502,7 @@ static struct pci_driver ipmi_pci_driver = {
#ifdef CONFIG_PPC_OF
-static int __devinit ipmi_of_probe(struct of_device *dev,
+static int __devinit ipmi_of_probe(struct platform_device *dev,
const struct of_device_id *match)
{
struct smi_info *info;
@@ -2576,7 +2576,7 @@ static int __devinit ipmi_of_probe(struct of_device *dev,
return add_smi(info);
}
-static int __devexit ipmi_of_remove(struct of_device *dev)
+static int __devexit ipmi_of_remove(struct platform_device *dev)
{
cleanup_one_si(dev_get_drvdata(&dev->dev));
return 0;
View
@@ -961,7 +961,7 @@ static int __init rtc_init(void)
#endif
#ifdef CONFIG_SPARC32
struct device_node *ebus_dp;
- struct of_device *op;
+ struct platform_device *op;
#else
void *r;
#ifdef RTC_IRQ
@@ -761,7 +761,7 @@ static struct platform_driver hwicap_platform_driver = {
#if defined(CONFIG_OF)
static int __devinit
-hwicap_of_probe(struct of_device *op, const struct of_device_id *match)
+hwicap_of_probe(struct platform_device *op, const struct of_device_id *match)
{
struct resource res;
const unsigned int *id;
@@ -798,7 +798,7 @@ hwicap_of_probe(struct of_device *op, const struct of_device_id *match)
regs);
}
-static int __devexit hwicap_of_remove(struct of_device *op)
+static int __devexit hwicap_of_remove(struct platform_device *op)
{
return hwicap_remove(&op->dev);
}
@@ -1150,7 +1150,7 @@ struct crypto4xx_alg_common crypto4xx_alg[] = {
/**
* Module Initialization Routine
*/
-static int __init crypto4xx_probe(struct of_device *ofdev,
+static int __init crypto4xx_probe(struct platform_device *ofdev,
const struct of_device_id *match)
{
int rc;
@@ -1258,7 +1258,7 @@ static int __init crypto4xx_probe(struct of_device *ofdev,
return rc;
}
-static int __exit crypto4xx_remove(struct of_device *ofdev)
+static int __exit crypto4xx_remove(struct platform_device *ofdev)
{
struct device *dev = &ofdev->dev;
struct crypto4xx_core_device *core_dev = dev_get_drvdata(dev);
@@ -104,7 +104,7 @@ struct crypto4xx_device {
struct crypto4xx_core_device {
struct device *device;
- struct of_device *ofdev;
+ struct platform_device *ofdev;
struct crypto4xx_device *dev;
u32 int_status;
u32 irq;
Oops, something went wrong.

0 comments on commit 2dc1158

Please sign in to comment.