Skip to content

Commit

Permalink
[PATCH] ieee1394: replace __inline__ by inline
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
  • Loading branch information
Stefan Richter authored and Ben Collins committed Jul 3, 2006
1 parent 433a87d commit 2b01b80
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/ieee1394/ieee1394_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ typedef u16 arm_length_t;

#ifdef __BIG_ENDIAN

static __inline__ void *memcpy_le32(u32 *dest, const u32 *__src, size_t count)
static inline void *memcpy_le32(u32 *dest, const u32 *__src, size_t count)
{
void *tmp = dest;
u32 *src = (u32 *)__src;
Expand Down
5 changes: 3 additions & 2 deletions drivers/ieee1394/ohci1394.c
Original file line number Diff line number Diff line change
Expand Up @@ -2598,8 +2598,9 @@ static const int TCODE_SIZE[16] = {20, 0, 16, -1, 16, 20, 20, 0,
* Determine the length of a packet in the buffer
* Optimization suggested by Pascal Drolet <pascal.drolet@informission.ca>
*/
static __inline__ int packet_length(struct dma_rcv_ctx *d, int idx, quadlet_t *buf_ptr,
int offset, unsigned char tcode, int noswap)
static inline int packet_length(struct dma_rcv_ctx *d, int idx,
quadlet_t *buf_ptr, int offset,
unsigned char tcode, int noswap)
{
int length = -1;

Expand Down
4 changes: 2 additions & 2 deletions drivers/ieee1394/sbp2.c
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ static const struct {
/*
* Converts a buffer from be32 to cpu byte ordering. Length is in bytes.
*/
static __inline__ void sbp2util_be32_to_cpu_buffer(void *buffer, int length)
static inline void sbp2util_be32_to_cpu_buffer(void *buffer, int length)
{
u32 *temp = buffer;

Expand All @@ -369,7 +369,7 @@ static __inline__ void sbp2util_be32_to_cpu_buffer(void *buffer, int length)
/*
* Converts a buffer from cpu to be32 byte ordering. Length is in bytes.
*/
static __inline__ void sbp2util_cpu_to_be32_buffer(void *buffer, int length)
static inline void sbp2util_cpu_to_be32_buffer(void *buffer, int length)
{
u32 *temp = buffer;

Expand Down

0 comments on commit 2b01b80

Please sign in to comment.