ioat: move to drivers/dma/ioat/

When first created the ioat driver was the only inhabitant of
drivers/dma/.  Now, it is the only multi-file (more than a .c and a .h)
driver in the directory.  Moving it to an ioat/ subdirectory allows the
naming convention to be cleaned up, and allows for future splitting of
the source files by hardware version (v1, v2, and v3).

Signed-off-by: Maciej Sosnowski <maciej.sosnowski@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2009-07-28 14:32:12 -07:00
parent 07a2039b8e
commit 584ec22759
9 changed files with 14 additions and 13 deletions

View file

@ -1,8 +1,7 @@
obj-$(CONFIG_DMA_ENGINE) += dmaengine.o obj-$(CONFIG_DMA_ENGINE) += dmaengine.o
obj-$(CONFIG_NET_DMA) += iovlock.o obj-$(CONFIG_NET_DMA) += iovlock.o
obj-$(CONFIG_DMATEST) += dmatest.o obj-$(CONFIG_DMATEST) += dmatest.o
obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o obj-$(CONFIG_INTEL_IOATDMA) += ioat/
ioatdma-objs := ioat.o ioat_dma.o ioat_dca.o
obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o
obj-$(CONFIG_FSL_DMA) += fsldma.o obj-$(CONFIG_FSL_DMA) += fsldma.o
obj-$(CONFIG_MV_XOR) += mv_xor.o obj-$(CONFIG_MV_XOR) += mv_xor.o

View file

@ -0,0 +1,2 @@
obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o
ioatdma-objs := pci.o dma.o dca.o

View file

@ -33,8 +33,8 @@
#define cpu_physical_id(cpu) (cpuid_ebx(1) >> 24) #define cpu_physical_id(cpu) (cpuid_ebx(1) >> 24)
#endif #endif
#include "ioatdma.h" #include "dma.h"
#include "ioatdma_registers.h" #include "registers.h"
/* /*
* Bit 7 of a tag map entry is the "valid" bit, if it is set then bits 0:6 * Bit 7 of a tag map entry is the "valid" bit, if it is set then bits 0:6

View file

@ -34,9 +34,9 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/i7300_idle.h> #include <linux/i7300_idle.h>
#include "ioatdma.h" #include "dma.h"
#include "ioatdma_registers.h" #include "registers.h"
#include "ioatdma_hw.h" #include "hw.h"
#define to_ioat_chan(chan) container_of(chan, struct ioat_dma_chan, common) #define to_ioat_chan(chan) container_of(chan, struct ioat_dma_chan, common)
#define to_ioatdma_device(dev) container_of(dev, struct ioatdma_device, common) #define to_ioatdma_device(dev) container_of(dev, struct ioatdma_device, common)

View file

@ -22,7 +22,7 @@
#define IOATDMA_H #define IOATDMA_H
#include <linux/dmaengine.h> #include <linux/dmaengine.h>
#include "ioatdma_hw.h" #include "hw.h"
#include <linux/init.h> #include <linux/init.h>
#include <linux/dmapool.h> #include <linux/dmapool.h>
#include <linux/cache.h> #include <linux/cache.h>

View file

@ -30,9 +30,9 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/dca.h> #include <linux/dca.h>
#include "ioatdma.h" #include "dma.h"
#include "ioatdma_registers.h" #include "registers.h"
#include "ioatdma_hw.h" #include "hw.h"
MODULE_VERSION(IOAT_DMA_VERSION); MODULE_VERSION(IOAT_DMA_VERSION);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

View file

@ -29,8 +29,8 @@
#include <asm/idle.h> #include <asm/idle.h>
#include "../dma/ioatdma_hw.h" #include "../dma/ioat/hw.h"
#include "../dma/ioatdma_registers.h" #include "../dma/ioat/registers.h"
#define I7300_IDLE_DRIVER_VERSION "1.55" #define I7300_IDLE_DRIVER_VERSION "1.55"
#define I7300_PRINT "i7300_idle:" #define I7300_PRINT "i7300_idle:"