From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Nicolas Ferre <nicolas.ferre@atmel.com>,
Chris Ball <chris@printf.net>,
Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
Haavard Skinnemoen <hskinnemoen@gmail.com>,
Ludovic Desroches <ludovic.desroches@atmel.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org,
Alexandre Belloni <alexandre.belloni@free-electrons.com>
Subject: [PATCHv2 2/3] ARM: at91: remove mach/atmel-mci.h
Date: Fri, 17 Oct 2014 10:26:37 +0200 [thread overview]
Message-ID: <1413534398-22645-3-git-send-email-alexandre.belloni@free-electrons.com> (raw)
In-Reply-To: <1413534398-22645-1-git-send-email-alexandre.belloni@free-electrons.com>
Use the generic platform_data header file instead of mach/atmel-mci.h
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
arch/arm/mach-at91/include/mach/atmel-mci.h | 17 -----------------
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 arch/arm/mach-at91/include/mach/atmel-mci.h
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index 21ab782cc8e9..06ecbafd01ee 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -19,6 +19,7 @@
#include <linux/i2c-gpio.h>
#include <linux/atmel-mci.h>
#include <linux/platform_data/crypto-atmel.h>
+#include <linux/platform_data/mmc-atmel-mci.h>
#include <linux/platform_data/at91_adc.h>
@@ -30,7 +31,6 @@
#include <mach/at91_matrix.h>
#include <mach/at91sam9_smc.h>
#include <linux/platform_data/dma-atmel.h>
-#include <mach/atmel-mci.h>
#include <mach/hardware.h>
#include <media/atmel-isi.h>
diff --git a/arch/arm/mach-at91/include/mach/atmel-mci.h b/arch/arm/mach-at91/include/mach/atmel-mci.h
deleted file mode 100644
index 3069e4135573..000000000000
--- a/arch/arm/mach-at91/include/mach/atmel-mci.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __MACH_ATMEL_MCI_H
-#define __MACH_ATMEL_MCI_H
-
-#include <linux/platform_data/dma-atmel.h>
-
-/**
- * struct mci_dma_data - DMA data for MCI interface
- */
-struct mci_dma_data {
- struct at_dma_slave sdata;
-};
-
-/* accessor macros */
-#define slave_data_ptr(s) (&(s)->sdata)
-#define find_slave_dev(s) ((s)->sdata.dma_dev)
-
-#endif /* __MACH_ATMEL_MCI_H */
--
1.9.1
next prev parent reply other threads:[~2014-10-17 8:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-17 8:26 [PATCHv2 0/3] Remove mach/atmel-mci.h Alexandre Belloni
2014-10-17 8:26 ` [PATCHv2 1/3] mmc: atmel-mci: move mache header to platform_data Alexandre Belloni
2014-10-27 14:46 ` Ulf Hansson
2014-10-27 15:23 ` Ulf Hansson
2014-10-27 15:44 ` Alexandre Belloni
2014-10-17 8:26 ` Alexandre Belloni [this message]
2014-10-27 14:47 ` [PATCHv2 2/3] ARM: at91: remove mach/atmel-mci.h Ulf Hansson
2014-10-17 8:26 ` [PATCHv2 3/3] avr32: " Alexandre Belloni
2014-10-27 14:48 ` Ulf Hansson
2014-10-19 20:15 ` [PATCHv2 0/3] Remove mach/atmel-mci.h Arnd Bergmann
2014-10-20 12:22 ` Ludovic Desroches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413534398-22645-3-git-send-email-alexandre.belloni@free-electrons.com \
--to=alexandre.belloni@free-electrons.com \
--cc=chris@printf.net \
--cc=egtvedt@samfundet.no \
--cc=hskinnemoen@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=ludovic.desroches@atmel.com \
--cc=nicolas.ferre@atmel.com \
--cc=plagnioj@jcrosoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).