The patch titled
ieee1394: replace __inline__ by inline
has been removed from the -mm tree. Its filename is
ieee1394-replace-__inline__-by-inline.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ieee1394: replace __inline__ by inline
From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/ieee1394_types.h | 2 +-
drivers/ieee1394/ohci1394.c | 5 +++--
drivers/ieee1394/sbp2.c | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff -puN drivers/ieee1394/ieee1394_types.h~ieee1394-replace-__inline__-by-inline drivers/ieee1394/ieee1394_types.h
--- a/drivers/ieee1394/ieee1394_types.h~ieee1394-replace-__inline__-by-inline
+++ a/drivers/ieee1394/ieee1394_types.h
@@ -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;
diff -puN drivers/ieee1394/ohci1394.c~ieee1394-replace-__inline__-by-inline drivers/ieee1394/ohci1394.c
--- a/drivers/ieee1394/ohci1394.c~ieee1394-replace-__inline__-by-inline
+++ a/drivers/ieee1394/ohci1394.c
@@ -2598,8 +2598,9 @@ static const int TCODE_SIZE[16] = {20, 0
* Determine the length of a packet in the buffer
* Optimization suggested by Pascal Drolet <pascal.drolet@xxxxxxxxxxxxxxx>
*/
-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;
diff -puN drivers/ieee1394/sbp2.c~ieee1394-replace-__inline__-by-inline drivers/ieee1394/sbp2.c
--- a/drivers/ieee1394/sbp2.c~ieee1394-replace-__inline__-by-inline
+++ a/drivers/ieee1394/sbp2.c
@@ -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_
/*
* 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;
_
Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are
origin.patch
git-ieee1394.patch
ieee1394-fix-kerneldoc-of-hpsb_alloc_host.patch
ieee1394-shrink-tlabel-pools-remove-tpool-semaphores.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
