[5/5] OMAP: DSS2: use omap_dss_register_driver_probe() in selected drivers

Commit Message

Tomi Valkeinen April 1, 2011, 10 a.m. UTC

None

Patch

diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
index e359f93..010ea4e 100644
--- a/drivers/video/omap2/displays/panel-generic-dpi.c
+++ b/drivers/video/omap2/displays/panel-generic-dpi.c
@@ -246,7 +246,7 @@  static void generic_dpi_panel_power_off(struct omap_dss_device *dssdev)
 	omapdss_dpi_display_disable(dssdev);
 }
 
-static int generic_dpi_panel_probe(struct omap_dss_device *dssdev)
+static int __init generic_dpi_panel_probe(struct omap_dss_device *dssdev)
 {
 	struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
 	struct panel_config *panel_config = NULL;
@@ -357,7 +357,6 @@  static int generic_dpi_panel_check_timings(struct omap_dss_device *dssdev,
 }
 
 static struct omap_dss_driver dpi_driver = {
-	.probe		= generic_dpi_panel_probe,
 	.remove		= __exit_p(generic_dpi_panel_remove),
 
 	.enable		= generic_dpi_panel_enable,
@@ -377,7 +376,8 @@  static struct omap_dss_driver dpi_driver = {
 
 static int __init generic_dpi_panel_drv_init(void)
 {
-	return omap_dss_register_driver(&dpi_driver);
+	return omap_dss_register_driver_probe(&dpi_driver,
+			generic_dpi_panel_probe);
 }
 
 static void __exit generic_dpi_panel_drv_exit(void)
diff --git a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
index c772747..2cf3c9f 100644
--- a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
@@ -79,7 +79,7 @@  static const struct backlight_ops sharp_ls_bl_ops = {
 
 
 
-static int sharp_ls_panel_probe(struct omap_dss_device *dssdev)
+static int __init sharp_ls_panel_probe(struct omap_dss_device *dssdev)
 {
 	struct backlight_properties props;
 	struct backlight_device *bl;
@@ -204,7 +204,6 @@  static int sharp_ls_panel_resume(struct omap_dss_device *dssdev)
 }
 
 static struct omap_dss_driver sharp_ls_driver = {
-	.probe		= sharp_ls_panel_probe,
 	.remove		= __exit_p(sharp_ls_panel_remove),
 
 	.enable		= sharp_ls_panel_enable,
@@ -220,7 +219,8 @@  static struct omap_dss_driver sharp_ls_driver = {
 
 static int __init sharp_ls_panel_drv_init(void)
 {
-	return omap_dss_register_driver(&sharp_ls_driver);
+	return omap_dss_register_driver_probe(&sharp_ls_driver,
+			sharp_ls_panel_probe);
 }
 
 static void __exit sharp_ls_panel_drv_exit(void)
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 490998f..d62821e 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -661,7 +661,7 @@  static void taal_hw_reset(struct omap_dss_device *dssdev)
 		msleep(td->panel_config->sleep.hw_reset);
 }
 
-static int taal_probe(struct omap_dss_device *dssdev)
+static int __init taal_probe(struct omap_dss_device *dssdev)
 {
 	struct backlight_properties props;
 	struct taal_data *td;
@@ -1556,7 +1556,6 @@  static enum omap_dss_update_mode taal_get_update_mode(
 }
 
 static struct omap_dss_driver taal_driver = {
-	.probe		= taal_probe,
 	.remove		= __exit_p(taal_remove),
 
 	.enable		= taal_enable,
@@ -1593,7 +1592,7 @@  static struct omap_dss_driver taal_driver = {
 
 static int __init taal_init(void)
 {
-	omap_dss_register_driver(&taal_driver);
+	omap_dss_register_driver_probe(&taal_driver, taal_probe);
 
 	return 0;
 }