Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] ieee1394: replace __inline__ by inline

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Ben Collins <bcollins@ubuntu.com>

authored by

Stefan Richter and committed by
Ben Collins
2b01b80b 433a87d5

+6 -5
+1 -1
drivers/ieee1394/ieee1394_types.h
··· 75 75 76 76 #ifdef __BIG_ENDIAN 77 77 78 - static __inline__ void *memcpy_le32(u32 *dest, const u32 *__src, size_t count) 78 + static inline void *memcpy_le32(u32 *dest, const u32 *__src, size_t count) 79 79 { 80 80 void *tmp = dest; 81 81 u32 *src = (u32 *)__src;
+3 -2
drivers/ieee1394/ohci1394.c
··· 2598 2598 * Determine the length of a packet in the buffer 2599 2599 * Optimization suggested by Pascal Drolet <pascal.drolet@informission.ca> 2600 2600 */ 2601 - static __inline__ int packet_length(struct dma_rcv_ctx *d, int idx, quadlet_t *buf_ptr, 2602 - int offset, unsigned char tcode, int noswap) 2601 + static inline int packet_length(struct dma_rcv_ctx *d, int idx, 2602 + quadlet_t *buf_ptr, int offset, 2603 + unsigned char tcode, int noswap) 2603 2604 { 2604 2605 int length = -1; 2605 2606
+2 -2
drivers/ieee1394/sbp2.c
··· 356 356 /* 357 357 * Converts a buffer from be32 to cpu byte ordering. Length is in bytes. 358 358 */ 359 - static __inline__ void sbp2util_be32_to_cpu_buffer(void *buffer, int length) 359 + static inline void sbp2util_be32_to_cpu_buffer(void *buffer, int length) 360 360 { 361 361 u32 *temp = buffer; 362 362 ··· 369 369 /* 370 370 * Converts a buffer from cpu to be32 byte ordering. Length is in bytes. 371 371 */ 372 - static __inline__ void sbp2util_cpu_to_be32_buffer(void *buffer, int length) 372 + static inline void sbp2util_cpu_to_be32_buffer(void *buffer, int length) 373 373 { 374 374 u32 *temp = buffer; 375 375