cxl_pci_to_cfg_record() is not used anywhere, and its function can be
replacd with PCI_DEVID(), so remove it.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
 drivers/misc/cxl/vphb.c | 12 +-----------
 include/misc/cxl.h      |  4 ----
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/drivers/misc/cxl/vphb.c b/drivers/misc/cxl/vphb.c
index 6332db8044bd..1cf614bf104d 100644
--- a/drivers/misc/cxl/vphb.c
+++ b/drivers/misc/cxl/vphb.c
@@ -72,11 +72,6 @@ static void cxl_pci_reset_secondary_bus(struct pci_dev *dev)
 	/* Should we do an AFU reset here ? */
 }
 
-static int cxl_pcie_cfg_record(u8 bus, u8 devfn)
-{
-	return (bus << 8) + devfn;
-}
-
 static inline struct cxl_afu *pci_bus_to_afu(struct pci_bus *bus)
 {
 	struct pci_controller *phb = bus ? pci_bus_to_host(bus) : NULL;
@@ -99,7 +94,7 @@ static inline int cxl_pcie_config_info(struct pci_bus *bus, unsigned int devfn,
 {
 	int record;
 
-	record = cxl_pcie_cfg_record(bus->number, devfn);
+	record = PCI_DEVID(bus->number, devfn);
 	if (record > afu->crs_num)
 		return PCIBIOS_DEVICE_NOT_FOUND;
 
@@ -302,8 +297,3 @@ struct cxl_afu *cxl_pci_to_afu(struct pci_dev *dev)
 }
 EXPORT_SYMBOL_GPL(cxl_pci_to_afu);
 
-unsigned int cxl_pci_to_cfg_record(struct pci_dev *dev)
-{
-	return cxl_pcie_cfg_record(dev->bus->number, dev->devfn);
-}
-EXPORT_SYMBOL_GPL(cxl_pci_to_cfg_record);
diff --git a/include/misc/cxl.h b/include/misc/cxl.h
index d8044299d654..5ffa6e02bb07 100644
--- a/include/misc/cxl.h
+++ b/include/misc/cxl.h
@@ -23,10 +23,6 @@
 /* Get the AFU associated with a pci_dev */
 struct cxl_afu *cxl_pci_to_afu(struct pci_dev *dev);
 
-/* Get the AFU conf record number associated with a pci_dev */
-unsigned int cxl_pci_to_cfg_record(struct pci_dev *dev);
-
-
 /*
  * Context lifetime overview:
  *
-- 
2.34.1

On Wed, 2024-08-28 at 18:38 +0800, Jinjie Ruan wrote:
> cxl_pci_to_cfg_record() is not used anywhere, and its function can be
> replacd with PCI_DEVID(), so remove it.
> 
> Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>

This description is inaccurate - this removes both
cxl_pci_to_cfg_record() (which is unused), and replaces
cxl_pcie_cfg_record() with PCI_DEVID().

The patch itself looks fine.

Note that I am planning to remove this driver soon anyway.

> ---
>  drivers/misc/cxl/vphb.c | 12 +-----------
>  include/misc/cxl.h      |  4 ----
>  2 files changed, 1 insertion(+), 15 deletions(-)
> 
> diff --git a/drivers/misc/cxl/vphb.c b/drivers/misc/cxl/vphb.c
> index 6332db8044bd..1cf614bf104d 100644
> --- a/drivers/misc/cxl/vphb.c
> +++ b/drivers/misc/cxl/vphb.c
> @@ -72,11 +72,6 @@ static void cxl_pci_reset_secondary_bus(struct
> pci_dev *dev)
>  	/* Should we do an AFU reset here ? */
>  }
>  
> -static int cxl_pcie_cfg_record(u8 bus, u8 devfn)
> -{
> -	return (bus << 8) + devfn;
> -}
> -
>  static inline struct cxl_afu *pci_bus_to_afu(struct pci_bus *bus)
>  {
>  	struct pci_controller *phb = bus ? pci_bus_to_host(bus) :
> NULL;
> @@ -99,7 +94,7 @@ static inline int cxl_pcie_config_info(struct
> pci_bus *bus, unsigned int devfn,
>  {
>  	int record;
>  
> -	record = cxl_pcie_cfg_record(bus->number, devfn);
> +	record = PCI_DEVID(bus->number, devfn);
>  	if (record > afu->crs_num)
>  		return PCIBIOS_DEVICE_NOT_FOUND;
>  
> @@ -302,8 +297,3 @@ struct cxl_afu *cxl_pci_to_afu(struct pci_dev
> *dev)
>  }
>  EXPORT_SYMBOL_GPL(cxl_pci_to_afu);
>  
> -unsigned int cxl_pci_to_cfg_record(struct pci_dev *dev)
> -{
> -	return cxl_pcie_cfg_record(dev->bus->number, dev->devfn);
> -}
> -EXPORT_SYMBOL_GPL(cxl_pci_to_cfg_record);
> diff --git a/include/misc/cxl.h b/include/misc/cxl.h
> index d8044299d654..5ffa6e02bb07 100644
> --- a/include/misc/cxl.h
> +++ b/include/misc/cxl.h
> @@ -23,10 +23,6 @@
>  /* Get the AFU associated with a pci_dev */
>  struct cxl_afu *cxl_pci_to_afu(struct pci_dev *dev);
>  
> -/* Get the AFU conf record number associated with a pci_dev */
> -unsigned int cxl_pci_to_cfg_record(struct pci_dev *dev);
> -
> -
>  /*
>   * Context lifetime overview:
>   *

-- 
Andrew Donnellan    OzLabs, ADL Canberra
ajd@linux.ibm.com   IBM Australia Limited