The patch titled Subject: dma: remove external references to dma_supported has been added to the -mm tree. Its filename is dma-remove-external-references-to-dma_supported.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/dma-remove-external-references-to-dma_supported.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/dma-remove-external-references-to-dma_supported.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Christoph Hellwig <hch@xxxxxx> Subject: dma: remove external references to dma_supported Signed-off-by: Christoph Hellwig <hch@xxxxxx> Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/DMA-API.txt | 13 ------------- drivers/usb/host/ehci-hcd.c | 2 +- drivers/usb/host/fotg210-hcd.c | 2 +- drivers/usb/host/fusbh200-hcd.c | 2 +- drivers/usb/host/oxu210hp-hcd.c | 2 +- 5 files changed, 4 insertions(+), 17 deletions(-) diff -puN Documentation/DMA-API.txt~dma-remove-external-references-to-dma_supported Documentation/DMA-API.txt --- a/Documentation/DMA-API.txt~dma-remove-external-references-to-dma_supported +++ a/Documentation/DMA-API.txt @@ -142,19 +142,6 @@ Part Ic - DMA addressing limitations ------------------------------------ int -dma_supported(struct device *dev, u64 mask) - -Checks to see if the device can support DMA to the memory described by -mask. - -Returns: 1 if it can and 0 if it can't. - -Notes: This routine merely tests to see if the mask is possible. It -won't change the current mask settings. It is more intended as an -internal API for use by the platform than an external API for use by -driver writers. - -int dma_set_mask_and_coherent(struct device *dev, u64 mask) Checks to see if the mask is possible and updates the device diff -puN drivers/usb/host/ehci-hcd.c~dma-remove-external-references-to-dma_supported drivers/usb/host/ehci-hcd.c --- a/drivers/usb/host/ehci-hcd.c~dma-remove-external-references-to-dma_supported +++ a/drivers/usb/host/ehci-hcd.c @@ -589,7 +589,7 @@ static int ehci_run (struct usb_hcd *hcd * streaming mappings for I/O buffers, like pci_map_single(), * can return segments above 4GB, if the device allows. * - * NOTE: the dma mask is visible through dma_supported(), so + * NOTE: the dma mask is visible through dev->dma_mask, so * drivers can pass this info along ... like NETIF_F_HIGHDMA, * Scsi_Host.highmem_io, and so forth. It's readonly to all * host side drivers though. diff -puN drivers/usb/host/fotg210-hcd.c~dma-remove-external-references-to-dma_supported drivers/usb/host/fotg210-hcd.c --- a/drivers/usb/host/fotg210-hcd.c~dma-remove-external-references-to-dma_supported +++ a/drivers/usb/host/fotg210-hcd.c @@ -5258,7 +5258,7 @@ static int fotg210_run(struct usb_hcd *h * streaming mappings for I/O buffers, like pci_map_single(), * can return segments above 4GB, if the device allows. * - * NOTE: the dma mask is visible through dma_supported(), so + * NOTE: the dma mask is visible through dev->dma_mask, so * drivers can pass this info along ... like NETIF_F_HIGHDMA, * Scsi_Host.highmem_io, and so forth. It's readonly to all * host side drivers though. diff -puN drivers/usb/host/fusbh200-hcd.c~dma-remove-external-references-to-dma_supported drivers/usb/host/fusbh200-hcd.c --- a/drivers/usb/host/fusbh200-hcd.c~dma-remove-external-references-to-dma_supported +++ a/drivers/usb/host/fusbh200-hcd.c @@ -5181,7 +5181,7 @@ static int fusbh200_run (struct usb_hcd * streaming mappings for I/O buffers, like pci_map_single(), * can return segments above 4GB, if the device allows. * - * NOTE: the dma mask is visible through dma_supported(), so + * NOTE: the dma mask is visible through dev->dma_mask, so * drivers can pass this info along ... like NETIF_F_HIGHDMA, * Scsi_Host.highmem_io, and so forth. It's readonly to all * host side drivers though. diff -puN drivers/usb/host/oxu210hp-hcd.c~dma-remove-external-references-to-dma_supported drivers/usb/host/oxu210hp-hcd.c --- a/drivers/usb/host/oxu210hp-hcd.c~dma-remove-external-references-to-dma_supported +++ a/drivers/usb/host/oxu210hp-hcd.c @@ -2721,7 +2721,7 @@ static int oxu_run(struct usb_hcd *hcd) * streaming mappings for I/O buffers, like pci_map_single(), * can return segments above 4GB, if the device allows. * - * NOTE: the dma mask is visible through dma_supported(), so + * NOTE: the dma mask is visible through dev->dma_mask, so * drivers can pass this info along ... like NETIF_F_HIGHDMA, * Scsi_Host.highmem_io, and so forth. It's readonly to all * host side drivers though. _ Patches currently in -mm which might be from hch@xxxxxx are pcnet32-use-pci_set_dma_mask-insted-of-pci_dma_supported.patch tw68-core-use-pci_set_dma_mask-insted-of-pci_dma_supported.patch saa7164-use-pci_set_dma_mask-insted-of-pci_dma_supported.patch saa7134-use-pci_set_dma_mask-insted-of-pci_dma_supported.patch cx88-use-pci_set_dma_mask-insted-of-pci_dma_supported.patch cx25821-use-pci_set_dma_mask-insted-of-pci_dma_supported.patch cx23885-use-pci_set_dma_mask-insted-of-pci_dma_supported.patch netup_unidvb-use-pci_set_dma_mask-insted-of-pci_dma_supported.patch mpsc-use-dma_set_mask-insted-of-dma_supported.patch nouveau-dont-call-pci_dma_supported.patch sfc-dont-call-dma_supported.patch kaweth-remove-ifdefed-out-call-to-dma_supported.patch usbnet-remove-ifdefed-out-call-to-dma_supported.patch pci-remove-pci_dma_supported.patch dma-remove-external-references-to-dma_supported.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html