linux-kernel - [PATCH -mm v2 1/5] ssb: add dma_dev to ssb

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1266246250-5344-2-git-send-email-fujita.tomonori@lab.ntt.co.jp>
Date:	Tue, 16 Feb 2010 00:04:06 +0900
From:	FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>
To:	linux-kernel@...r.kernel.org
Cc:	akpm@...ux-foundation.org, netdev@...r.kernel.org,
	fujita.tomonori@....ntt.co.jp, davem@...emloft.net,
	Michael Buesch <mb@...sch.de>,
	Gary Zambrano <zambrano@...adcom.com>,
	Stefano Brivio <stefano.brivio@...imi.it>,
	Larry Finger <Larry.Finger@...inger.net>,
	"John W. Linville" <linville@...driver.com>
Subject: [PATCH -mm v2 1/5] 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@....ntt.co.jp>
Cc: Michael Buesch <mb@...sch.de>
Cc: Gary Zambrano <zambrano@...adcom.com>
Cc: Stefano Brivio <stefano.brivio@...imi.it>
Cc: Larry Finger <Larry.Finger@...inger.net>
Cc: John W. Linville <linville@...driver.com>
Cc: David S. Miller <davem@...emloft.net>
---
 drivers/ssb/main.c      |    2 ++
 include/linux/ssb/ssb.h |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index 5681ebe..1a41b3f 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -485,6 +485,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;
 		}
 
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index 24f9885..c5e00b2 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -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;
-- 
1.6.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/