omap mailbox: fix empty struct device for omap2
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
This commit is contained in:
Родитель
f98d67a07e
Коммит
da8cfe03a4
|
@ -61,7 +61,7 @@ static struct resource omap3_mbox_resources[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_device mbox_device = {
|
static struct platform_device mbox_device = {
|
||||||
.name = "mailbox",
|
.name = "omap2-mailbox",
|
||||||
.id = -1,
|
.id = -1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -234,7 +234,7 @@ static struct omap_mbox mbox_iva_info = {
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static int __init omap2_mbox_probe(struct platform_device *pdev)
|
static int __devinit omap2_mbox_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -257,7 +257,7 @@ static int __init omap2_mbox_probe(struct platform_device *pdev)
|
||||||
goto err_dsp;
|
goto err_dsp;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = omap_mbox_register(&mbox_dsp_info);
|
ret = omap_mbox_register(&pdev->dev, &mbox_dsp_info);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_dsp;
|
goto err_dsp;
|
||||||
|
|
||||||
|
@ -271,7 +271,7 @@ static int __init omap2_mbox_probe(struct platform_device *pdev)
|
||||||
goto err_iva1;
|
goto err_iva1;
|
||||||
}
|
}
|
||||||
mbox_iva_info.irq = res->start;
|
mbox_iva_info.irq = res->start;
|
||||||
ret = omap_mbox_register(&mbox_iva_info);
|
ret = omap_mbox_register(&pdev->dev, &mbox_iva_info);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_iva1;
|
goto err_iva1;
|
||||||
}
|
}
|
||||||
|
@ -285,7 +285,7 @@ err_dsp:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int omap2_mbox_remove(struct platform_device *pdev)
|
static int __devexit omap2_mbox_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
#if defined(CONFIG_ARCH_OMAP2420)
|
#if defined(CONFIG_ARCH_OMAP2420)
|
||||||
omap_mbox_unregister(&mbox_iva_info);
|
omap_mbox_unregister(&mbox_iva_info);
|
||||||
|
@ -297,9 +297,9 @@ static int omap2_mbox_remove(struct platform_device *pdev)
|
||||||
|
|
||||||
static struct platform_driver omap2_mbox_driver = {
|
static struct platform_driver omap2_mbox_driver = {
|
||||||
.probe = omap2_mbox_probe,
|
.probe = omap2_mbox_probe,
|
||||||
.remove = omap2_mbox_remove,
|
.remove = __devexit_p(omap2_mbox_remove),
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "mailbox",
|
.name = "omap2-mailbox",
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -319,3 +319,4 @@ module_exit(omap2_mbox_exit);
|
||||||
MODULE_LICENSE("GPL v2");
|
MODULE_LICENSE("GPL v2");
|
||||||
MODULE_DESCRIPTION("omap mailbox: omap2/3 architecture specific functions");
|
MODULE_DESCRIPTION("omap mailbox: omap2/3 architecture specific functions");
|
||||||
MODULE_AUTHOR("Hiroshi DOYU <Hiroshi.DOYU@nokia.com>, Paul Mundt");
|
MODULE_AUTHOR("Hiroshi DOYU <Hiroshi.DOYU@nokia.com>, Paul Mundt");
|
||||||
|
MODULE_ALIAS("platform:omap2-mailbox");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче