diff mbox series

PCI: msi: remove pci_irq_get_node() as no one is using it

Message ID 20191014100452.GA6699@kroah.com (mailing list archive)
State Mainlined, archived
Commit d41b0e64d206f8948212b4d0f30c330db95c9636
Headers show
Series PCI: msi: remove pci_irq_get_node() as no one is using it | expand

Commit Message

Greg Kroah-Hartman Oct. 14, 2019, 10:04 a.m. UTC 
The function pci_irq_get_node() is not used by anyone in the tree, so
just delete it.

Cc: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

Comments

Andrew Murray Oct. 14, 2019, 11:01 a.m. UTC | #1 
On Mon, Oct 14, 2019 at 12:04:52PM +0200, Greg Kroah-Hartman wrote:
> The function pci_irq_get_node() is not used by anyone in the tree, so
> just delete it.
> 
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---

Reviewed-by: Andrew Murray <andrew.murray@arm.com>

> 
> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
> index 0884bedcfc7a..f95fe23830f0 100644
> --- a/drivers/pci/msi.c
> +++ b/drivers/pci/msi.c
> @@ -1315,22 +1315,6 @@ const struct cpumask *pci_irq_get_affinity(struct pci_dev *dev, int nr)
>  }
>  EXPORT_SYMBOL(pci_irq_get_affinity);
>  
> -/**
> - * pci_irq_get_node - return the NUMA node of a particular MSI vector
> - * @pdev:	PCI device to operate on
> - * @vec:	device-relative interrupt vector index (0-based).
> - */
> -int pci_irq_get_node(struct pci_dev *pdev, int vec)
> -{
> -	const struct cpumask *mask;
> -
> -	mask = pci_irq_get_affinity(pdev, vec);
> -	if (mask)
> -		return local_memory_node(cpu_to_node(cpumask_first(mask)));
> -	return dev_to_node(&pdev->dev);
> -}
> -EXPORT_SYMBOL(pci_irq_get_node);
> -
>  struct pci_dev *msi_desc_to_pci_dev(struct msi_desc *desc)
>  {
>  	return to_pci_dev(desc->dev);
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index f9088c89a534..755d8c0176b9 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -1454,7 +1454,6 @@ int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
>  void pci_free_irq_vectors(struct pci_dev *dev);
>  int pci_irq_vector(struct pci_dev *dev, unsigned int nr);
>  const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, int vec);
> -int pci_irq_get_node(struct pci_dev *pdev, int vec);
>  
>  #else
>  static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; }
> @@ -1497,11 +1496,6 @@ static inline const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev,
>  {
>  	return cpu_possible_mask;
>  }
> -
> -static inline int pci_irq_get_node(struct pci_dev *pdev, int vec)
> -{
> -	return first_online_node;
> -}
>  #endif
>  
>  /**
Bjorn Helgaas Oct. 14, 2019, 3:12 p.m. UTC | #2 
On Mon, Oct 14, 2019 at 12:04:52PM +0200, Greg Kroah-Hartman wrote:
> The function pci_irq_get_node() is not used by anyone in the tree, so
> just delete it.
> 
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Applied with Andrew's Reviewed-by to psi/msi for v5.5, thanks!

> ---
> 
> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
> index 0884bedcfc7a..f95fe23830f0 100644
> --- a/drivers/pci/msi.c
> +++ b/drivers/pci/msi.c
> @@ -1315,22 +1315,6 @@ const struct cpumask *pci_irq_get_affinity(struct pci_dev *dev, int nr)
>  }
>  EXPORT_SYMBOL(pci_irq_get_affinity);
>  
> -/**
> - * pci_irq_get_node - return the NUMA node of a particular MSI vector
> - * @pdev:	PCI device to operate on
> - * @vec:	device-relative interrupt vector index (0-based).
> - */
> -int pci_irq_get_node(struct pci_dev *pdev, int vec)
> -{
> -	const struct cpumask *mask;
> -
> -	mask = pci_irq_get_affinity(pdev, vec);
> -	if (mask)
> -		return local_memory_node(cpu_to_node(cpumask_first(mask)));
> -	return dev_to_node(&pdev->dev);
> -}
> -EXPORT_SYMBOL(pci_irq_get_node);
> -
>  struct pci_dev *msi_desc_to_pci_dev(struct msi_desc *desc)
>  {
>  	return to_pci_dev(desc->dev);
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index f9088c89a534..755d8c0176b9 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -1454,7 +1454,6 @@ int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
>  void pci_free_irq_vectors(struct pci_dev *dev);
>  int pci_irq_vector(struct pci_dev *dev, unsigned int nr);
>  const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, int vec);
> -int pci_irq_get_node(struct pci_dev *pdev, int vec);
>  
>  #else
>  static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; }
> @@ -1497,11 +1496,6 @@ static inline const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev,
>  {
>  	return cpu_possible_mask;
>  }
> -
> -static inline int pci_irq_get_node(struct pci_dev *pdev, int vec)
> -{
> -	return first_online_node;
> -}
>  #endif
>  
>  /**
diff mbox series

Patch

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 0884bedcfc7a..f95fe23830f0 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -1315,22 +1315,6 @@  const struct cpumask *pci_irq_get_affinity(struct pci_dev *dev, int nr)
 }
 EXPORT_SYMBOL(pci_irq_get_affinity);
 
-/**
- * pci_irq_get_node - return the NUMA node of a particular MSI vector
- * @pdev:	PCI device to operate on
- * @vec:	device-relative interrupt vector index (0-based).
- */
-int pci_irq_get_node(struct pci_dev *pdev, int vec)
-{
-	const struct cpumask *mask;
-
-	mask = pci_irq_get_affinity(pdev, vec);
-	if (mask)
-		return local_memory_node(cpu_to_node(cpumask_first(mask)));
-	return dev_to_node(&pdev->dev);
-}
-EXPORT_SYMBOL(pci_irq_get_node);
-
 struct pci_dev *msi_desc_to_pci_dev(struct msi_desc *desc)
 {
 	return to_pci_dev(desc->dev);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index f9088c89a534..755d8c0176b9 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1454,7 +1454,6 @@  int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
 void pci_free_irq_vectors(struct pci_dev *dev);
 int pci_irq_vector(struct pci_dev *dev, unsigned int nr);
 const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, int vec);
-int pci_irq_get_node(struct pci_dev *pdev, int vec);
 
 #else
 static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; }
@@ -1497,11 +1496,6 @@  static inline const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev,
 {
 	return cpu_possible_mask;
 }
-
-static inline int pci_irq_get_node(struct pci_dev *pdev, int vec)
-{
-	return first_online_node;
-}
 #endif
 
 /**