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

Commit 28541d0f authored by Grant Likely's avatar Grant Likely
Browse files

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



Get rid of users of of_platform_driver in drivers/video.  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 74888760

drivers/video/bw2.c

+4 −4
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static int __devinit bw2_do_default_mode(struct bw2_par *par, 
	return 0;

}



static int __devinit bw2_probe(struct platform_device *op, const struct of_device_id *match)

static int __devinit bw2_probe(struct platform_device *op)

{

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

	struct fb_info *info;
@@ -375,7 +375,7 @@ static const struct of_device_id bw2_match[] = { 
};

MODULE_DEVICE_TABLE(of, bw2_match);



static struct of_platform_driver bw2_driver = {

static struct platform_driver bw2_driver = {

	.driver = {

		.name = "bw2",

		.owner = THIS_MODULE,
@@ -390,12 +390,12 @@ static int __init bw2_init(void) 
	if (fb_get_options("bw2fb", NULL))

		return -ENODEV;



	return of_register_platform_driver(&bw2_driver);

	return platform_driver_register(&bw2_driver);

}



static void __exit bw2_exit(void)

{

	of_unregister_platform_driver(&bw2_driver);

	platform_driver_unregister(&bw2_driver);

}



module_init(bw2_init);

drivers/video/cg14.c

+4 −4
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static void cg14_unmap_regs(struct platform_device *op, struct fb_info *info, 
			   info->screen_base, info->fix.smem_len);

}



static int __devinit cg14_probe(struct platform_device *op, const struct of_device_id *match)

static int __devinit cg14_probe(struct platform_device *op)

{

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

	struct fb_info *info;
@@ -595,7 +595,7 @@ static const struct of_device_id cg14_match[] = { 
};

MODULE_DEVICE_TABLE(of, cg14_match);



static struct of_platform_driver cg14_driver = {

static struct platform_driver cg14_driver = {

	.driver = {

		.name = "cg14",

		.owner = THIS_MODULE,
@@ -610,12 +610,12 @@ static int __init cg14_init(void) 
	if (fb_get_options("cg14fb", NULL))

		return -ENODEV;



	return of_register_platform_driver(&cg14_driver);

	return platform_driver_register(&cg14_driver);

}



static void __exit cg14_exit(void)

{

	of_unregister_platform_driver(&cg14_driver);

	platform_driver_unregister(&cg14_driver);

}



module_init(cg14_init);

drivers/video/cg3.c

+4 −5
Original line number Diff line number Diff line
@@ -346,8 +346,7 @@ static int __devinit cg3_do_default_mode(struct cg3_par *par) 
	return 0;

}



static int __devinit cg3_probe(struct platform_device *op,

			       const struct of_device_id *match)

static int __devinit cg3_probe(struct platform_device *op)

{

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

	struct fb_info *info;
@@ -462,7 +461,7 @@ static const struct of_device_id cg3_match[] = { 
};

MODULE_DEVICE_TABLE(of, cg3_match);



static struct of_platform_driver cg3_driver = {

static struct platform_driver cg3_driver = {

	.driver = {

		.name = "cg3",

		.owner = THIS_MODULE,
@@ -477,12 +476,12 @@ static int __init cg3_init(void) 
	if (fb_get_options("cg3fb", NULL))

		return -ENODEV;



	return of_register_platform_driver(&cg3_driver);

	return platform_driver_register(&cg3_driver);

}



static void __exit cg3_exit(void)

{

	of_unregister_platform_driver(&cg3_driver);

	platform_driver_unregister(&cg3_driver);

}



module_init(cg3_init);

drivers/video/cg6.c

+4 −5
Original line number Diff line number Diff line
@@ -737,8 +737,7 @@ static void cg6_unmap_regs(struct platform_device *op, struct fb_info *info, 
			   info->fix.smem_len);

}



static int __devinit cg6_probe(struct platform_device *op,

				const struct of_device_id *match)

static int __devinit cg6_probe(struct platform_device *op)

{

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

	struct fb_info *info;
@@ -855,7 +854,7 @@ static const struct of_device_id cg6_match[] = { 
};

MODULE_DEVICE_TABLE(of, cg6_match);



static struct of_platform_driver cg6_driver = {

static struct platform_driver cg6_driver = {

	.driver = {

		.name = "cg6",

		.owner = THIS_MODULE,
@@ -870,12 +869,12 @@ static int __init cg6_init(void) 
	if (fb_get_options("cg6fb", NULL))

		return -ENODEV;



	return of_register_platform_driver(&cg6_driver);

	return platform_driver_register(&cg6_driver);

}



static void __exit cg6_exit(void)

{

	of_unregister_platform_driver(&cg6_driver);

	platform_driver_unregister(&cg6_driver);

}



module_init(cg6_init);

drivers/video/ffb.c

+4 −5
Original line number Diff line number Diff line
@@ -893,8 +893,7 @@ static void ffb_init_fix(struct fb_info *info) 
	info->fix.accel = FB_ACCEL_SUN_CREATOR;

}



static int __devinit ffb_probe(struct platform_device *op,

			       const struct of_device_id *match)

static int __devinit ffb_probe(struct platform_device *op)

{

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

	struct ffb_fbc __iomem *fbc;
@@ -1052,7 +1051,7 @@ static const struct of_device_id ffb_match[] = { 
};

MODULE_DEVICE_TABLE(of, ffb_match);



static struct of_platform_driver ffb_driver = {

static struct platform_driver ffb_driver = {

	.driver = {

		.name = "ffb",

		.owner = THIS_MODULE,
@@ -1067,12 +1066,12 @@ static int __init ffb_init(void) 
	if (fb_get_options("ffb", NULL))

		return -ENODEV;



	return of_register_platform_driver(&ffb_driver);

	return platform_driver_register(&ffb_driver);

}



static void __exit ffb_exit(void)

{

	of_unregister_platform_driver(&ffb_driver);

	platform_driver_unregister(&ffb_driver);

}



module_init(ffb_init);