Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18d306d1 authored by Grant Likely's avatar Grant Likely
Browse files

dt/spi: Eliminate users of of_platform_{,un}register_driver 



Get rid of users of of_platform_driver in drivers/spi.  The
of_platform_{,un}register_driver functions are going away, so the
users need to be converted to using the platform_bus_type directly.

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

drivers/spi/mpc512x_psc_spi.c

+4 −5
Original line number Diff line number Diff line
@@ -507,8 +507,7 @@ static int __devexit mpc512x_psc_spi_do_remove(struct device *dev) 
	return 0;

}



static int __devinit mpc512x_psc_spi_of_probe(struct platform_device *op,

					      const struct of_device_id *match)

static int __devinit mpc512x_psc_spi_of_probe(struct platform_device *op)

{

	const u32 *regaddr_p;

	u64 regaddr64, size64;
@@ -551,7 +550,7 @@ static struct of_device_id mpc512x_psc_spi_of_match[] = { 


MODULE_DEVICE_TABLE(of, mpc512x_psc_spi_of_match);



static struct of_platform_driver mpc512x_psc_spi_of_driver = {

static struct platform_driver mpc512x_psc_spi_of_driver = {

	.probe = mpc512x_psc_spi_of_probe,

	.remove = __devexit_p(mpc512x_psc_spi_of_remove),

	.driver = {
@@ -563,13 +562,13 @@ static struct of_platform_driver mpc512x_psc_spi_of_driver = { 


static int __init mpc512x_psc_spi_init(void)

{

	return of_register_platform_driver(&mpc512x_psc_spi_of_driver);

	return platform_driver_register(&mpc512x_psc_spi_of_driver);

}

module_init(mpc512x_psc_spi_init);



static void __exit mpc512x_psc_spi_exit(void)

{

	of_unregister_platform_driver(&mpc512x_psc_spi_of_driver);

	platform_driver_unregister(&mpc512x_psc_spi_of_driver);

}

module_exit(mpc512x_psc_spi_exit);

drivers/spi/mpc52xx_psc_spi.c

+4 −5
Original line number Diff line number Diff line
@@ -450,8 +450,7 @@ free_master: 
	return ret;

}



static int __devinit mpc52xx_psc_spi_of_probe(struct platform_device *op,

	const struct of_device_id *match)

static int __devinit mpc52xx_psc_spi_of_probe(struct platform_device *op)

{

	const u32 *regaddr_p;

	u64 regaddr64, size64;
@@ -503,7 +502,7 @@ static const struct of_device_id mpc52xx_psc_spi_of_match[] = { 


MODULE_DEVICE_TABLE(of, mpc52xx_psc_spi_of_match);



static struct of_platform_driver mpc52xx_psc_spi_of_driver = {

static struct platform_driver mpc52xx_psc_spi_of_driver = {

	.probe = mpc52xx_psc_spi_of_probe,

	.remove = __devexit_p(mpc52xx_psc_spi_of_remove),

	.driver = {
@@ -515,13 +514,13 @@ static struct of_platform_driver mpc52xx_psc_spi_of_driver = { 


static int __init mpc52xx_psc_spi_init(void)

{

	return of_register_platform_driver(&mpc52xx_psc_spi_of_driver);

	return platform_driver_register(&mpc52xx_psc_spi_of_driver);

}

module_init(mpc52xx_psc_spi_init);



static void __exit mpc52xx_psc_spi_exit(void)

{

	of_unregister_platform_driver(&mpc52xx_psc_spi_of_driver);

	platform_driver_unregister(&mpc52xx_psc_spi_of_driver);

}

module_exit(mpc52xx_psc_spi_exit);

drivers/spi/mpc52xx_spi.c

+4 −5
Original line number Diff line number Diff line
@@ -390,8 +390,7 @@ static int mpc52xx_spi_transfer(struct spi_device *spi, struct spi_message *m) 
/*

 * OF Platform Bus Binding

 */

static int __devinit mpc52xx_spi_probe(struct platform_device *op,

				       const struct of_device_id *match)

static int __devinit mpc52xx_spi_probe(struct platform_device *op)

{

	struct spi_master *master;

	struct mpc52xx_spi *ms;
@@ -556,7 +555,7 @@ static const struct of_device_id mpc52xx_spi_match[] __devinitconst = { 
};

MODULE_DEVICE_TABLE(of, mpc52xx_spi_match);



static struct of_platform_driver mpc52xx_spi_of_driver = {

static struct platform_driver mpc52xx_spi_of_driver = {

	.driver = {

		.name = "mpc52xx-spi",

		.owner = THIS_MODULE,
@@ -568,13 +567,13 @@ static struct of_platform_driver mpc52xx_spi_of_driver = { 


static int __init mpc52xx_spi_init(void)

{

	return of_register_platform_driver(&mpc52xx_spi_of_driver);

	return platform_driver_register(&mpc52xx_spi_of_driver);

}

module_init(mpc52xx_spi_init);



static void __exit mpc52xx_spi_exit(void)

{

	of_unregister_platform_driver(&mpc52xx_spi_of_driver);

	platform_driver_unregister(&mpc52xx_spi_of_driver);

}

module_exit(mpc52xx_spi_exit);

drivers/spi/spi_fsl_espi.c

+5 −6
Original line number Diff line number Diff line
@@ -685,8 +685,7 @@ static int of_fsl_espi_get_chipselects(struct device *dev) 
	return 0;

}



static int __devinit of_fsl_espi_probe(struct platform_device *ofdev,

					const struct of_device_id *ofid)

static int __devinit of_fsl_espi_probe(struct platform_device *ofdev)

{

	struct device *dev = &ofdev->dev;

	struct device_node *np = ofdev->dev.of_node;
@@ -695,7 +694,7 @@ static int __devinit of_fsl_espi_probe(struct platform_device *ofdev, 
	struct resource irq;

	int ret = -ENOMEM;



	ret = of_mpc8xxx_spi_probe(ofdev, ofid);

	ret = of_mpc8xxx_spi_probe(ofdev);

	if (ret)

		return ret;
@@ -736,7 +735,7 @@ static const struct of_device_id of_fsl_espi_match[] = { 
};

MODULE_DEVICE_TABLE(of, of_fsl_espi_match);



static struct of_platform_driver fsl_espi_driver = {

static struct platform_driver fsl_espi_driver = {

	.driver = {

		.name = "fsl_espi",

		.owner = THIS_MODULE,
@@ -748,13 +747,13 @@ static struct of_platform_driver fsl_espi_driver = { 


static int __init fsl_espi_init(void)

{

	return of_register_platform_driver(&fsl_espi_driver);

	return platform_driver_register(&fsl_espi_driver);

}

module_init(fsl_espi_init);



static void __exit fsl_espi_exit(void)

{

	of_unregister_platform_driver(&fsl_espi_driver);

	platform_driver_unregister(&fsl_espi_driver);

}

module_exit(fsl_espi_exit);

drivers/spi/spi_fsl_lib.c

+1 −2
Original line number Diff line number Diff line
@@ -189,8 +189,7 @@ int __devexit mpc8xxx_spi_remove(struct device *dev) 
	return 0;

}



int __devinit of_mpc8xxx_spi_probe(struct platform_device *ofdev,

					const struct of_device_id *ofid)

int __devinit of_mpc8xxx_spi_probe(struct platform_device *ofdev)

{

	struct device *dev = &ofdev->dev;

	struct device_node *np = ofdev->dev.of_node;