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

Commit 49334020 authored by Al Viro's avatar Al Viro Committed by Benjamin Herrenschmidt
Browse files

carma-fpga: Missed switch from of_register_platform_driver() 



... by 6 months

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 9c8b3907

drivers/misc/carma/carma-fpga-program.c

+4 −5
Original line number Diff line number Diff line
@@ -945,8 +945,7 @@ static int fpga_of_remove(struct platform_device *op) 
/* CTL-CPLD Version Register */

#define CTL_CPLD_VERSION	0x2000



static int fpga_of_probe(struct platform_device *op,

			 const struct of_device_id *match)

static int fpga_of_probe(struct platform_device *op)

{

	struct device_node *of_node = op->dev.of_node;

	struct device *this_device;
@@ -1107,7 +1106,7 @@ static struct of_device_id fpga_of_match[] = { 
	{},

};



static struct of_platform_driver fpga_of_driver = {

static struct platform_driver fpga_of_driver = {

	.probe		= fpga_of_probe,

	.remove		= fpga_of_remove,

	.driver		= {
@@ -1124,12 +1123,12 @@ static struct of_platform_driver fpga_of_driver = { 
static int __init fpga_init(void)

{

	led_trigger_register_simple("fpga", &ledtrig_fpga);

	return of_register_platform_driver(&fpga_of_driver);

	return platform_driver_register(&fpga_of_driver);

}



static void __exit fpga_exit(void)

{

	of_unregister_platform_driver(&fpga_of_driver);

	platform_driver_unregister(&fpga_of_driver);

	led_trigger_unregister_simple(ledtrig_fpga);

}

drivers/misc/carma/carma-fpga.c

+4 −5
Original line number Diff line number Diff line
@@ -1249,8 +1249,7 @@ static bool dma_filter(struct dma_chan *chan, void *data) 
	return true;

}



static int data_of_probe(struct platform_device *op,

			 const struct of_device_id *match)

static int data_of_probe(struct platform_device *op)

{

	struct device_node *of_node = op->dev.of_node;

	struct device *this_device;
@@ -1401,7 +1400,7 @@ static struct of_device_id data_of_match[] = { 
	{},

};



static struct of_platform_driver data_of_driver = {

static struct platform_driver data_of_driver = {

	.probe		= data_of_probe,

	.remove		= data_of_remove,

	.driver		= {
@@ -1417,12 +1416,12 @@ static struct of_platform_driver data_of_driver = { 


static int __init data_init(void)

{

	return of_register_platform_driver(&data_of_driver);

	return platform_driver_register(&data_of_driver);

}



static void __exit data_exit(void)

{

	of_unregister_platform_driver(&data_of_driver);

	platform_driver_unregister(&data_of_driver);

}



MODULE_AUTHOR("Ira W. Snyder <iws@ovro.caltech.edu>");