Skip to content

Commit

Permalink
OMAPDSS: RFBI: 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 ee4a24e commit 9abf7de
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions drivers/video/omap2/dss/rfbi.c
Original file line number Diff line number Diff line change
Expand Up @@ -943,13 +943,13 @@ void omapdss_rfbi_display_disable(struct omap_dss_device *dssdev)
}
EXPORT_SYMBOL(omapdss_rfbi_display_disable);

static int __init rfbi_init_display(struct omap_dss_device *dssdev)
static int rfbi_init_display(struct omap_dss_device *dssdev)
{
rfbi.dssdev[dssdev->phy.rfbi.channel] = dssdev;
return 0;
}

static struct omap_dss_device * __init rfbi_find_dssdev(struct platform_device *pdev)
static struct omap_dss_device *rfbi_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 @@ -977,7 +977,7 @@ static struct omap_dss_device * __init rfbi_find_dssdev(struct platform_device *
return def_dssdev;
}

static void __init rfbi_probe_pdata(struct platform_device *rfbidev)
static void rfbi_probe_pdata(struct platform_device *rfbidev)
{
struct omap_dss_device *plat_dssdev;
struct omap_dss_device *dssdev;
Expand Down Expand Up @@ -1018,7 +1018,7 @@ static void __init rfbi_probe_pdata(struct platform_device *rfbidev)
}
}

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

Expand All @@ -1039,7 +1039,7 @@ static void __exit rfbi_uninit_output(struct platform_device *pdev)
}

/* RFBI HW IP initialisation */
static int __init omap_rfbihw_probe(struct platform_device *pdev)
static int omap_rfbihw_probe(struct platform_device *pdev)
{
u32 rev;
struct resource *rfbi_mem;
Expand Down Expand Up @@ -1135,6 +1135,7 @@ static const struct dev_pm_ops rfbi_pm_ops = {
};

static struct platform_driver omap_rfbihw_driver = {
.probe = omap_rfbihw_probe,
.remove = __exit_p(omap_rfbihw_remove),
.driver = {
.name = "omapdss_rfbi",
Expand All @@ -1145,7 +1146,7 @@ static struct platform_driver omap_rfbihw_driver = {

int __init rfbi_init_platform_driver(void)
{
return platform_driver_probe(&omap_rfbihw_driver, omap_rfbihw_probe);
return platform_driver_register(&omap_rfbihw_driver);
}

void __exit rfbi_uninit_platform_driver(void)
Expand Down

0 comments on commit 9abf7de

Please sign in to comment.