From 120a4e887b975522fda39fef9eff830192a965d5 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Sat, 13 Dec 2008 15:02:21 -0800 Subject: [PATCH] --- yaml --- r: 127175 b: refs/heads/master c: a5e6f64ddad9f55f0eab09576c7523808d7f9e3d h: refs/heads/master i: 127173: 2f6f8e5741ce95851ef11fc18e2a8d16e2c49266 127171: f742081326997e715555a07bb8a23ce87550e8c8 127167: d4851bac1fb35dd5257ff8cfa3ed7d7554385d27 v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/csr.h | 10 +++++----- trunk/drivers/ieee1394/hosts.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 44b7c18e727c..4e78420a8ca9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c816015860f6cfaf28c3cb95e3d3b6e4c4cfc688 +refs/heads/master: a5e6f64ddad9f55f0eab09576c7523808d7f9e3d diff --git a/trunk/drivers/ieee1394/csr.h b/trunk/drivers/ieee1394/csr.h index f11546550d84..90fb3f2192c3 100644 --- a/trunk/drivers/ieee1394/csr.h +++ b/trunk/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/trunk/drivers/ieee1394/hosts.c b/trunk/drivers/ieee1394/hosts.c index 237d0c9d69c6..e947d8ffac85 100644 --- a/trunk/drivers/ieee1394/hosts.c +++ b/trunk/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; }