Commit a9d68cbd authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "amba: Initialize dma_parms for amba devices" 



This reverts commit 5caf6102.  It still
needs some more work and that will happen for the next release cycle,
not this one.

Cc: <stable@vger.kernel.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Ludovic Barre <ludovic.barre@st.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5caf6102

drivers/amba/bus.c

+0 −2
Original line number Diff line number Diff line
@@ -374,8 +374,6 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent) 
	WARN_ON(dev->irq[0] == (unsigned int)-1);

	WARN_ON(dev->irq[1] == (unsigned int)-1);



	dev->dev.dma_parms = &dev->dma_parms;



	ret = request_resource(parent, &dev->res);

	if (ret)

		goto err_out;

include/linux/amba/bus.h

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ struct amba_device { 
	struct device		dev;

	struct resource		res;

	struct clk		*pclk;

	struct device_dma_parameters dma_parms;

	unsigned int		periphid;

	unsigned int		cid;

	struct amba_cs_uci_id	uci;

CRA Git | Maintained and supported by SUSTech CRA and CCSE