Skip to content

L
linux-davinci
Commit 2e1c754b authored by Hiroshi DOYU's avatar Hiroshi DOYU
Browse files
Options

omap mailbox: fix empty struct device for omap2 

Signed-off-by: default avatarHiroshi DOYU <Hiroshi.DOYU@nokia.com>
parent a5abbbe5
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 7 deletions
arch/arm/mach-omap2/devices.c
View file @ 2e1c754b
...@@ -101,7 +101,7 @@ static struct resource omap3_mbox_resources[] = { ...@@ -101,7 +101,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,
}; };
......
arch/arm/mach-omap2/mailbox.c
View file @ 2e1c754b
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
#include <mach/irqs.h> #include <mach/irqs.h>
#include <asm/io.h> #include <asm/io.h>
#define DRV_NAME "omap2-mailbox"
#define MAILBOX_REVISION 0x000 #define MAILBOX_REVISION 0x000
#define MAILBOX_SYSCONFIG 0x010 #define MAILBOX_SYSCONFIG 0x010
#define MAILBOX_SYSSTATUS 0x014 #define MAILBOX_SYSSTATUS 0x014
...@@ -234,7 +236,7 @@ static struct omap_mbox mbox_iva_info = { ...@@ -234,7 +236,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;
...@@ -258,7 +260,7 @@ static int __init omap2_mbox_probe(struct platform_device *pdev) ...@@ -258,7 +260,7 @@ static int __init omap2_mbox_probe(struct platform_device *pdev)
} }
mbox_dsp_info.irq = res->start; mbox_dsp_info.irq = res->start;
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;
...@@ -272,7 +274,7 @@ static int __init omap2_mbox_probe(struct platform_device *pdev) ...@@ -272,7 +274,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;
} }
...@@ -286,7 +288,7 @@ err_dsp: ...@@ -286,7 +288,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);
...@@ -298,9 +300,9 @@ static int omap2_mbox_remove(struct platform_device *pdev) ...@@ -298,9 +300,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 = DRV_NAME,
}, },
}; };
...@@ -320,3 +322,4 @@ module_exit(omap2_mbox_exit); ...@@ -320,3 +322,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:"DRV_NAME);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment