diff mbox series

[-next] PCI/P2PDMA: Use pci_dev_id() to simplify the code

Message ID 20230811111057.31900-1-zhengzengkai@huawei.com
State New
Headers show
Series [-next] PCI/P2PDMA: Use pci_dev_id() to simplify the code | expand

Commit Message

Zheng Zengkai Aug. 11, 2023, 11:10 a.m. UTC
PCI core API pci_dev_id() can be used to get the BDF number for a pci
device. We don't need to compose it manually. Use pci_dev_id() to
simplify the code a little bit.

Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
---
 drivers/pci/p2pdma.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Bjorn Helgaas Aug. 11, 2023, 4:46 p.m. UTC | #1
On Fri, Aug 11, 2023 at 07:10:57PM +0800, Zheng Zengkai wrote:
> PCI core API pci_dev_id() can be used to get the BDF number for a pci
> device. We don't need to compose it manually. Use pci_dev_id() to
> simplify the code a little bit.
> 
> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

Applied to pci/misc for v6.6, thanks!

> ---
>  drivers/pci/p2pdma.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
> index 6cd98ffca198..ec04d0ed157b 100644
> --- a/drivers/pci/p2pdma.c
> +++ b/drivers/pci/p2pdma.c
> @@ -532,8 +532,7 @@ static bool host_bridge_whitelist(struct pci_dev *a, struct pci_dev *b,
>  
>  static unsigned long map_types_idx(struct pci_dev *client)
>  {
> -	return (pci_domain_nr(client->bus) << 16) |
> -		(client->bus->number << 8) | client->devfn;
> +	return (pci_domain_nr(client->bus) << 16) | pci_dev_id(client);
>  }
>  
>  /*
> -- 
> 2.20.1
>
Logan Gunthorpe Aug. 14, 2023, 4:09 p.m. UTC | #2
On 2023-08-11 05:10, Zheng Zengkai wrote:
> PCI core API pci_dev_id() can be used to get the BDF number for a pci
> device. We don't need to compose it manually. Use pci_dev_id() to
> simplify the code a little bit.
> 
> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
> ---
>  drivers/pci/p2pdma.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
> index 6cd98ffca198..ec04d0ed157b 100644
> --- a/drivers/pci/p2pdma.c
> +++ b/drivers/pci/p2pdma.c
> @@ -532,8 +532,7 @@ static bool host_bridge_whitelist(struct pci_dev *a, struct pci_dev *b,
>  
>  static unsigned long map_types_idx(struct pci_dev *client)
>  {
> -	return (pci_domain_nr(client->bus) << 16) |
> -		(client->bus->number << 8) | client->devfn;
> +	return (pci_domain_nr(client->bus) << 16) | pci_dev_id(client);
>  }
>  
>  /*

Looks good to me, thanks!

Reviewed-by: Logan Gunthorpe <logang@deltatee.com>

Logan
diff mbox series

Patch

diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
index 6cd98ffca198..ec04d0ed157b 100644
--- a/drivers/pci/p2pdma.c
+++ b/drivers/pci/p2pdma.c
@@ -532,8 +532,7 @@  static bool host_bridge_whitelist(struct pci_dev *a, struct pci_dev *b,
 
 static unsigned long map_types_idx(struct pci_dev *client)
 {
-	return (pci_domain_nr(client->bus) << 16) |
-		(client->bus->number << 8) | client->devfn;
+	return (pci_domain_nr(client->bus) << 16) | pci_dev_id(client);
 }
 
 /*