Fix build warnings in bmoca.c
../bcm_bmoca-HEAD/3.3/bmoca.c:1862:6: warning: "DSL_MOCA" is not defined
if !DSL_MOCA
../bcm_bmoca-HEAD/3.3/bmoca.c:1888:6: warning: "DSL_MOCA" is not defined
if !DSL_MOCA
../bcm_bmoca-HEAD/3.3/bmoca.c: In function ‘moca_enable_irq’:
../bcm_bmoca-HEAD/3.3/bmoca.c:698:2: warning: ISO C90 forbids mixed declarations and code
u32 mask = M2H_REQ | M2H_RESP | M2H_ASSERT | M2H_WDT_CPU1 |
Change-Id: I273da8158e84db8747da3d539a2531cc142dc57d
diff --git a/3.3/bmoca.c b/3.3/bmoca.c
index 5ba01e5..53df48f 100644
--- a/3.3/bmoca.c
+++ b/3.3/bmoca.c
@@ -692,10 +692,12 @@
static void moca_enable_irq(struct moca_priv_data *priv)
{
+ u32 mask;
+
if (!priv->enabled) return;
/* unmask everything */
- u32 mask = M2H_REQ | M2H_RESP | M2H_ASSERT | M2H_WDT_CPU1 |
+ mask = M2H_REQ | M2H_RESP | M2H_ASSERT | M2H_WDT_CPU1 |
M2H_NEXTCHUNK | M2H_DMA;
if (moca_is_20(priv))
@@ -1859,7 +1861,7 @@
if (copy_from_user(&x, (void __user *)xfer_uaddr, sizeof(x)))
return -EFAULT;
-#if !DSL_MOCA
+#if !defined(DSL_MOCA)
if (moca_range_ok(priv, x.moca_addr, x.len) < 0)
return -EINVAL;
#endif
@@ -1885,7 +1887,7 @@
if (copy_from_user(&x, (void __user *)xfer_uaddr, sizeof(x)))
return -EFAULT;
-#if !DSL_MOCA
+#if !defined(DSL_MOCA)
if (moca_range_ok(priv, x.moca_addr, x.len) < 0)
return -EINVAL;
#endif
