Commit 14f92952 authored Jun 03, 2010 by FUJITA Tomonori Committed by John W. Linville Jun 04, 2010

ssb: add dma_dev to ssb_device structure



Add dma_dev, a pointer to struct device, to struct ssb_device.  We pass it
to the generic DMA API with SSB_BUSTYPE_PCI and SSB_BUSTYPE_SSB.
ssb_devices_register() sets up it properly.

This is preparation for replacing the ssb bus specific DMA API (ssb_dma_*)
with the generic DMA API.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Michael Buesch <mb@bu3sch.de>
Cc: Gary Zambrano <zambrano@broadcom.com>
Cc: Stefano Brivio <stefano.brivio@polimi.it>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: John W. Linville <linville@tuxdriver.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 2e724443

drivers/ssb/main.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -486,6 +486,7 @@ static int ssb_devices_register(struct ssb_bus *bus)
		#ifdef CONFIG_SSB_PCIHOST
		sdev->irq = bus->host_pci->irq;
		dev->parent = &bus->host_pci->dev;
		sdev->dma_dev = dev->parent;
		#endif
		break;
		case SSB_BUSTYPE_PCMCIA:
		@@ -501,6 +502,7 @@ static int ssb_devices_register(struct ssb_bus *bus)
		break;
		case SSB_BUSTYPE_SSB:
		dev->dma_mask = &dev->coherent_dma_mask;
		sdev->dma_dev = dev;
		break;
		}

include/linux/ssb/ssb.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -167,7 +167,7 @@ struct ssb_device {
		* is an optimization. */
		const struct ssb_bus_ops *ops;

		struct device *dev;
		struct device dev, dma_dev;

		struct ssb_bus *bus;
		struct ssb_device_id id;

Admin message