Skip to content

Commit

Permalink
dt/sparc: Eliminate users of of_platform_{,un}register_driver
Browse files Browse the repository at this point in the history 
Get rid of old users of of_platform_driver in arch/sparc.  Most
of_platform_driver users can be converted to use the platform_bus
directly.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  • Loading branch information
@glikely
glikely committed Feb 28, 2011
1 parent 0000612 commit 4ebb24f
Show file tree
Hide file tree
Showing 27 changed files with 133 additions and 148 deletions.
6 changes: 3 additions & 3 deletions arch/sparc/include/asm/parport.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ static inline unsigned int get_dma_residue(unsigned int dmanr)
return ebus_dma_residue(&sparc_ebus_dmas[dmanr].info);
}

static int __devinit ecpp_probe(struct platform_device *op, const struct of_device_id *match)
static int __devinit ecpp_probe(struct platform_device *op)
{
unsigned long base = op->resource[0].start;
unsigned long config = op->resource[1].start;
Expand Down Expand Up @@ -235,7 +235,7 @@ static const struct of_device_id ecpp_match[] = {
{},
};

static struct of_platform_driver ecpp_driver = {
static struct platform_driver ecpp_driver = {
.driver = {
.name = "ecpp",
.owner = THIS_MODULE,
Expand All @@ -247,7 +247,7 @@ static struct of_platform_driver ecpp_driver = {

static int parport_pc_find_nonpci_ports(int autoirq, int autodma)
{
return of_register_platform_driver(&ecpp_driver);
return platform_driver_register(&ecpp_driver);
}

#endif /* !(_ASM_SPARC64_PARPORT_H */
7 changes: 3 additions & 4 deletions arch/sparc/kernel/apc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,7 @@ static const struct file_operations apc_fops = {

static struct miscdevice apc_miscdev = { APC_MINOR, APC_DEVNAME, &apc_fops };

static int __devinit apc_probe(struct platform_device *op,
const struct of_device_id *match)
static int __devinit apc_probe(struct platform_device *op)
{
int err;

Expand Down Expand Up @@ -174,7 +173,7 @@ static struct of_device_id __initdata apc_match[] = {
};
MODULE_DEVICE_TABLE(of, apc_match);

static struct of_platform_driver apc_driver = {
static struct platform_driver apc_driver = {
.driver = {
.name = "apc",
.owner = THIS_MODULE,
Expand All @@ -185,7 +184,7 @@ static struct of_platform_driver apc_driver = {

static int __init apc_init(void)
{
return of_register_platform_driver(&apc_driver);
return platform_driver_register(&apc_driver);
}

/* This driver is not critical to the boot process
Expand Down
7 changes: 3 additions & 4 deletions arch/sparc/kernel/auxio_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ static struct of_device_id __initdata auxio_match[] = {

MODULE_DEVICE_TABLE(of, auxio_match);

static int __devinit auxio_probe(struct platform_device *dev,
const struct of_device_id *match)
static int __devinit auxio_probe(struct platform_device *dev)
{
struct device_node *dp = dev->dev.of_node;
unsigned long size;
Expand Down Expand Up @@ -132,7 +131,7 @@ static int __devinit auxio_probe(struct platform_device *dev,
return 0;
}

static struct of_platform_driver auxio_driver = {
static struct platform_driver auxio_driver = {
.probe = auxio_probe,
.driver = {
.name = "auxio",
Expand All @@ -143,7 +142,7 @@ static struct of_platform_driver auxio_driver = {

static int __init auxio_init(void)
{
return of_register_platform_driver(&auxio_driver);
return platform_driver_register(&auxio_driver);
}

/* Must be after subsys_initcall() so that busses are probed. Must
Expand Down
14 changes: 6 additions & 8 deletions arch/sparc/kernel/central.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ static int __devinit clock_board_calc_nslots(struct clock_board *p)
}
}

static int __devinit clock_board_probe(struct platform_device *op,
const struct of_device_id *match)
static int __devinit clock_board_probe(struct platform_device *op)
{
struct clock_board *p = kzalloc(sizeof(*p), GFP_KERNEL);
int err = -ENOMEM;
Expand Down Expand Up @@ -148,7 +147,7 @@ static struct of_device_id __initdata clock_board_match[] = {
{},
};

static struct of_platform_driver clock_board_driver = {
static struct platform_driver clock_board_driver = {
.probe = clock_board_probe,
.driver = {
.name = "clock_board",
Expand All @@ -157,8 +156,7 @@ static struct of_platform_driver clock_board_driver = {
},
};

static int __devinit fhc_probe(struct platform_device *op,
const struct of_device_id *match)
static int __devinit fhc_probe(struct platform_device *op)
{
struct fhc *p = kzalloc(sizeof(*p), GFP_KERNEL);
int err = -ENOMEM;
Expand Down Expand Up @@ -254,7 +252,7 @@ static struct of_device_id __initdata fhc_match[] = {
{},
};

static struct of_platform_driver fhc_driver = {
static struct platform_driver fhc_driver = {
.probe = fhc_probe,
.driver = {
.name = "fhc",
Expand All @@ -265,8 +263,8 @@ static struct of_platform_driver fhc_driver = {

static int __init sunfire_init(void)
{
(void) of_register_platform_driver(&fhc_driver);
(void) of_register_platform_driver(&clock_board_driver);
(void) platform_driver_register(&fhc_driver);
(void) platform_driver_register(&clock_board_driver);
return 0;
}

Expand Down
19 changes: 8 additions & 11 deletions arch/sparc/kernel/chmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,7 @@ static void __devinit jbusmc_construct_dimm_groups(struct jbusmc *p,
}
}

static int __devinit jbusmc_probe(struct platform_device *op,
const struct of_device_id *match)
static int __devinit jbusmc_probe(struct platform_device *op)
{
const struct linux_prom64_registers *mem_regs;
struct device_node *mem_node;
Expand Down Expand Up @@ -690,8 +689,7 @@ static void chmc_fetch_decode_regs(struct chmc *p)
chmc_read_mcreg(p, CHMCTRL_DECODE4));
}

static int __devinit chmc_probe(struct platform_device *op,
const struct of_device_id *match)
static int __devinit chmc_probe(struct platform_device *op)
{
struct device_node *dp = op->dev.of_node;
unsigned long ver;
Expand Down Expand Up @@ -765,13 +763,12 @@ static int __devinit chmc_probe(struct platform_device *op,
goto out;
}

static int __devinit us3mc_probe(struct platform_device *op,
const struct of_device_id *match)
static int __devinit us3mc_probe(struct platform_device *op)
{
if (mc_type == MC_TYPE_SAFARI)
return chmc_probe(op, match);
return chmc_probe(op);
else if (mc_type == MC_TYPE_JBUS)
return jbusmc_probe(op, match);
return jbusmc_probe(op);
return -ENODEV;
}

Expand Down Expand Up @@ -810,7 +807,7 @@ static const struct of_device_id us3mc_match[] = {
};
MODULE_DEVICE_TABLE(of, us3mc_match);

static struct of_platform_driver us3mc_driver = {
static struct platform_driver us3mc_driver = {
.driver = {
.name = "us3mc",
.owner = THIS_MODULE,
Expand Down Expand Up @@ -848,7 +845,7 @@ static int __init us3mc_init(void)
ret = register_dimm_printer(us3mc_dimm_printer);

if (!ret) {
ret = of_register_platform_driver(&us3mc_driver);
ret = platform_driver_register(&us3mc_driver);
if (ret)
unregister_dimm_printer(us3mc_dimm_printer);
}
Expand All @@ -859,7 +856,7 @@ static void __exit us3mc_cleanup(void)
{
if (us3mc_platform()) {
unregister_dimm_printer(us3mc_dimm_printer);
of_unregister_platform_driver(&us3mc_driver);
platform_driver_unregister(&us3mc_driver);
}
}

Expand Down
7 changes: 3 additions & 4 deletions arch/sparc/kernel/pci_fire.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,7 @@ static int __devinit pci_fire_pbm_init(struct pci_pbm_info *pbm,
return 0;
}

static int __devinit fire_probe(struct platform_device *op,
const struct of_device_id *match)
static int __devinit fire_probe(struct platform_device *op)
{
struct device_node *dp = op->dev.of_node;
struct pci_pbm_info *pbm;
Expand Down Expand Up @@ -507,7 +506,7 @@ static struct of_device_id __initdata fire_match[] = {
{},
};

static struct of_platform_driver fire_driver = {
static struct platform_driver fire_driver = {
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
Expand All @@ -518,7 +517,7 @@ static struct of_platform_driver fire_driver = {

static int __init fire_init(void)
{
return of_register_platform_driver(&fire_driver);
return platform_driver_register(&fire_driver);
}

subsys_initcall(fire_init);
7 changes: 3 additions & 4 deletions arch/sparc/kernel/pci_psycho.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,7 @@ static struct pci_pbm_info * __devinit psycho_find_sibling(u32 upa_portid)

#define PSYCHO_CONFIGSPACE 0x001000000UL

static int __devinit psycho_probe(struct platform_device *op,
const struct of_device_id *match)
static int __devinit psycho_probe(struct platform_device *op)
{
const struct linux_prom64_registers *pr_regs;
struct device_node *dp = op->dev.of_node;
Expand Down Expand Up @@ -601,7 +600,7 @@ static struct of_device_id __initdata psycho_match[] = {
{},
};

static struct of_platform_driver psycho_driver = {
static struct platform_driver psycho_driver = {
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
Expand All @@ -612,7 +611,7 @@ static struct of_platform_driver psycho_driver = {

static int __init psycho_init(void)
{
return of_register_platform_driver(&psycho_driver);
return platform_driver_register(&psycho_driver);
}

subsys_initcall(psycho_init);
9 changes: 4 additions & 5 deletions arch/sparc/kernel/pci_sabre.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,8 +452,7 @@ static void __devinit sabre_pbm_init(struct pci_pbm_info *pbm,
sabre_scan_bus(pbm, &op->dev);
}

static int __devinit sabre_probe(struct platform_device *op,
const struct of_device_id *match)
static int __devinit sabre_probe(struct platform_device *op)
{
const struct linux_prom64_registers *pr_regs;
struct device_node *dp = op->dev.of_node;
Expand All @@ -464,7 +463,7 @@ static int __devinit sabre_probe(struct platform_device *op,
const u32 *vdma;
u64 clear_irq;

hummingbird_p = (match->data != NULL);
hummingbird_p = op->dev.of_match && (op->dev.of_match->data != NULL);
if (!hummingbird_p) {
struct device_node *cpu_dp;

Expand Down Expand Up @@ -595,7 +594,7 @@ static struct of_device_id __initdata sabre_match[] = {
{},
};

static struct of_platform_driver sabre_driver = {
static struct platform_driver sabre_driver = {
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
Expand All @@ -606,7 +605,7 @@ static struct of_platform_driver sabre_driver = {

static int __init sabre_init(void)
{
return of_register_platform_driver(&sabre_driver);
return platform_driver_register(&sabre_driver);
}

subsys_initcall(sabre_init);
11 changes: 6 additions & 5 deletions arch/sparc/kernel/pci_schizo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1460,10 +1460,11 @@ static int __devinit __schizo_init(struct platform_device *op, unsigned long chi
return err;
}

static int __devinit schizo_probe(struct platform_device *op,
const struct of_device_id *match)
static int __devinit schizo_probe(struct platform_device *op)
{
return __schizo_init(op, (unsigned long) match->data);
if (!op->dev.of_match)
return -EINVAL;
return __schizo_init(op, (unsigned long) op->dev.of_match->data);
}

/* The ordering of this table is very important. Some Tomatillo
Expand All @@ -1490,7 +1491,7 @@ static struct of_device_id __initdata schizo_match[] = {
{},
};

static struct of_platform_driver schizo_driver = {
static struct platform_driver schizo_driver = {
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
Expand All @@ -1501,7 +1502,7 @@ static struct of_platform_driver schizo_driver = {

static int __init schizo_init(void)
{
return of_register_platform_driver(&schizo_driver);
return platform_driver_register(&schizo_driver);
}

subsys_initcall(schizo_init);
7 changes: 3 additions & 4 deletions arch/sparc/kernel/pci_sun4v.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -918,8 +918,7 @@ static int __devinit pci_sun4v_pbm_init(struct pci_pbm_info *pbm,
return 0;
}

static int __devinit pci_sun4v_probe(struct platform_device *op,
const struct of_device_id *match)
static int __devinit pci_sun4v_probe(struct platform_device *op)
{
const struct linux_prom64_registers *regs;
static int hvapi_negotiated = 0;
Expand Down Expand Up @@ -1008,7 +1007,7 @@ static struct of_device_id __initdata pci_sun4v_match[] = {
{},
};

static struct of_platform_driver pci_sun4v_driver = {
static struct platform_driver pci_sun4v_driver = {
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
Expand All @@ -1019,7 +1018,7 @@ static struct of_platform_driver pci_sun4v_driver = {

static int __init pci_sun4v_init(void)
{
return of_register_platform_driver(&pci_sun4v_driver);
return platform_driver_register(&pci_sun4v_driver);
}

subsys_initcall(pci_sun4v_init);
7 changes: 3 additions & 4 deletions arch/sparc/kernel/pmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ static void pmc_swift_idle(void)
#endif
}

static int __devinit pmc_probe(struct platform_device *op,
const struct of_device_id *match)
static int __devinit pmc_probe(struct platform_device *op)
{
regs = of_ioremap(&op->resource[0], 0,
resource_size(&op->resource[0]), PMC_OBPNAME);
Expand All @@ -78,7 +77,7 @@ static struct of_device_id __initdata pmc_match[] = {
};
MODULE_DEVICE_TABLE(of, pmc_match);

static struct of_platform_driver pmc_driver = {
static struct platform_driver pmc_driver = {
.driver = {
.name = "pmc",
.owner = THIS_MODULE,
Expand All @@ -89,7 +88,7 @@ static struct of_platform_driver pmc_driver = {

static int __init pmc_init(void)
{
return of_register_platform_driver(&pmc_driver);
return platform_driver_register(&pmc_driver);
}

/* This driver is not critical to the boot process
Expand Down
Loading

0 comments on commit 4ebb24f

Please sign in to comment.