| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152 |
- From: FUJITA Tomonori <[email protected]>
- 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 <[email protected]>
- Acked-by: Michael Buesch <[email protected]>
- Cc: Gary Zambrano <[email protected]>
- Cc: Stefano Brivio <[email protected]>
- Cc: Larry Finger <[email protected]>
- Cc: John W. Linville <[email protected]>
- Acked-by: David S. Miller <[email protected]>
- Signed-off-by: Andrew Morton <[email protected]>
- ---
- drivers/ssb/main.c | 2 ++
- include/linux/ssb/ssb.h | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
- --- a/drivers/ssb/main.c
- +++ b/drivers/ssb/main.c
- @@ -485,6 +485,7 @@ static int ssb_devices_register(struct s
- #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:
- @@ -500,6 +501,7 @@ static int ssb_devices_register(struct s
- break;
- case SSB_BUSTYPE_SSB:
- dev->dma_mask = &dev->coherent_dma_mask;
- + sdev->dma_dev = dev;
- break;
- }
-
- --- 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;
|
