From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Daney Date: Thu, 24 May 2012 15:15:17 +0000 Subject: Re: [PATCH] swiotlb: add "dma_attrs" argument to alloc and free, to match dma_map_ops Message-Id: <4FBE5085.2090904@gmail.com> List-Id: References: <20120524114422.GA25950@mail.gnudd.com> In-Reply-To: <20120524114422.GA25950@mail.gnudd.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Alessandro Rubini Cc: linux-kernel@vger.kernel.org, x86@kernel.org, linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, Giancarlo Asnaghi , Tony Luck , Fenghua Yu , Ralf Baechle , Guan Xuetao , Thomas Gleixner , Kyungmin Park , FUJITA Tomonori , Konrad Rzeszutek Wilk On 05/24/2012 04:44 AM, Alessandro Rubini wrote: > The alloc and free pointers within "struct dma_map_ops" receive a > pointer to dma_attrs that was not present in the generic swiotlb > functions. For this reason, a few files had a local wrapper for the > free function that just removes the attrs argument before calling the > generic function. > > This patch adds the extra argument to generic functions and removes > such wrappers when they are no more needed. This also fixes a > compiler warning for sta2x11-fixup.c, that would have required yet > another wrapper. > > Signed-off-by: Alessandro Rubini > Acked-by: Giancarlo Asnaghi > Cc: Tony Luck > Cc: Fenghua Yu > Cc: Ralf Baechle > Cc: Guan Xuetao > Cc: Thomas Gleixner > Cc: Kyungmin Park > Cc: FUJITA Tomonori > Cc: Konrad Rzeszutek Wilk > --- > arch/ia64/kernel/pci-swiotlb.c | 11 ++--------- > arch/mips/cavium-octeon/dma-octeon.c | 4 ++-- > arch/unicore32/mm/dma-swiotlb.c | 22 ++-------------------- > arch/x86/kernel/pci-swiotlb.c | 11 ++--------- > arch/x86/pci/sta2x11-fixup.c | 3 ++- > include/linux/swiotlb.h | 7 ++++--- > lib/swiotlb.c | 5 +++-- > 7 files changed, 17 insertions(+), 46 deletions(-) > This looks sane (although I haven't tested it). For the OCTEON bits: Acked-by: David Daney