Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325337
b: refs/heads/master
c: 30f6290
h: refs/heads/master
i:
  325335: d4c9da8
v: v3
  • Loading branch information
Daniel Cotey authored and Greg Kroah-Hartman committed Sep 17, 2012
1 parent 629c9e1 commit 10af71f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d5b4f42f8f87ad2f58cea6fd8b3ce419056132ed
refs/heads/master: 30f62902e3911616fab109e3380a1c9d74e18f33
10 changes: 5 additions & 5 deletions trunk/drivers/staging/silicom/bp_mod.h
Original file line number Diff line number Diff line change
Expand Up @@ -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********************************/
Expand Down Expand Up @@ -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*******************************************/

Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 10af71f

Please sign in to comment.