aboutsummaryrefslogtreecommitdiff
path: root/drivers/ieee1394/csr.h
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-12-13 15:02:21 -0800
committerStefan Richter <stefanr@s5r6.in-berlin.de>2009-01-04 23:50:35 +0100
commita5e6f64ddad9f55f0eab09576c7523808d7f9e3d (patch)
tree85d04c30af447e86469ff229ea51fb6a12a8b1eb /drivers/ieee1394/csr.h
parentc816015860f6cfaf28c3cb95e3d3b6e4c4cfc688 (diff)
downloadlinux-linaro-stable-a5e6f64ddad9f55f0eab09576c7523808d7f9e3d.tar.gz
ieee1394: replace CSR_SET_BUS_INFO_GENERATION macro
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394/csr.h')
-rw-r--r--drivers/ieee1394/csr.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ieee1394/csr.h b/drivers/ieee1394/csr.h
index f11546550d84..90fb3f2192c3 100644
--- a/drivers/ieee1394/csr.h
+++ b/drivers/ieee1394/csr.h
@@ -50,11 +50,11 @@
#define CSR_MAX_ROM_SHIFT 8
#define CSR_GENERATION_SHIFT 4
-#define CSR_SET_BUS_INFO_GENERATION(csr, gen) \
- ((csr)->bus_info_data[2] = \
- cpu_to_be32((be32_to_cpu((csr)->bus_info_data[2]) & \
- ~(0xf << CSR_GENERATION_SHIFT)) | \
- (gen) << CSR_GENERATION_SHIFT))
+static inline void csr_set_bus_info_generation(struct csr1212_csr *csr, u8 gen)
+{
+ csr->bus_info_data[2] &= ~cpu_to_be32(0xf << CSR_GENERATION_SHIFT);
+ csr->bus_info_data[2] |= cpu_to_be32((u32)gen << CSR_GENERATION_SHIFT);
+}
struct csr_control {
spinlock_t lock;