Commit 7658e7f9 authored by Russell King's avatar Russell King

MFD: mcp-sa11x0: remove DMA initializers and variables

The dma_device_t variables are only ever written to by mcp-sa11x0 and
never read.  As the old SA11x0 DMA support will be removed, remove
these so that it no longer depends on the old SA11x0 DMA definitions.
Acked-by: default avatarJochen Friedrich <jochen@scram.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 30816ac0
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/mfd/mcp.h> #include <linux/mfd/mcp.h>
#include <mach/dma.h>
#include <asm/system.h> #include <asm/system.h>
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mfd/mcp.h> #include <linux/mfd/mcp.h>
#include <mach/dma.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/system.h> #include <asm/system.h>
...@@ -158,10 +157,6 @@ static int mcp_sa11x0_probe(struct platform_device *pdev) ...@@ -158,10 +157,6 @@ static int mcp_sa11x0_probe(struct platform_device *pdev)
mcp->owner = THIS_MODULE; mcp->owner = THIS_MODULE;
mcp->ops = &mcp_sa11x0; mcp->ops = &mcp_sa11x0;
mcp->sclk_rate = data->sclk_rate; mcp->sclk_rate = data->sclk_rate;
mcp->dma_audio_rd = DMA_Ser4MCP0Rd;
mcp->dma_audio_wr = DMA_Ser4MCP0Wr;
mcp->dma_telco_rd = DMA_Ser4MCP1Rd;
mcp->dma_telco_wr = DMA_Ser4MCP1Wr;
mcp->gpio_base = data->gpio_base; mcp->gpio_base = data->gpio_base;
platform_set_drvdata(pdev, mcp); platform_set_drvdata(pdev, mcp);
......
...@@ -16,9 +16,6 @@ ...@@ -16,9 +16,6 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/mfd/ucb1x00.h> #include <linux/mfd/ucb1x00.h>
#include <mach/dma.h>
#define UCB1X00_ATTR(name,input)\ #define UCB1X00_ATTR(name,input)\
static ssize_t name##_show(struct device *dev, struct device_attribute *attr, \ static ssize_t name##_show(struct device *dev, struct device_attribute *attr, \
char *buf) \ char *buf) \
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/semaphore.h> #include <linux/semaphore.h>
#include <mach/dma.h>
#include <mach/hardware.h> #include <mach/hardware.h>
static DEFINE_MUTEX(ucb1x00_mutex); static DEFINE_MUTEX(ucb1x00_mutex);
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/mfd/ucb1x00.h> #include <linux/mfd/ucb1x00.h>
#include <mach/dma.h>
#include <mach/collie.h> #include <mach/collie.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
......
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
#ifndef MCP_H #ifndef MCP_H
#define MCP_H #define MCP_H
#include <mach/dma.h>
struct mcp_ops; struct mcp_ops;
struct mcp { struct mcp {
...@@ -21,10 +19,6 @@ struct mcp { ...@@ -21,10 +19,6 @@ struct mcp {
int use_count; int use_count;
unsigned int sclk_rate; unsigned int sclk_rate;
unsigned int rw_timeout; unsigned int rw_timeout;
dma_device_t dma_audio_rd;
dma_device_t dma_audio_wr;
dma_device_t dma_telco_rd;
dma_device_t dma_telco_wr;
struct device attached_device; struct device attached_device;
int gpio_base; int gpio_base;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment