Skip to content

Commit

Permalink
OMAPDSS: DPI: use platform_driver_register()
Browse files Browse the repository at this point in the history
Use platform_driver_register() instead of platform_driver_probe() so
that we can support EPROBE_DEFER.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Tomi Valkeinen committed May 2, 2013
1 parent dfbc323 commit 94cf394
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/video/omap2/dss/dpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ void omapdss_dpi_set_data_lines(struct omap_dss_device *dssdev, int data_lines)
}
EXPORT_SYMBOL(omapdss_dpi_set_data_lines);

static int __init dpi_verify_dsi_pll(struct platform_device *dsidev)
static int dpi_verify_dsi_pll(struct platform_device *dsidev)
{
int r;

Expand Down Expand Up @@ -572,7 +572,7 @@ static enum omap_channel dpi_get_channel(void)
}
}

static int __init dpi_init_display(struct omap_dss_device *dssdev)
static int dpi_init_display(struct omap_dss_device *dssdev)
{
struct platform_device *dsidev;

Expand Down Expand Up @@ -607,7 +607,7 @@ static int __init dpi_init_display(struct omap_dss_device *dssdev)
return 0;
}

static struct omap_dss_device * __init dpi_find_dssdev(struct platform_device *pdev)
static struct omap_dss_device *dpi_find_dssdev(struct platform_device *pdev)
{
struct omap_dss_board_info *pdata = pdev->dev.platform_data;
const char *def_disp_name = omapdss_get_default_display_name();
Expand Down Expand Up @@ -635,7 +635,7 @@ static struct omap_dss_device * __init dpi_find_dssdev(struct platform_device *p
return def_dssdev;
}

static void __init dpi_probe_pdata(struct platform_device *dpidev)
static void dpi_probe_pdata(struct platform_device *dpidev)
{
struct omap_dss_device *plat_dssdev;
struct omap_dss_device *dssdev;
Expand Down Expand Up @@ -676,7 +676,7 @@ static void __init dpi_probe_pdata(struct platform_device *dpidev)
}
}

static void __init dpi_init_output(struct platform_device *pdev)
static void dpi_init_output(struct platform_device *pdev)
{
struct omap_dss_output *out = &dpi.output;

Expand All @@ -696,7 +696,7 @@ static void __exit dpi_uninit_output(struct platform_device *pdev)
dss_unregister_output(out);
}

static int __init omap_dpi_probe(struct platform_device *pdev)
static int omap_dpi_probe(struct platform_device *pdev)
{
mutex_init(&dpi.lock);

Expand All @@ -717,6 +717,7 @@ static int __exit omap_dpi_remove(struct platform_device *pdev)
}

static struct platform_driver omap_dpi_driver = {
.probe = omap_dpi_probe,
.remove = __exit_p(omap_dpi_remove),
.driver = {
.name = "omapdss_dpi",
Expand All @@ -726,7 +727,7 @@ static struct platform_driver omap_dpi_driver = {

int __init dpi_init_platform_driver(void)
{
return platform_driver_probe(&omap_dpi_driver, omap_dpi_probe);
return platform_driver_register(&omap_dpi_driver);
}

void __exit dpi_uninit_platform_driver(void)
Expand Down

0 comments on commit 94cf394

Please sign in to comment.