2 files changed, 3 insertions, 11 deletions

diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
index d9af9811dedd..ab7395d84bc8 100644
--- a/arch/arm/mach-omap1/mcbsp.c
+++ b/arch/arm/mach-omap1/mcbsp.c
@@ -38,7 +38,7 @@ static void omap1_mcbsp_request(unsigned int id)
          * On 1510, 1610 and 1710, McBSP1 and McBSP3
          * are DSP public peripherals.
          */
-        if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {
+        if (id == 0 || id == 2) {
                 if (dsp_use++ == 0) {
                         api_clk = clk_get(NULL, "api_ck");
                         dsp_clk = clk_get(NULL, "dsp_ck");
@@ -59,7 +59,7 @@ static void omap1_mcbsp_request(unsigned int id)
 
 static void omap1_mcbsp_free(unsigned int id)
 {
-        if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {
+        if (id == 0 || id == 2) {
                 if (--dsp_use == 0) {
                         if (!IS_ERR(api_clk)) {
                                 clk_disable(api_clk);
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
index 63464ad9c67a..9882c657b2d4 100644
--- a/arch/arm/plat-omap/include/plat/mcbsp.h
+++ b/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -33,7 +33,7 @@
 #define OMAP_MCBSP_PLATFORM_DEVICE(port_nr)             \
 static struct platform_device omap_mcbsp##port_nr = {   \
         .name   = "omap-mcbsp-dai",                     \
-        .id     = OMAP_MCBSP##port_nr,                  \
+        .id     = port_nr - 1,                  \
 }
 
 #define MCBSP_CONFIG_TYPE2      0x2
@@ -332,14 +332,6 @@ struct omap_mcbsp_reg_cfg {
 };
 
 typedef enum {
-        OMAP_MCBSP1 = 0,
-        OMAP_MCBSP2,
-        OMAP_MCBSP3,
-        OMAP_MCBSP4,
-        OMAP_MCBSP5
-} omap_mcbsp_id;
-
-typedef enum {
         OMAP_MCBSP_WORD_8 = 0,
         OMAP_MCBSP_WORD_12,
         OMAP_MCBSP_WORD_16,