forked from Minki/linux
OMAPDSS: use platform_driver_probe for dsi/hdmi/rfbi/venc/dpi/sdi
Now that the core.c doesn't fail if output driver's init fails, we can change the uses of platform_driver_register to platform_driver_probe. This will allow us to use __init in the following patches. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
parent
e40402cf18
commit
61055d4b2e
@ -376,7 +376,6 @@ static int omap_dpi_remove(struct platform_device *pdev)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static struct platform_driver omap_dpi_driver = {
|
static struct platform_driver omap_dpi_driver = {
|
||||||
.probe = omap_dpi_probe,
|
|
||||||
.remove = omap_dpi_remove,
|
.remove = omap_dpi_remove,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "omapdss_dpi",
|
.name = "omapdss_dpi",
|
||||||
@ -386,7 +385,7 @@ static struct platform_driver omap_dpi_driver = {
|
|||||||
|
|
||||||
int dpi_init_platform_driver(void)
|
int dpi_init_platform_driver(void)
|
||||||
{
|
{
|
||||||
return platform_driver_register(&omap_dpi_driver);
|
return platform_driver_probe(&omap_dpi_driver, omap_dpi_probe);
|
||||||
}
|
}
|
||||||
|
|
||||||
void dpi_uninit_platform_driver(void)
|
void dpi_uninit_platform_driver(void)
|
||||||
|
@ -4768,7 +4768,6 @@ static const struct dev_pm_ops dsi_pm_ops = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_driver omap_dsihw_driver = {
|
static struct platform_driver omap_dsihw_driver = {
|
||||||
.probe = omap_dsihw_probe,
|
|
||||||
.remove = omap_dsihw_remove,
|
.remove = omap_dsihw_remove,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "omapdss_dsi",
|
.name = "omapdss_dsi",
|
||||||
@ -4779,7 +4778,7 @@ static struct platform_driver omap_dsihw_driver = {
|
|||||||
|
|
||||||
int dsi_init_platform_driver(void)
|
int dsi_init_platform_driver(void)
|
||||||
{
|
{
|
||||||
return platform_driver_register(&omap_dsihw_driver);
|
return platform_driver_probe(&omap_dsihw_driver, omap_dsihw_probe);
|
||||||
}
|
}
|
||||||
|
|
||||||
void dsi_uninit_platform_driver(void)
|
void dsi_uninit_platform_driver(void)
|
||||||
|
@ -872,7 +872,6 @@ static const struct dev_pm_ops hdmi_pm_ops = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_driver omapdss_hdmihw_driver = {
|
static struct platform_driver omapdss_hdmihw_driver = {
|
||||||
.probe = omapdss_hdmihw_probe,
|
|
||||||
.remove = omapdss_hdmihw_remove,
|
.remove = omapdss_hdmihw_remove,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "omapdss_hdmi",
|
.name = "omapdss_hdmi",
|
||||||
@ -883,7 +882,7 @@ static struct platform_driver omapdss_hdmihw_driver = {
|
|||||||
|
|
||||||
int hdmi_init_platform_driver(void)
|
int hdmi_init_platform_driver(void)
|
||||||
{
|
{
|
||||||
return platform_driver_register(&omapdss_hdmihw_driver);
|
return platform_driver_probe(&omapdss_hdmihw_driver, omapdss_hdmihw_probe);
|
||||||
}
|
}
|
||||||
|
|
||||||
void hdmi_uninit_platform_driver(void)
|
void hdmi_uninit_platform_driver(void)
|
||||||
|
@ -1015,7 +1015,6 @@ static const struct dev_pm_ops rfbi_pm_ops = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_driver omap_rfbihw_driver = {
|
static struct platform_driver omap_rfbihw_driver = {
|
||||||
.probe = omap_rfbihw_probe,
|
|
||||||
.remove = omap_rfbihw_remove,
|
.remove = omap_rfbihw_remove,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "omapdss_rfbi",
|
.name = "omapdss_rfbi",
|
||||||
@ -1026,7 +1025,7 @@ static struct platform_driver omap_rfbihw_driver = {
|
|||||||
|
|
||||||
int rfbi_init_platform_driver(void)
|
int rfbi_init_platform_driver(void)
|
||||||
{
|
{
|
||||||
return platform_driver_register(&omap_rfbihw_driver);
|
return platform_driver_probe(&omap_rfbihw_driver, omap_rfbihw_probe);
|
||||||
}
|
}
|
||||||
|
|
||||||
void rfbi_uninit_platform_driver(void)
|
void rfbi_uninit_platform_driver(void)
|
||||||
|
@ -187,7 +187,6 @@ static int omap_sdi_remove(struct platform_device *pdev)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static struct platform_driver omap_sdi_driver = {
|
static struct platform_driver omap_sdi_driver = {
|
||||||
.probe = omap_sdi_probe,
|
|
||||||
.remove = omap_sdi_remove,
|
.remove = omap_sdi_remove,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "omapdss_sdi",
|
.name = "omapdss_sdi",
|
||||||
@ -197,7 +196,7 @@ static struct platform_driver omap_sdi_driver = {
|
|||||||
|
|
||||||
int sdi_init_platform_driver(void)
|
int sdi_init_platform_driver(void)
|
||||||
{
|
{
|
||||||
return platform_driver_register(&omap_sdi_driver);
|
return platform_driver_probe(&omap_sdi_driver, omap_sdi_probe);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sdi_uninit_platform_driver(void)
|
void sdi_uninit_platform_driver(void)
|
||||||
|
@ -929,7 +929,6 @@ static const struct dev_pm_ops venc_pm_ops = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_driver omap_venchw_driver = {
|
static struct platform_driver omap_venchw_driver = {
|
||||||
.probe = omap_venchw_probe,
|
|
||||||
.remove = omap_venchw_remove,
|
.remove = omap_venchw_remove,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "omapdss_venc",
|
.name = "omapdss_venc",
|
||||||
@ -943,7 +942,7 @@ int venc_init_platform_driver(void)
|
|||||||
if (cpu_is_omap44xx())
|
if (cpu_is_omap44xx())
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
return platform_driver_register(&omap_venchw_driver);
|
return platform_driver_probe(&omap_venchw_driver, omap_venchw_probe);
|
||||||
}
|
}
|
||||||
|
|
||||||
void venc_uninit_platform_driver(void)
|
void venc_uninit_platform_driver(void)
|
||||||
|
Loading…
Reference in New Issue
Block a user