diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 12:39:58 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 12:39:58 +1100 |
commit | 19006ae380d06358eafa7e712378b537169fbe4a (patch) | |
tree | 80cd0a15170b641e1715c1ba99da69138b68ac72 /include | |
parent | d5cdeff23e573d2a58baa663ae2303e902b35f7b (diff) | |
parent | cb7c96da3651111efbe088fa12f9bed61836ea93 (diff) |
Merge remote branch 'ieee1394/for-next'
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/firewire.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/linux/firewire.h b/include/linux/firewire.h index 7e1d4dec83e7..211a5d7d87b3 100644 --- a/include/linux/firewire.h +++ b/include/linux/firewire.h @@ -20,20 +20,6 @@ #define fw_notify(s, args...) printk(KERN_NOTICE KBUILD_MODNAME ": " s, ## args) #define fw_error(s, args...) printk(KERN_ERR KBUILD_MODNAME ": " s, ## args) -static inline void fw_memcpy_from_be32(void *_dst, void *_src, size_t size) -{ - u32 *dst = _dst; - __be32 *src = _src; - int i; - - for (i = 0; i < size / 4; i++) - dst[i] = be32_to_cpu(src[i]); -} - -static inline void fw_memcpy_to_be32(void *_dst, void *_src, size_t size) -{ - fw_memcpy_from_be32(_dst, _src, size); -} #define CSR_REGISTER_BASE 0xfffff0000000ULL /* register offsets are relative to CSR_REGISTER_BASE */ @@ -131,7 +117,7 @@ struct fw_card { bool broadcast_channel_allocated; u32 broadcast_channel; - u32 topology_map[(CSR_TOPOLOGY_MAP_END - CSR_TOPOLOGY_MAP) / 4]; + __be32 topology_map[(CSR_TOPOLOGY_MAP_END - CSR_TOPOLOGY_MAP) / 4]; }; struct fw_attribute_group { |