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>

2 files changed, 8 insertions, 8 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;
diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c
index 237d0c9d69c6..e947d8ffac85 100644
--- a/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
@@ -34,18 +34,18 @@ static void delayed_reset_bus(struct work_struct *work)
 {
         struct hpsb_host *host =
                 container_of(work, struct hpsb_host, delayed_reset.work);
-        int generation = host->csr.generation + 1;
+        u8 generation = host->csr.generation + 1;
 
         /* The generation field rolls over to 2 rather than 0 per IEEE
          * 1394a-2000. */
         if (generation > 0xf || generation < 2)
                 generation = 2;
 
-        CSR_SET_BUS_INFO_GENERATION(host->csr.rom, generation);
+        csr_set_bus_info_generation(host->csr.rom, generation);
         if (csr1212_generate_csr_image(host->csr.rom) != CSR1212_SUCCESS) {
                 /* CSR image creation failed.
                  * Reset generation field and do not issue a bus reset. */
-                CSR_SET_BUS_INFO_GENERATION(host->csr.rom,
+                csr_set_bus_info_generation(host->csr.rom,
                                             host->csr.generation);
                 return;
         }