From: Yang Shen <[email protected]>
The parameter type of 'pci_set_drvdata' is 'struct hisi_qm',
so here the return type of 'pci_get_drvdata' should be 'struct hisi_qm'
too.
Signed-off-by: Yang Shen <[email protected]>
Signed-off-by: Weili Qian <[email protected]>
Reviewed-by: Zhou Wang <[email protected]>
---
drivers/crypto/hisilicon/hpre/hpre_main.c | 3 +--
drivers/crypto/hisilicon/sec2/sec_main.c | 3 +--
drivers/crypto/hisilicon/zip/zip_main.c | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/crypto/hisilicon/hpre/hpre_main.c b/drivers/crypto/hisilicon/hpre/hpre_main.c
index 45741d2..4fd0a0a 100644
--- a/drivers/crypto/hisilicon/hpre/hpre_main.c
+++ b/drivers/crypto/hisilicon/hpre/hpre_main.c
@@ -900,8 +900,7 @@ static int hpre_probe(struct pci_dev *pdev, const struct pci_device_id *id)
static void hpre_remove(struct pci_dev *pdev)
{
- struct hpre *hpre = pci_get_drvdata(pdev);
- struct hisi_qm *qm = &hpre->qm;
+ struct hisi_qm *qm = pci_get_drvdata(pdev);
int ret;
hisi_qm_wait_task_finish(qm, &hpre_devices);
diff --git a/drivers/crypto/hisilicon/sec2/sec_main.c b/drivers/crypto/hisilicon/sec2/sec_main.c
index f912e57..6d4380b 100644
--- a/drivers/crypto/hisilicon/sec2/sec_main.c
+++ b/drivers/crypto/hisilicon/sec2/sec_main.c
@@ -915,8 +915,7 @@ static int sec_probe(struct pci_dev *pdev, const struct pci_device_id *id)
static void sec_remove(struct pci_dev *pdev)
{
- struct sec_dev *sec = pci_get_drvdata(pdev);
- struct hisi_qm *qm = &sec->qm;
+ struct hisi_qm *qm = pci_get_drvdata(pdev);
hisi_qm_wait_task_finish(qm, &sec_devices);
hisi_qm_alg_unregister(qm, &sec_devices);
diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c
index 8bbae28..6641d39 100644
--- a/drivers/crypto/hisilicon/zip/zip_main.c
+++ b/drivers/crypto/hisilicon/zip/zip_main.c
@@ -846,8 +846,7 @@ static int hisi_zip_probe(struct pci_dev *pdev, const struct pci_device_id *id)
static void hisi_zip_remove(struct pci_dev *pdev)
{
- struct hisi_zip *hisi_zip = pci_get_drvdata(pdev);
- struct hisi_qm *qm = &hisi_zip->qm;
+ struct hisi_qm *qm = pci_get_drvdata(pdev);
hisi_qm_wait_task_finish(qm, &zip_devices);
hisi_qm_alg_unregister(qm, &zip_devices);
--
2.8.1
Hi Weili,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on cryptodev/master]
[also build test ERROR on crypto/master sparc-next/master v5.9-rc3 next-20200903]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Weili-Qian/crypto-hisilicon-misc-fixes/20200903-200547
base: https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git master
config: ia64-allmodconfig (attached as .config)
compiler: ia64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=ia64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
drivers/crypto/hisilicon/zip/zip_main.c: In function 'hisi_zip_remove':
>> drivers/crypto/hisilicon/zip/zip_main.c:862:24: error: 'hisi_zip' undeclared (first use in this function)
862 | hisi_zip_debugfs_exit(hisi_zip);
| ^~~~~~~~
drivers/crypto/hisilicon/zip/zip_main.c:862:24: note: each undeclared identifier is reported only once for each function it appears in
# https://github.com/0day-ci/linux/commit/9233b94d43e85aa53ba599605c7536455521f576
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Weili-Qian/crypto-hisilicon-misc-fixes/20200903-200547
git checkout 9233b94d43e85aa53ba599605c7536455521f576
vim +/hisi_zip +862 drivers/crypto/hisilicon/zip/zip_main.c
39977f4b51cdc5 Hao Fang 2019-11-07 851
62c455ca853e3e Zhou Wang 2019-08-02 852 static void hisi_zip_remove(struct pci_dev *pdev)
62c455ca853e3e Zhou Wang 2019-08-02 853 {
9233b94d43e85a Yang Shen 2020-09-03 854 struct hisi_qm *qm = pci_get_drvdata(pdev);
62c455ca853e3e Zhou Wang 2019-08-02 855
daa31783c0ebab Weili Qian 2020-08-15 856 hisi_qm_wait_task_finish(qm, &zip_devices);
3d29e98d1d7550 Yang Shen 2020-08-15 857 hisi_qm_alg_unregister(qm, &zip_devices);
3d29e98d1d7550 Yang Shen 2020-08-15 858
619e464ae22a17 Shukun Tan 2020-04-02 859 if (qm->fun_type == QM_HW_PF && qm->vfs_num)
daa31783c0ebab Weili Qian 2020-08-15 860 hisi_qm_sriov_disable(pdev, qm->is_frozen);
79e09f30eeba85 Zhou Wang 2019-08-02 861
72c7a68d2ea348 Zhou Wang 2019-08-02 @862 hisi_zip_debugfs_exit(hisi_zip);
e88dd6e1d8370f Yang Shen 2020-08-15 863 hisi_qm_stop(qm, QM_NORMAL);
eaebf4c3b103df Shukun Tan 2020-01-20 864 hisi_qm_dev_err_uninit(qm);
62c455ca853e3e Zhou Wang 2019-08-02 865 hisi_qm_uninit(qm);
62c455ca853e3e Zhou Wang 2019-08-02 866 }
62c455ca853e3e Zhou Wang 2019-08-02 867
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]