Commit 1c48a5c9 authored by Grant Likely's avatar Grant Likely
Browse files

dt: Eliminate of_platform_{,un}register_driver 



Final step to eliminate of_platform_bus_type.  They're all just
platform drivers now.

v2: fix type in pasemi_nand.c (thanks to Stephen Rothwell)

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 793218df

drivers/ata/pata_mpc52xx.c

+4 −4
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ mpc52xx_ata_remove_one(struct device *dev) 
/* ======================================================================== */



static int __devinit

mpc52xx_ata_probe(struct platform_device *op, const struct of_device_id *match)

mpc52xx_ata_probe(struct platform_device *op)

{

	unsigned int ipb_freq;

	struct resource res_mem;
@@ -883,7 +883,7 @@ static struct of_device_id mpc52xx_ata_of_match[] = { 
};





static struct of_platform_driver mpc52xx_ata_of_platform_driver = {

static struct platform_driver mpc52xx_ata_of_platform_driver = {

	.probe		= mpc52xx_ata_probe,

	.remove		= mpc52xx_ata_remove,

#ifdef CONFIG_PM
@@ -906,13 +906,13 @@ static int __init 
mpc52xx_ata_init(void)

{

	printk(KERN_INFO "ata: MPC52xx IDE/ATA libata driver\n");

	return of_register_platform_driver(&mpc52xx_ata_of_platform_driver);

	return platform_driver_register(&mpc52xx_ata_of_platform_driver);

}



static void __exit

mpc52xx_ata_exit(void)

{

	of_unregister_platform_driver(&mpc52xx_ata_of_platform_driver);

	platform_driver_unregister(&mpc52xx_ata_of_platform_driver);

}



module_init(mpc52xx_ata_init);

drivers/ata/pata_of_platform.c

+4 −5
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
#include <linux/of_platform.h>

#include <linux/ata_platform.h>



static int __devinit pata_of_platform_probe(struct platform_device *ofdev,

					    const struct of_device_id *match)

static int __devinit pata_of_platform_probe(struct platform_device *ofdev)

{

	int ret;

	struct device_node *dn = ofdev->dev.of_node;
@@ -90,7 +89,7 @@ static struct of_device_id pata_of_platform_match[] = { 
};

MODULE_DEVICE_TABLE(of, pata_of_platform_match);



static struct of_platform_driver pata_of_platform_driver = {

static struct platform_driver pata_of_platform_driver = {

	.driver = {

		.name = "pata_of_platform",

		.owner = THIS_MODULE,
@@ -102,13 +101,13 @@ static struct of_platform_driver pata_of_platform_driver = { 


static int __init pata_of_platform_init(void)

{

	return of_register_platform_driver(&pata_of_platform_driver);

	return platform_driver_register(&pata_of_platform_driver);

}

module_init(pata_of_platform_init);



static void __exit pata_of_platform_exit(void)

{

	of_unregister_platform_driver(&pata_of_platform_driver);

	platform_driver_unregister(&pata_of_platform_driver);

}

module_exit(pata_of_platform_exit);

drivers/ata/sata_dwc_460ex.c

+4 −5
Original line number Diff line number Diff line
@@ -1588,8 +1588,7 @@ static const struct ata_port_info sata_dwc_port_info[] = { 
	},

};



static int sata_dwc_probe(struct platform_device *ofdev,

			const struct of_device_id *match)

static int sata_dwc_probe(struct platform_device *ofdev)

{

	struct sata_dwc_device *hsdev;

	u32 idr, versionr;
@@ -1727,7 +1726,7 @@ static const struct of_device_id sata_dwc_match[] = { 
};

MODULE_DEVICE_TABLE(of, sata_dwc_match);



static struct of_platform_driver sata_dwc_driver = {

static struct platform_driver sata_dwc_driver = {

	.driver = {

		.name = DRV_NAME,

		.owner = THIS_MODULE,
@@ -1739,12 +1738,12 @@ static struct of_platform_driver sata_dwc_driver = { 


static int __init sata_dwc_init(void)

{

	return	of_register_platform_driver(&sata_dwc_driver);

	return platform_driver_register(&sata_dwc_driver);

}



static void __exit sata_dwc_exit(void)

{

	of_unregister_platform_driver(&sata_dwc_driver);

	platform_driver_unregister(&sata_dwc_driver);

}



module_init(sata_dwc_init);

drivers/ata/sata_fsl.c

+4 −5
Original line number Diff line number Diff line
@@ -1293,8 +1293,7 @@ static const struct ata_port_info sata_fsl_port_info[] = { 
	 },

};



static int sata_fsl_probe(struct platform_device *ofdev,

			const struct of_device_id *match)

static int sata_fsl_probe(struct platform_device *ofdev)

{

	int retval = -ENXIO;

	void __iomem *hcr_base = NULL;
@@ -1423,7 +1422,7 @@ static struct of_device_id fsl_sata_match[] = { 


MODULE_DEVICE_TABLE(of, fsl_sata_match);



static struct of_platform_driver fsl_sata_driver = {

static struct platform_driver fsl_sata_driver = {

	.driver = {

		.name = "fsl-sata",

		.owner = THIS_MODULE,
@@ -1439,13 +1438,13 @@ static struct of_platform_driver fsl_sata_driver = { 


static int __init sata_fsl_init(void)

{

	of_register_platform_driver(&fsl_sata_driver);

	platform_driver_register(&fsl_sata_driver);

	return 0;

}



static void __exit sata_fsl_exit(void)

{

	of_unregister_platform_driver(&fsl_sata_driver);

	platform_driver_unregister(&fsl_sata_driver);

}



MODULE_LICENSE("GPL");

drivers/atm/fore200e.c

+10 −7
Original line number Diff line number Diff line
@@ -2643,14 +2643,17 @@ fore200e_init(struct fore200e* fore200e, struct device *parent) 
}



#ifdef CONFIG_SBUS

static int __devinit fore200e_sba_probe(struct platform_device *op,

					const struct of_device_id *match)

static int __devinit fore200e_sba_probe(struct platform_device *op)

{

	const struct fore200e_bus *bus = match->data;

	const struct fore200e_bus *bus;

	struct fore200e *fore200e;

	static int index = 0;

	int err;



	if (!op->dev.of_match)

		return -EINVAL;

	bus = op->dev.of_match->data;



	fore200e = kzalloc(sizeof(struct fore200e), GFP_KERNEL);

	if (!fore200e)

		return -ENOMEM;
@@ -2694,7 +2697,7 @@ static const struct of_device_id fore200e_sba_match[] = { 
};

MODULE_DEVICE_TABLE(of, fore200e_sba_match);



static struct of_platform_driver fore200e_sba_driver = {

static struct platform_driver fore200e_sba_driver = {

	.driver = {

		.name = "fore_200e",

		.owner = THIS_MODULE,
@@ -2795,7 +2798,7 @@ static int __init fore200e_module_init(void) 
	printk(FORE200E "FORE Systems 200E-series ATM driver - version " FORE200E_VERSION "\n");



#ifdef CONFIG_SBUS

	err = of_register_platform_driver(&fore200e_sba_driver);

	err = platform_driver_register(&fore200e_sba_driver);

	if (err)

		return err;

#endif
@@ -2806,7 +2809,7 @@ static int __init fore200e_module_init(void) 


#ifdef CONFIG_SBUS

	if (err)

		of_unregister_platform_driver(&fore200e_sba_driver);

		platform_driver_unregister(&fore200e_sba_driver);

#endif



	return err;
@@ -2818,7 +2821,7 @@ static void __exit fore200e_module_cleanup(void) 
	pci_unregister_driver(&fore200e_pca_driver);

#endif

#ifdef CONFIG_SBUS

	of_unregister_platform_driver(&fore200e_sba_driver);

	platform_driver_unregister(&fore200e_sba_driver);

#endif

}