From 10af71f1aa70c7154b5186164918efc31e0e6c38 Mon Sep 17 00:00:00 2001 From: Daniel Cotey Date: Sat, 15 Sep 2012 06:06:44 -0700 Subject: [PATCH] --- yaml --- r: 325337 b: refs/heads/master c: 30f62902e3911616fab109e3380a1c9d74e18f33 h: refs/heads/master i: 325335: d4c9da857381dca0c9f2d1b42c2724cc4e316923 v: v3 --- [refs] | 2 +- trunk/drivers/staging/silicom/bp_mod.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 38cab1fb56aa..3ad4d4dd0d7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5b4f42f8f87ad2f58cea6fd8b3ce419056132ed +refs/heads/master: 30f62902e3911616fab109e3380a1c9d74e18f33 diff --git a/trunk/drivers/staging/silicom/bp_mod.h b/trunk/drivers/staging/silicom/bp_mod.h index f59c061660fe..b8275f5611fa 100644 --- a/trunk/drivers/staging/silicom/bp_mod.h +++ b/trunk/drivers/staging/silicom/bp_mod.h @@ -535,13 +535,13 @@ static inline unsigned int jiffies_to_msecs(const unsigned long j) (writel((value), (void *)(((a)->mem_map) + BPCTLI_##reg))) #define BPCTL_READ_REG(a, reg) ( \ - readl((void *)((a)->mem_map) + BPCTLI_##reg)) + readl((void *)((a)->mem_map) + BPCTLI_##reg)) #define BPCTL_WRITE_FLUSH(a) BPCTL_READ_REG(a, STATUS) #define BPCTL_BP_WRITE_REG(a, reg, value) ({ \ - BPCTL_WRITE_REG(a, reg, value); \ - BPCTL_WRITE_FLUSH(a);}) + BPCTL_WRITE_REG(a, reg, value); \ + BPCTL_WRITE_FLUSH(a); }) /**************************************************************/ /************** 82575 Interface********************************/ @@ -645,7 +645,7 @@ static inline unsigned int jiffies_to_msecs(const unsigned long j) (writel((value), (void *)(((a)->mem_map) + BP10G_##reg))) #define BP10G_READ_REG(a, reg) ( \ - readl((void *)((a)->mem_map) + BP10G_##reg)) + readl((void *)((a)->mem_map) + BP10G_##reg)) /*****BROADCOM*******************************************/ @@ -697,7 +697,7 @@ static inline unsigned int jiffies_to_msecs(const unsigned long j) (writel((value), (void *)(((a)->mem_map) + BP10GB_##reg))) #define BP10GB_READ_REG(a, reg) ( \ - readl((void *)((a)->mem_map) + BP10GB_##reg)) + readl((void *)((a)->mem_map) + BP10GB_##reg)) #endif