From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933289AbcAKOXm (ORCPT ); Mon, 11 Jan 2016 09:23:42 -0500 Received: from eusmtp01.atmel.com ([212.144.249.242]:20932 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933011AbcAKOXl (ORCPT ); Mon, 11 Jan 2016 09:23:41 -0500 Date: Mon, 11 Jan 2016 15:23:49 +0100 From: Ludovic Desroches To: Mans Rullgard CC: Haavard Skinnemoen , Hans-Christian Egtvedt , Ludovic Desroches , Ulf Hansson , Arnd Bergmann , Andy Shevchenko , , Subject: Re: [PATCH v2 2/2] mmc: atmel: get rid of struct mci_dma_data Message-ID: <20160111142349.GI10307@odux.rfo.atmel.com> Mail-Followup-To: Mans Rullgard , Haavard Skinnemoen , Hans-Christian Egtvedt , Ulf Hansson , Arnd Bergmann , Andy Shevchenko , linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org References: <1452343511-11164-1-git-send-email-mans@mansr.com> <1452343511-11164-2-git-send-email-mans@mansr.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <1452343511-11164-2-git-send-email-mans@mansr.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Jan 09, 2016 at 12:45:11PM +0000, Mans Rullgard wrote: > As struct mci_dma_data is now only used by AVR32, it is nothing but > pointless indirection. Replace it with struct dw_dma_slave in the > AVR32 platform code and with a void pointer elsewhere. > > Signed-off-by: Mans Rullgard Acked-by: Ludovic Desroches > --- > Changes: > - rebase onto v4.4-rc8: some members of struct dw_dma_slave had been > renamed in an unsubmitted patch > --- > arch/avr32/mach-at32ap/at32ap700x.c | 21 ++++++++++----------- > drivers/mmc/host/atmel-mci.c | 1 - > include/linux/atmel-mci.h | 2 +- > include/linux/platform_data/mmc-atmel-mci.h | 22 ---------------------- > 4 files changed, 11 insertions(+), 35 deletions(-) > delete mode 100644 include/linux/platform_data/mmc-atmel-mci.h > > diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c > index 6e906172dc33..bf445aa48282 100644 > --- a/arch/avr32/mach-at32ap/at32ap700x.c > +++ b/arch/avr32/mach-at32ap/at32ap700x.c > @@ -17,7 +17,6 @@ > #include > #include > > -#include > #include > > #include > @@ -1323,13 +1322,13 @@ static struct clk atmel_mci0_pclk = { > > static bool at32_mci_dma_filter(struct dma_chan *chan, void *pdata) > { > - struct mci_dma_data *sl = pdata; > + struct dw_dma_slave *sl = pdata; > > if (!sl) > return false; > > - if (find_slave_dev(sl) == chan->device->dev) { > - chan->private = slave_data_ptr(sl); > + if (sl->dma_dev == chan->device->dev) { > + chan->private = sl; > return true; > } > > @@ -1340,7 +1339,7 @@ struct platform_device *__init > at32_add_device_mci(unsigned int id, struct mci_platform_data *data) > { > struct platform_device *pdev; > - struct mci_dma_data *slave; > + struct dw_dma_slave *slave; > u32 pioa_mask; > u32 piob_mask; > > @@ -1359,15 +1358,15 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data) > ARRAY_SIZE(atmel_mci0_resource))) > goto fail; > > - slave = kzalloc(sizeof(struct mci_dma_data), GFP_KERNEL); > + slave = kzalloc(sizeof(*slave), GFP_KERNEL); > if (!slave) > goto fail; > > - slave->sdata.dma_dev = &dw_dmac0_device.dev; > - slave->sdata.src_id = 0; > - slave->sdata.dst_id = 1; > - slave->sdata.src_master = 1; > - slave->sdata.dst_master = 0; > + slave->dma_dev = &dw_dmac0_device.dev; > + slave->src_id = 0; > + slave->dst_id = 1; > + slave->src_master = 1; > + slave->dst_master = 0; > > data->dma_slave = slave; > data->dma_filter = at32_mci_dma_filter; > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > index 070dffc4699e..97af84d4cdf0 100644 > --- a/drivers/mmc/host/atmel-mci.c > +++ b/drivers/mmc/host/atmel-mci.c > @@ -29,7 +29,6 @@ > #include > #include > #include > -#include > > #include > #include > diff --git a/include/linux/atmel-mci.h b/include/linux/atmel-mci.h > index e753062b9355..42a9e1884842 100644 > --- a/include/linux/atmel-mci.h > +++ b/include/linux/atmel-mci.h > @@ -37,7 +37,7 @@ struct mci_slot_pdata { > * @slot: Per-slot configuration data. > */ > struct mci_platform_data { > - struct mci_dma_data *dma_slave; > + void *dma_slave; > dma_filter_fn dma_filter; > struct mci_slot_pdata slot[ATMCI_MAX_NR_SLOTS]; > }; > diff --git a/include/linux/platform_data/mmc-atmel-mci.h b/include/linux/platform_data/mmc-atmel-mci.h > deleted file mode 100644 > index 399a2d5a14bd..000000000000 > --- a/include/linux/platform_data/mmc-atmel-mci.h > +++ /dev/null > @@ -1,22 +0,0 @@ > -#ifndef __MMC_ATMEL_MCI_H > -#define __MMC_ATMEL_MCI_H > - > -#include > -#include > - > -/** > - * struct mci_dma_data - DMA data for MCI interface > - */ > -struct mci_dma_data { > -#ifdef CONFIG_ARM > - struct at_dma_slave sdata; > -#else > - struct dw_dma_slave sdata; > -#endif > -}; > - > -/* accessor macros */ > -#define slave_data_ptr(s) (&(s)->sdata) > -#define find_slave_dev(s) ((s)->sdata.dma_dev) > - > -#endif /* __MMC_ATMEL_MCI_H */ > -- > 2.7.0 >