The patch titled
ieee1394: update #include directives in midlayer header files
has been added to the -mm tree. Its filename is
ieee1394-update-include-directives-in-midlayer-header.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: update #include directives in midlayer header files
From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Remove unnecessary includes, add missing includes. Use forward type
declarations for some structs.
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/csr.h | 6 ++----
drivers/ieee1394/dma.c | 7 +++++--
drivers/ieee1394/dma.h | 7 +++++--
drivers/ieee1394/dv1394.c | 12 ++++++------
drivers/ieee1394/eth1394.c | 11 ++++++-----
drivers/ieee1394/highlevel.h | 10 ++++++++++
drivers/ieee1394/hosts.h | 10 ++++++----
drivers/ieee1394/ieee1394_core.h | 10 +++++++---
drivers/ieee1394/ieee1394_hotplug.h | 3 +--
drivers/ieee1394/ieee1394_transactions.h | 7 ++++++-
drivers/ieee1394/ieee1394_types.h | 7 ++-----
drivers/ieee1394/iso.c | 5 ++++-
drivers/ieee1394/iso.h | 7 ++++++-
drivers/ieee1394/nodemgr.c | 9 +++++----
drivers/ieee1394/nodemgr.h | 10 ++++++++--
drivers/ieee1394/raw1394.c | 11 ++++++-----
drivers/ieee1394/video1394.c | 12 ++++++------
17 files changed, 91 insertions(+), 53 deletions(-)
diff -puN drivers/ieee1394/csr.h~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/csr.h
--- a/drivers/ieee1394/csr.h~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/csr.h
@@ -1,12 +1,10 @@
-
#ifndef _IEEE1394_CSR_H
#define _IEEE1394_CSR_H
-#ifdef CONFIG_PREEMPT
-#include <linux/sched.h>
-#endif
+#include <linux/spinlock_types.h>
#include "csr1212.h"
+#include "ieee1394_types.h"
#define CSR_REGISTER_BASE 0xfffff0000000ULL
diff -puN drivers/ieee1394/dma.c~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/dma.c
--- a/drivers/ieee1394/dma.c~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/dma.c
@@ -7,10 +7,13 @@
* directory of the kernel sources for details.
*/
+#include <linux/mm.h>
#include <linux/module.h>
-#include <linux/vmalloc.h>
+#include <linux/pci.h>
#include <linux/slab.h>
-#include <linux/mm.h>
+#include <linux/vmalloc.h>
+#include <asm/scatterlist.h>
+
#include "dma.h"
/* dma_prog_region */
diff -puN drivers/ieee1394/dma.h~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/dma.h
--- a/drivers/ieee1394/dma.h~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/dma.h
@@ -10,8 +10,11 @@
#ifndef IEEE1394_DMA_H
#define IEEE1394_DMA_H
-#include <linux/pci.h>
-#include <asm/scatterlist.h>
+#include <asm/types.h>
+
+struct pci_dev;
+struct scatterlist;
+struct vm_area_struct;
/**
* struct dma_prog_region - small contiguous DMA buffer
diff -puN drivers/ieee1394/dv1394.c~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/dv1394.c
--- a/drivers/ieee1394/dv1394.c~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/dv1394.c
@@ -110,15 +110,15 @@
#include <linux/compat.h>
#include <linux/cdev.h>
+#include "dv1394.h"
+#include "dv1394-private.h"
+#include "highlevel.h"
+#include "hosts.h"
#include "ieee1394.h"
+#include "ieee1394_core.h"
+#include "ieee1394_hotplug.h"
#include "ieee1394_types.h"
#include "nodemgr.h"
-#include "hosts.h"
-#include "ieee1394_core.h"
-#include "highlevel.h"
-#include "dv1394.h"
-#include "dv1394-private.h"
-
#include "ohci1394.h"
/* DEBUG LEVELS:
diff -puN drivers/ieee1394/eth1394.c~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/eth1394.c
--- a/drivers/ieee1394/eth1394.c~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/eth1394.c
@@ -67,16 +67,17 @@
#include <asm/semaphore.h>
#include <net/arp.h>
+#include "config_roms.h"
#include "csr1212.h"
-#include "ieee1394_types.h"
+#include "eth1394.h"
+#include "highlevel.h"
+#include "ieee1394.h"
#include "ieee1394_core.h"
+#include "ieee1394_hotplug.h"
#include "ieee1394_transactions.h"
-#include "ieee1394.h"
-#include "highlevel.h"
+#include "ieee1394_types.h"
#include "iso.h"
#include "nodemgr.h"
-#include "eth1394.h"
-#include "config_roms.h"
#define ETH1394_PRINT_G(level, fmt, args...) \
printk(level "%s: " fmt, driver_name, ## args)
diff -puN drivers/ieee1394/highlevel.h~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/highlevel.h
--- a/drivers/ieee1394/highlevel.h~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/highlevel.h
@@ -1,6 +1,16 @@
#ifndef IEEE1394_HIGHLEVEL_H
#define IEEE1394_HIGHLEVEL_H
+#include <linux/list.h>
+#include <linux/spinlock_types.h>
+#include <linux/types.h>
+
+struct module;
+
+#include "ieee1394_types.h"
+
+struct hpsb_host;
+
/* internal to ieee1394 core */
struct hpsb_address_serve {
struct list_head host_list; /* per host list */
diff -puN drivers/ieee1394/hosts.h~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/hosts.h
--- a/drivers/ieee1394/hosts.h~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/hosts.h
@@ -2,17 +2,19 @@
#define _IEEE1394_HOSTS_H
#include <linux/device.h>
-#include <linux/wait.h>
#include <linux/list.h>
-#include <linux/timer.h>
#include <linux/skbuff.h>
+#include <linux/timer.h>
+#include <linux/types.h>
+#include <linux/workqueue.h>
+#include <asm/atomic.h>
-#include <asm/semaphore.h>
+struct pci_dev;
+struct module;
#include "ieee1394_types.h"
#include "csr.h"
-
struct hpsb_packet;
struct hpsb_iso;
diff -puN drivers/ieee1394/ieee1394_core.h~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/ieee1394_core.h
--- a/drivers/ieee1394/ieee1394_core.h~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/ieee1394_core.h
@@ -1,12 +1,16 @@
-
#ifndef _IEEE1394_CORE_H
#define _IEEE1394_CORE_H
-#include <linux/slab.h>
+#include <linux/device.h>
+#include <linux/fs.h>
+#include <linux/list.h>
+#include <linux/skbuff.h>
+#include <linux/types.h>
#include <asm/atomic.h>
#include <asm/semaphore.h>
-#include "hosts.h"
+#include "hosts.h"
+#include "ieee1394_types.h"
struct hpsb_packet {
/* This struct is basically read-only for hosts with the exception of
diff -puN drivers/ieee1394/ieee1394_hotplug.h~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/ieee1394_hotplug.h
--- a/drivers/ieee1394/ieee1394_hotplug.h~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/ieee1394_hotplug.h
@@ -1,9 +1,8 @@
#ifndef _IEEE1394_HOTPLUG_H
#define _IEEE1394_HOTPLUG_H
-#include <linux/kernel.h>
-#include <linux/types.h>
#include <linux/mod_devicetable.h>
+#include <linux/types.h>
/* Unit spec id and sw version entry for some protocols */
#define AVC_UNIT_SPEC_ID_ENTRY 0x0000A02D
diff -puN drivers/ieee1394/ieee1394_transactions.h~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/ieee1394_transactions.h
--- a/drivers/ieee1394/ieee1394_transactions.h~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/ieee1394_transactions.h
@@ -1,7 +1,12 @@
#ifndef _IEEE1394_TRANSACTIONS_H
#define _IEEE1394_TRANSACTIONS_H
-#include "ieee1394_core.h"
+#include <linux/types.h>
+
+#include "ieee1394_types.h"
+
+struct hpsb_packet;
+struct hpsb_host;
int hpsb_get_tlabel(struct hpsb_packet *packet);
void hpsb_free_tlabel(struct hpsb_packet *packet);
diff -puN drivers/ieee1394/ieee1394_types.h~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/ieee1394_types.h
--- a/drivers/ieee1394/ieee1394_types.h~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/ieee1394_types.h
@@ -1,17 +1,14 @@
-
#ifndef _IEEE1394_TYPES_H
#define _IEEE1394_TYPES_H
#include <linux/kernel.h>
-#include <linux/types.h>
#include <linux/list.h>
-#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/string.h>
+#include <linux/types.h>
-#include <asm/semaphore.h>
#include <asm/byteorder.h>
-
+#include <asm/semaphore.h>
/* Transaction Label handling */
struct hpsb_tlabel_pool {
diff -puN drivers/ieee1394/iso.c~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/iso.c
--- a/drivers/ieee1394/iso.c~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/iso.c
@@ -9,8 +9,11 @@
* directory of the kernel sources for details.
*/
-#include <linux/slab.h>
+#include <linux/pci.h>
#include <linux/sched.h>
+#include <linux/slab.h>
+
+#include "hosts.h"
#include "iso.h"
void hpsb_iso_stop(struct hpsb_iso *iso)
diff -puN drivers/ieee1394/iso.h~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/iso.h
--- a/drivers/ieee1394/iso.h~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/iso.h
@@ -12,9 +12,14 @@
#ifndef IEEE1394_ISO_H
#define IEEE1394_ISO_H
-#include "hosts.h"
+#include <linux/spinlock_types.h>
+#include <asm/atomic.h>
+#include <asm/types.h>
+
#include "dma.h"
+struct hpsb_host;
+
/* high-level ISO interface */
/*
diff -puN drivers/ieee1394/nodemgr.c~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/nodemgr.c
--- a/drivers/ieee1394/nodemgr.c~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/nodemgr.c
@@ -21,13 +21,14 @@
#include <linux/moduleparam.h>
#include <asm/atomic.h>
-#include "ieee1394_types.h"
+#include "csr.h"
+#include "highlevel.h"
+#include "hosts.h"
#include "ieee1394.h"
#include "ieee1394_core.h"
-#include "hosts.h"
+#include "ieee1394_hotplug.h"
+#include "ieee1394_types.h"
#include "ieee1394_transactions.h"
-#include "highlevel.h"
-#include "csr.h"
#include "nodemgr.h"
static int ignore_drivers;
diff -puN drivers/ieee1394/nodemgr.h~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/nodemgr.h
--- a/drivers/ieee1394/nodemgr.h~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/nodemgr.h
@@ -21,9 +21,15 @@
#define _IEEE1394_NODEMGR_H
#include <linux/device.h>
-#include "csr1212.h"
+#include <asm/types.h>
+
#include "ieee1394_core.h"
-#include "ieee1394_hotplug.h"
+#include "ieee1394_types.h"
+
+struct csr1212_csr;
+struct csr1212_keyval;
+struct hpsb_host;
+struct ieee1394_device_id;
/* '1' '3' '9' '4' in ASCII */
#define IEEE1394_BUSID_MAGIC __constant_cpu_to_be32(0x31333934)
diff -puN drivers/ieee1394/raw1394.c~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/raw1394.c
--- a/drivers/ieee1394/raw1394.c~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/raw1394.c
@@ -44,14 +44,15 @@
#include <linux/compat.h>
#include "csr1212.h"
+#include "highlevel.h"
+#include "hosts.h"
#include "ieee1394.h"
-#include "ieee1394_types.h"
#include "ieee1394_core.h"
-#include "nodemgr.h"
-#include "hosts.h"
-#include "highlevel.h"
-#include "iso.h"
+#include "ieee1394_hotplug.h"
#include "ieee1394_transactions.h"
+#include "ieee1394_types.h"
+#include "iso.h"
+#include "nodemgr.h"
#include "raw1394.h"
#include "raw1394-private.h"
diff -puN drivers/ieee1394/video1394.c~ieee1394-update-include-directives-in-midlayer-header drivers/ieee1394/video1394.c
--- a/drivers/ieee1394/video1394.c~ieee1394-update-include-directives-in-midlayer-header
+++ a/drivers/ieee1394/video1394.c
@@ -49,16 +49,16 @@
#include <linux/compat.h>
#include <linux/cdev.h>
-#include "ieee1394.h"
-#include "ieee1394_types.h"
+#include "dma.h"
+#include "highlevel.h"
#include "hosts.h"
+#include "ieee1394.h"
#include "ieee1394_core.h"
-#include "highlevel.h"
-#include "video1394.h"
+#include "ieee1394_hotplug.h"
+#include "ieee1394_types.h"
#include "nodemgr.h"
-#include "dma.h"
-
#include "ohci1394.h"
+#include "video1394.h"
#define ISO_CHANNELS 64
_
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
