Re: [PATCHv2 3/3] avr32: remove mach/atmel-mci.h

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 17 October 2014 10:26, Alexandre Belloni
<alexandre.belloni@xxxxxxxxxxxxxxxxxx> wrote:
> Use the generic platform_data header file instead of mach/atmel-mci.h
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>

Thanks! Applied for next!

Do note, this one required me to resolve a conflict for removing the
header file. Please have a look to make sure I haven't broken
something.

Kind regards
Uffe


> ---
>  arch/avr32/mach-at32ap/at32ap700x.c             |  2 +-
>  arch/avr32/mach-at32ap/include/mach/atmel-mci.h | 17 -----------------
>  2 files changed, 1 insertion(+), 18 deletions(-)
>  delete mode 100644 arch/avr32/mach-at32ap/include/mach/atmel-mci.h
>
> diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
> index db85b5ec3351..f8deca560e4d 100644
> --- a/arch/avr32/mach-at32ap/at32ap700x.c
> +++ b/arch/avr32/mach-at32ap/at32ap700x.c
> @@ -17,7 +17,7 @@
>  #include <linux/spi/spi.h>
>  #include <linux/usb/atmel_usba_udc.h>
>
> -#include <mach/atmel-mci.h>
> +#include <linux/platform_data/mmc-atmel-mci.h>
>  #include <linux/atmel-mci.h>
>
>  #include <asm/io.h>
> diff --git a/arch/avr32/mach-at32ap/include/mach/atmel-mci.h b/arch/avr32/mach-at32ap/include/mach/atmel-mci.h
> deleted file mode 100644
> index 4bba58561d5c..000000000000
> --- a/arch/avr32/mach-at32ap/include/mach/atmel-mci.h
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -#ifndef __MACH_ATMEL_MCI_H
> -#define __MACH_ATMEL_MCI_H
> -
> -#include <linux/dw_dmac.h>
> -
> -/**
> - * struct mci_dma_data - DMA data for MCI interface
> - */
> -struct mci_dma_data {
> -       struct dw_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
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux USB Devel]     [Linux Media]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux