aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2006-07-03 12:02:28 -0400
committerBen Collins <bcollins@ubuntu.com>2006-07-03 12:02:28 -0400
commit2b01b80b944b3abf623c8acc2b5537a85b5ebd3c (patch)
treeab376b3d5da8aa0de91da1564c1eb518f7f22c6f /drivers/ieee1394
parent433a87d528f685028b6f61fc3d7fae07ed915aa8 (diff)
[PATCH] ieee1394: replace __inline__ by inline
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r--drivers/ieee1394/ieee1394_types.h2
-rw-r--r--drivers/ieee1394/ohci1394.c5
-rw-r--r--drivers/ieee1394/sbp2.c4
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/ieee1394/ieee1394_types.h b/drivers/ieee1394/ieee1394_types.h
index 3165609ec1ec..440d977031e3 100644
--- a/drivers/ieee1394/ieee1394_types.h
+++ b/drivers/ieee1394/ieee1394_types.h
@@ -75,7 +75,7 @@ typedef u16 arm_length_t;
75 75
76#ifdef __BIG_ENDIAN 76#ifdef __BIG_ENDIAN
77 77
78static __inline__ void *memcpy_le32(u32 *dest, const u32 *__src, size_t count) 78static inline void *memcpy_le32(u32 *dest, const u32 *__src, size_t count)
79{ 79{
80 void *tmp = dest; 80 void *tmp = dest;
81 u32 *src = (u32 *)__src; 81 u32 *src = (u32 *)__src;
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index d4bad6704bbe..2283005e3035 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -2598,8 +2598,9 @@ static const int TCODE_SIZE[16] = {20, 0, 16, -1, 16, 20, 20, 0,
2598 * Determine the length of a packet in the buffer 2598 * Determine the length of a packet in the buffer
2599 * Optimization suggested by Pascal Drolet <pascal.drolet@informission.ca> 2599 * Optimization suggested by Pascal Drolet <pascal.drolet@informission.ca>
2600 */ 2600 */
2601static __inline__ int packet_length(struct dma_rcv_ctx *d, int idx, quadlet_t *buf_ptr, 2601static inline int packet_length(struct dma_rcv_ctx *d, int idx,
2602 int offset, unsigned char tcode, int noswap) 2602 quadlet_t *buf_ptr, int offset,
2603 unsigned char tcode, int noswap)
2603{ 2604{
2604 int length = -1; 2605 int length = -1;
2605 2606
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index b08755e2e68f..baa063c9e6e3 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -356,7 +356,7 @@ static const struct {
356/* 356/*
357 * Converts a buffer from be32 to cpu byte ordering. Length is in bytes. 357 * Converts a buffer from be32 to cpu byte ordering. Length is in bytes.
358 */ 358 */
359static __inline__ void sbp2util_be32_to_cpu_buffer(void *buffer, int length) 359static inline void sbp2util_be32_to_cpu_buffer(void *buffer, int length)
360{ 360{
361 u32 *temp = buffer; 361 u32 *temp = buffer;
362 362
@@ -369,7 +369,7 @@ static __inline__ void sbp2util_be32_to_cpu_buffer(void *buffer, int length)
369/* 369/*
370 * Converts a buffer from cpu to be32 byte ordering. Length is in bytes. 370 * Converts a buffer from cpu to be32 byte ordering. Length is in bytes.
371 */ 371 */
372static __inline__ void sbp2util_cpu_to_be32_buffer(void *buffer, int length) 372static inline void sbp2util_cpu_to_be32_buffer(void *buffer, int length)
373{ 373{
374 u32 *temp = buffer; 374 u32 *temp = buffer;
375 375