Merge branch 'linus' into release

[linux-2.6-omap-h63xx.git] / drivers / ieee1394 / csr.h

diff --git a/drivers/ieee1394/csr.h b/drivers/ieee1394/csr.h
index 2bc080f76510ba69a76f32515df01bd9db341f21..90fb3f2192c3601ea6f128fb0807d301ae17102f 100644 (file)
--- 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;
@@ -91,4 +91,9 @@ extern struct csr1212_bus_ops csr_bus_ops;
 int init_csr(void);
 void cleanup_csr(void);
 
+/* hpsb_update_config_rom() is deprecated */
+struct hpsb_host;
+int hpsb_update_config_rom(struct hpsb_host *host, const quadlet_t *new_rom,
+                          size_t size, unsigned char rom_version);
+
 #endif /* _IEEE1394_CSR_H */