Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b01b80b authored by Stefan Richter's avatar Stefan Richter Committed by Ben Collins
Browse files

[PATCH] ieee1394: replace __inline__ by inline 



Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarBen Collins <bcollins@ubuntu.com>
parent 433a87d5

drivers/ieee1394/ieee1394_types.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/ieee1394/ohci1394.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

drivers/ieee1394/sbp2.c

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -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;