It seems that mn10300 made it upstream after Jan Beulich's pci_dac_dma_*
cleanup work and still defines pci_dac_dma_supported(). This API is not
required by the PCI subsystem anymore, so remove it.
Signed-off-by: Fernando Luis Vazquez Cao <[email protected]>
---
diff -urNp linux-2.6.28-rc7-orig/include/asm-mn10300/pci.h linux-2.6.28-rc7/include/asm-mn10300/pci.h
--- linux-2.6.28-rc7-orig/include/asm-mn10300/pci.h 2008-10-10 07:13:53.000000000 +0900
+++ linux-2.6.28-rc7/include/asm-mn10300/pci.h 2008-12-04 13:53:13.000000000 +0900
@@ -70,10 +70,6 @@ struct pci_dev;
*/
#define PCI_DMA_BUS_IS_PHYS (1)
-
-/* This is always fine. */
-#define pci_dac_dma_supported(pci_dev, mask) (0)
-
/* Return the index of the PCI controller for device. */
static inline int pci_controller_num(struct pci_dev *dev)
{
On Wednesday, December 03, 2008 9:08 pm Fernando Luis V?zquez Cao wrote:
> It seems that mn10300 made it upstream after Jan Beulich's pci_dac_dma_*
> cleanup work and still defines pci_dac_dma_supported(). This API is not
> required by the PCI subsystem anymore, so remove it.
Applied this to my linux-next branch, thanks. I can drop it if the arch
maintainer wants to send it instead though.
--
Jesse Barnes, Intel Open Source Technology Center
Fernando Luis V?zquez Cao wrote:
> It seems that mn10300 made it upstream after Jan Beulich's pci_dac_dma_*
> cleanup work and still defines pci_dac_dma_supported(). This API is not
> required by the PCI subsystem anymore, so remove it.
>
> Signed-off-by: Fernando Luis Vazquez Cao <[email protected]>
> ---
>
> diff -urNp linux-2.6.28-rc7-orig/include/asm-mn10300/pci.h linux-2.6.28-rc7/include/asm-mn10300/pci.h
> --- linux-2.6.28-rc7-orig/include/asm-mn10300/pci.h 2008-10-10 07:13:53.000000000 +0900
> +++ linux-2.6.28-rc7/include/asm-mn10300/pci.h 2008-12-04 13:53:13.000000000 +0900
> @@ -70,10 +70,6 @@ struct pci_dev;
> */
> #define PCI_DMA_BUS_IS_PHYS (1)
>
> -
> -/* This is always fine. */
> -#define pci_dac_dma_supported(pci_dev, mask) (0)
> -
> /* Return the index of the PCI controller for device. */
> static inline int pci_controller_num(struct pci_dev *dev)
> {
It seems this patch slipped through the cracks. I will be replying to this email
with an updated version rebased against 2.6.31-rc1.
Thanks,
Fernando
It seems that mn10300 made it upstream after Jan Beulich's pci_dac_dma_*
cleanup work and still defines pci_dac_dma_supported(). This API is not
required by the PCI subsystem anymore, so remove it.
Signed-off-by: Fernando Luis Vazquez Cao <[email protected]>
---
diff -urNp linux-2.6.31-rc1-orig/arch/mn10300/include/asm/pci.h linux-2.6.31-rc1/arch/mn10300/include/asm/pci.h
--- linux-2.6.31-rc1-orig/arch/mn10300/include/asm/pci.h 2009-06-26 10:58:02.012044068 +0900
+++ linux-2.6.31-rc1/arch/mn10300/include/asm/pci.h 2009-06-26 11:19:34.130867667 +0900
@@ -70,10 +70,6 @@ struct pci_dev;
*/
#define PCI_DMA_BUS_IS_PHYS (1)
-
-/* This is always fine. */
-#define pci_dac_dma_supported(pci_dev, mask) (0)
-
/* Return the index of the PCI controller for device. */
static inline int pci_controller_num(struct pci_dev *dev)
{
On Fri, 26 Jun 2009 11:27:41 +0900
Fernando Luis Vázquez Cao <[email protected]> wrote:
> It seems that mn10300 made it upstream after Jan Beulich's
> pci_dac_dma_* cleanup work and still defines pci_dac_dma_supported().
> This API is not required by the PCI subsystem anymore, so remove it.
>
> Signed-off-by: Fernando Luis Vazquez Cao <[email protected]>
> ---
>
> diff -urNp linux-2.6.31-rc1-orig/arch/mn10300/include/asm/pci.h
> linux-2.6.31-rc1/arch/mn10300/include/asm/pci.h ---
> linux-2.6.31-rc1-orig/arch/mn10300/include/asm/pci.h
> 2009-06-26 10:58:02.012044068 +0900 +++
> linux-2.6.31-rc1/arch/mn10300/include/asm/pci.h 2009-06-26
> 11:19:34.130867667 +0900 @@ -70,10 +70,6 @@ struct pci_dev; */
> #define PCI_DMA_BUS_IS_PHYS (1)
>
> -
> -/* This is always fine. */
> -#define pci_dac_dma_supported(pci_dev, mask) (0)
> -
> /* Return the index of the PCI controller for device. */
> static inline int pci_controller_num(struct pci_dev *dev)
> {
Had to fix up some fuzz, but it's now in my for-linus branch. Thanks.
--
Jesse Barnes, Intel Open Source Technology Center