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

[PATCH] ieee1394: update #include directives in midlayer header files 



Remove unnecessary includes, add missing includes.
Use forward type declarations for some structs.

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

drivers/ieee1394/csr.h

+2 −4
Original line number Diff line number Diff line 


#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

drivers/ieee1394/dma.c

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

drivers/ieee1394/dma.h

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

drivers/ieee1394/dv1394.c

+6 −6
Original line number Diff line number Diff line
@@ -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:

drivers/ieee1394/eth1394.c

+6 −5
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE