aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2010-08-09 08:09:04 -0400
committerDan Williams <dan.j.williams@intel.com>2010-09-22 17:53:46 -0400
commit8f6fd7f50f7059e5725a36885af52e54b9df96b2 (patch)
treeaa960a92a463cc3b52e24f97c526bff1a41f7fcf
parent698e4732e7c9cf9f1f3eac2b8cdce8d4fe2b90bd (diff)
DMAENGINE: ste_dma40: removed non-used variable from struct
The reqrite of the LCLA code rendered this variable unused. Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--arch/arm/mach-ux500/devices-db8500.c1
-rw-r--r--arch/arm/plat-nomadik/include/plat/ste_dma40.h2
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index 9280d2561111..58b3e723b183 100644
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -193,7 +193,6 @@ static struct stedma40_platform_data dma40_plat_data = {
193 .memcpy_len = ARRAY_SIZE(dma40_memcpy_event), 193 .memcpy_len = ARRAY_SIZE(dma40_memcpy_event),
194 .memcpy_conf_phy = &dma40_memcpy_conf_phy, 194 .memcpy_conf_phy = &dma40_memcpy_conf_phy,
195 .memcpy_conf_log = &dma40_memcpy_conf_log, 195 .memcpy_conf_log = &dma40_memcpy_conf_log,
196 .llis_per_log = 8,
197 .disabled_channels = {-1}, 196 .disabled_channels = {-1},
198}; 197};
199 198
diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
index 879a6c1ac60f..1620492397ec 100644
--- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h
+++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
@@ -148,7 +148,6 @@ struct stedma40_chan_cfg {
148 * @memcpy_len: length of memcpy 148 * @memcpy_len: length of memcpy
149 * @memcpy_conf_phy: default configuration of physical channel memcpy 149 * @memcpy_conf_phy: default configuration of physical channel memcpy
150 * @memcpy_conf_log: default configuration of logical channel memcpy 150 * @memcpy_conf_log: default configuration of logical channel memcpy
151 * @llis_per_log: number of max linked list items per logical channel
152 * @disabled_channels: A vector, ending with -1, that marks physical channels 151 * @disabled_channels: A vector, ending with -1, that marks physical channels
153 * that are for different reasons not available for the driver. 152 * that are for different reasons not available for the driver.
154 */ 153 */
@@ -160,7 +159,6 @@ struct stedma40_platform_data {
160 u32 memcpy_len; 159 u32 memcpy_len;
161 struct stedma40_chan_cfg *memcpy_conf_phy; 160 struct stedma40_chan_cfg *memcpy_conf_phy;
162 struct stedma40_chan_cfg *memcpy_conf_log; 161 struct stedma40_chan_cfg *memcpy_conf_log;
163 unsigned int llis_per_log;
164 int disabled_channels[STEDMA40_MAX_PHYS]; 162 int disabled_channels[STEDMA40_MAX_PHYS];
165}; 163};
166 164