The patch titled
ieee1394: replace __inline__ by inline
has been added to the -mm tree. Its filename is
ieee1394-replace-__inline__-by-inline.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
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
irq-flags-consolidate-flags-for-request_irq.patch
irq-flags-firewire-use-the-new-irqf_-constansts.patch
lockdep-annotate-ieee1394-skb-queue-head-locking.patch
ieee1394-sbp2-enable-auto-spin-up-for-maxtor-disks.patch
ieee1394-fix-calculation-of-csr-expire.patch
ieee1394-fix-cosmetic-problem-in-speed-probe.patch
ieee1394-skip-dummy-loop-in-build_speed_map.patch
ieee1394-replace-__inline__-by-inline.patch
ieee1394-coding-style-and-comment-fixes-in-midlayer.patch
ieee1394-update-include-directives-in-midlayer-header.patch
ieee1394-remove-redundant-code-from-ieee1394_hotplugh.patch
ieee1394-remove-unused-macros-hpsb_panic-and.patch
ieee1394-clean-up-declarations-of-hpsb__config_rom.patch
ieee1394-dv1394-sem2mutex-conversion.patch
ieee1394-raw1394-remove-redundant-counting-semaphore.patch
ieee1394-nodemgr-remove-unnecessary-includes.patch
ieee1394-nodemgr-do-not-spawn-kernel_thread-for-sysfs.patch
ieee1394-nodemgr-make-module-parameter-ignore_drivers.patch
ieee1394-nodemgr-switch-to-kthread-api-replace-reset.patch
ieee1394-nodemgr-convert-nodemgr_serialize-semaphore.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
