From patchwork Tue Aug 8 03:08:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiongfeng Wang X-Patchwork-Id: 132500 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1852011vqr; Mon, 7 Aug 2023 20:22:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPKGBtXp7U42gTlyc9QWgDO9Wj2HJymmQhc2fd2zAbXf9B50mrZKTwbq2POMlfjTHsV70e X-Received: by 2002:a05:6a00:2d18:b0:674:8fe0:126f with SMTP id fa24-20020a056a002d1800b006748fe0126fmr14657694pfb.27.1691464948829; Mon, 07 Aug 2023 20:22:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691464948; cv=none; d=google.com; s=arc-20160816; b=HSr1VuLRas7l9/1hMxYX3jS6UACSckJi/iNk9VGLEmEtvodx3aezpveKj+W9l7OJ+D R7j0W/yTx/zXmq1E1ZsK7eWPx1sbEJ/zcKaKf8NkKImfF2NSEk4OWFD9obKPFHQgvG/6 AJ4PSbibXC1Xe5Rj5gdHiX6gNq3DRsG8HDp6hcb+bjTu1oyMPh3seZlJeZsbPd+WFJE1 cucmvCtlf5QLmkpWy/SvpbETA83X1ZPfR+6ht37kA0nlMdIoENOf4RPVbnUpperBuXCY yOO74DYnOonvy8Rjm2SYbWDrv1mw9Bm3354AUE+gIELqzNoAao7H+hRsWiW2Ly7vXC36 Kwhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=CpGacYG0pv+3Ii2n10F5paiaNPjVdHW/X6oNTuGPkiw=; fh=3+POWDQt+oJzIoihONQttuuqsROxUXcW9EI3nudhkkU=; b=OIG9motzYa9WrXeVOo7SFLMm2nd6ZqAVDGB7MEgzP5Ufeset8fTyy7L6w8OYAxvaIp pS2wxsdLiRw6YD7b0UpnaOHzExGfUEomt0oLlslOZsHi4F2HJAa3HfaJH973msVexLQj trobTnCoE9uaaN4WUFsJKrOTCbkETspV/tpC99OQj3WsmSrGfYqZoaIGsWoZI6+jSpcd vcp4eedBwRKAfb/3Zb+aiMx6Tem97qCeZg6PLBLyLOItvMlsZ6Q2HYPRkwqDgNl29AVm XSqjBpbZNWy2pQLsQYV4pzPQbyW/s8nExUS+qxSfFzl7HICIXYYEVtdUg/L6yNOkfDil I7ZQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k2-20020a6568c2000000b0053059dfafe4si6439099pgt.86.2023.08.07.20.22.16; Mon, 07 Aug 2023 20:22:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229932AbjHHC4a (ORCPT + 99 others); Mon, 7 Aug 2023 22:56:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229484AbjHHC42 (ORCPT ); Mon, 7 Aug 2023 22:56:28 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D9AFE62 for ; Mon, 7 Aug 2023 19:56:27 -0700 (PDT) Received: from dggpemm500002.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4RKd613DH3zNmdB; Tue, 8 Aug 2023 10:52:57 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500002.china.huawei.com (7.185.36.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 8 Aug 2023 10:56:25 +0800 From: Xiongfeng Wang To: , , CC: , , Subject: [PATCH] hwtracing: hisi_ptt: Use pci_dev_id() to simplify the code Date: Tue, 8 Aug 2023 11:08:35 +0800 Message-ID: <20230808030835.167538-1-wangxiongfeng2@huawei.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm500002.china.huawei.com (7.185.36.229) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773629550116137230 X-GMAIL-MSGID: 1773629550116137230 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 mannually using PCI_DEVID(). Use pci_dev_id() to simplify the code a little bit. Signed-off-by: Xiongfeng Wang Reviewed-by: Yang Yingliang Reviewed-by: Yicong Yang --- drivers/hwtracing/ptt/hisi_ptt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/hwtracing/ptt/hisi_ptt.c b/drivers/hwtracing/ptt/hisi_ptt.c index ba081b6d2435..49ea1b0f7489 100644 --- a/drivers/hwtracing/ptt/hisi_ptt.c +++ b/drivers/hwtracing/ptt/hisi_ptt.c @@ -618,13 +618,13 @@ static int hisi_ptt_notifier_call(struct notifier_block *nb, unsigned long actio if (!root_port) return 0; - port_devid = PCI_DEVID(root_port->bus->number, root_port->devfn); + port_devid = pci_dev_id(root_port); if (port_devid < hisi_ptt->lower_bdf || port_devid > hisi_ptt->upper_bdf) return 0; info.is_port = pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT; - info.devid = PCI_DEVID(pdev->bus->number, pdev->devfn); + info.devid = pci_dev_id(pdev); switch (action) { case BUS_NOTIFY_ADD_DEVICE: @@ -664,7 +664,7 @@ static int hisi_ptt_init_filters(struct pci_dev *pdev, void *data) if (!root_port) return 0; - port_devid = PCI_DEVID(root_port->bus->number, root_port->devfn); + port_devid = pci_dev_id(root_port); if (port_devid < hisi_ptt->lower_bdf || port_devid > hisi_ptt->upper_bdf) return 0; @@ -674,7 +674,7 @@ static int hisi_ptt_init_filters(struct pci_dev *pdev, void *data) * should be partial initialized and users would know which filter fails * through the log. Other functions of PTT device are still available. */ - filter = hisi_ptt_alloc_add_filter(hisi_ptt, PCI_DEVID(pdev->bus->number, pdev->devfn), + filter = hisi_ptt_alloc_add_filter(hisi_ptt, pci_dev_id(pdev), pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT); if (!filter) return -ENOMEM;