---

yaml --- r: 293466 b: refs/heads/master c: 0210dc4 h: refs/heads/master v: v3
git-mirror · Mar 12, 2012 · 63f5940 · 63f5940
1 parent e0610b4
commit 63f5940
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0324e02a077de6bffff566fa43fd7b46f4b3ebd8
+refs/heads/master: 0210dc4eafcfd1b38ac178ebf63627f359d6371d
diff --git a/trunk/arch/arm/mach-omap1/mcbsp.c b/trunk/arch/arm/mach-omap1/mcbsp.c
@@ -449,7 +449,7 @@ static int __init omap1_mcbsp_init(void)
 					omap16xx_mcbsp_pdata,
 					OMAP16XX_MCBSP_COUNT);
 
-	return omap_mcbsp_init();
+	return 0;
 }
 
 arch_initcall(omap1_mcbsp_init);
diff --git a/trunk/arch/arm/mach-omap2/mcbsp.c b/trunk/arch/arm/mach-omap2/mcbsp.c
@@ -193,6 +193,6 @@ static int __init omap2_mcbsp_init(void)
 	if (!mcbsp_ptr)
 		return -ENOMEM;
 
-	return omap_mcbsp_init();
+	return 0;
 }
 arch_initcall(omap2_mcbsp_init);
diff --git a/trunk/arch/arm/plat-omap/include/plat/mcbsp.h b/trunk/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -360,7 +360,6 @@ struct omap_mcbsp_dev_attr {
 extern struct omap_mcbsp **mcbsp_ptr;
 extern int omap_mcbsp_count;
 
-int omap_mcbsp_init(void);
 void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config);
 void omap_mcbsp_set_tx_threshold(unsigned int id, u16 threshold);
 void omap_mcbsp_set_rx_threshold(unsigned int id, u16 threshold);

diff --git a/trunk/arch/arm/plat-omap/mcbsp.c b/trunk/arch/arm/plat-omap/mcbsp.c
@@ -1354,8 +1354,9 @@ static struct platform_driver omap_mcbsp_driver = {
 	},
 };
 
-int __init omap_mcbsp_init(void)
-{
-	/* Register the McBSP driver */
-	return platform_driver_register(&omap_mcbsp_driver);
-}
+module_platform_driver(omap_mcbsp_driver);
+
+MODULE_AUTHOR("Samuel Ortiz <samuel.ortiz@nokia.com>");
+MODULE_DESCRIPTION("OMAP McBSP core driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:omap-mcbsp");