Re: [RFC: 2.6 patch] drivers/pci/pci.c: remove pci_dac_set_dma_mask

[Grant Grundler <grundler@parisc-linux.org>]

On Sun, May 01, 2005 at 03:53:08PM +0200, Adrian Bunk wrote:
> pci_dac_set_dma_mask is currently completely unused.
> 
> Is any usage planned in the forseeable future or is this patch to remove 
> it OK?

I think so. Drivers call pci_set_dma_mask() and check the return code.

Documentation/DMA-mapping.txt needs to be updated too:
| The first thing your driver needs to do is query the PCI platform
| layer with your devices DAC addressing capabilities:
| 
|       int pci_dac_set_dma_mask(struct pci_dev *pdev, u64 mask);
| 
| This routine behaves identically to pci_set_dma_mask.  You may not   
| use the following interfaces if this routine fails.

thanks,
grant

> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> 
> ---
> 
>  arch/arm/mach-ixp4xx/common-pci.c |   10 ----------
>  drivers/pci/pci.c                 |   12 ------------
>  include/linux/pci.h               |    2 --
>  3 files changed, 24 deletions(-)
> 
> --- linux-2.6.12-rc3-mm1-full/include/linux/pci.h.old	2005-04-30 22:56:24.000000000 +0200
> +++ linux-2.6.12-rc3-mm1-full/include/linux/pci.h	2005-04-30 22:56:31.000000000 +0200
> @@ -815,7 +815,6 @@
>  int pci_set_mwi(struct pci_dev *dev);
>  void pci_clear_mwi(struct pci_dev *dev);
>  int pci_set_dma_mask(struct pci_dev *dev, u64 mask);
> -int pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask);
>  int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask);
>  int pci_assign_resource(struct pci_dev *dev, int i);
>  
> @@ -946,7 +945,6 @@
>  static inline int pci_enable_device(struct pci_dev *dev) { return -EIO; }
>  static inline void pci_disable_device(struct pci_dev *dev) { }
>  static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) { return -EIO; }
> -static inline int pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask) { return -EIO; }
>  static inline int pci_assign_resource(struct pci_dev *dev, int i) { return -EBUSY;}
>  static inline int pci_register_driver(struct pci_driver *drv) { return 0;}
>  static inline void pci_unregister_driver(struct pci_driver *drv) { }
> --- linux-2.6.12-rc3-mm1-full/drivers/pci/pci.c.old	2005-04-30 22:56:39.000000000 +0200
> +++ linux-2.6.12-rc3-mm1-full/drivers/pci/pci.c	2005-04-30 22:57:07.000000000 +0200
> @@ -806,17 +806,6 @@
>  }
>      
>  int
> -pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask)
> -{
> -	if (!pci_dac_dma_supported(dev, mask))
> -		return -EIO;
> -
> -	dev->dma_mask = mask;
> -
> -	return 0;
> -}
> -
> -int
>  pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
>  {
>  	if (!pci_dma_supported(dev, mask))
> @@ -878,7 +867,6 @@
>  EXPORT_SYMBOL(pci_set_mwi);
>  EXPORT_SYMBOL(pci_clear_mwi);
>  EXPORT_SYMBOL(pci_set_dma_mask);
> -EXPORT_SYMBOL(pci_dac_set_dma_mask);
>  EXPORT_SYMBOL(pci_set_consistent_dma_mask);
>  EXPORT_SYMBOL(pci_assign_resource);
>  EXPORT_SYMBOL(pci_find_parent_resource);
> --- linux-2.6.12-rc3-mm1-full/arch/arm/mach-ixp4xx/common-pci.c.old	2005-04-30 22:57:22.000000000 +0200
> +++ linux-2.6.12-rc3-mm1-full/arch/arm/mach-ixp4xx/common-pci.c	2005-04-30 22:57:29.000000000 +0200
> @@ -502,15 +502,6 @@
>  }
>      
>  int
> -pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask)
> -{
> -	if (mask >= SZ_64M - 1 )
> -		return 0;
> -
> -	return -EIO;
> -}
> -
> -int
>  pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
>  {
>  	if (mask >= SZ_64M - 1 )
> @@ -520,7 +511,6 @@
>  }
>  
>  EXPORT_SYMBOL(pci_set_dma_mask);
> -EXPORT_SYMBOL(pci_dac_set_dma_mask);
>  EXPORT_SYMBOL(pci_set_consistent_dma_mask);
>  EXPORT_SYMBOL(ixp4xx_pci_read);
>  EXPORT_SYMBOL(ixp4xx_pci_write);