Commit e8c924a4 authored by Matthew Rosato's avatar Matthew Rosato Committed by Janosch Frank
Browse files

KVM: s390: pci: fix plain integer as NULL pointer warnings 



Fix some sparse warnings that a plain integer 0 is being used instead of
NULL.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarMatthew Rosato <mjrosato@linux.ibm.com>
Link: https://lore.kernel.org/r/20220915175514.167899-1-mjrosato@linux.ibm.com


Signed-off-by: default avatarChristian Borntraeger <borntraeger@linux.ibm.com>
Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
parent 521a547c

arch/s390/kvm/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static int zpci_setup_aipb(u8 nisc) 
	if (!zpci_aipb)

		return -ENOMEM;



	aift->sbv = airq_iv_create(ZPCI_NR_DEVICES, AIRQ_IV_ALLOC, 0);

	aift->sbv = airq_iv_create(ZPCI_NR_DEVICES, AIRQ_IV_ALLOC, NULL);

	if (!aift->sbv) {

		rc = -ENOMEM;

		goto free_aipb;
@@ -373,7 +373,7 @@ static int kvm_s390_pci_aif_disable(struct zpci_dev *zdev, bool force) 
		gaite->gisc = 0;

		gaite->aisbo = 0;

		gaite->gisa = 0;

		aift->kzdev[zdev->aisb] = 0;

		aift->kzdev[zdev->aisb] = NULL;

		/* Clear zdev info */

		airq_iv_free_bit(aift->sbv, zdev->aisb);

		airq_iv_release(zdev->aibv);

arch/s390/kvm/pci.h

+3 −3
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ extern struct zpci_aift *aift; 
static inline struct kvm *kvm_s390_pci_si_to_kvm(struct zpci_aift *aift,

						 unsigned long si)

{

	if (!IS_ENABLED(CONFIG_VFIO_PCI_ZDEV_KVM) || aift->kzdev == 0 ||

	    aift->kzdev[si] == 0)

		return 0;

	if (!IS_ENABLED(CONFIG_VFIO_PCI_ZDEV_KVM) || !aift->kzdev ||

	    !aift->kzdev[si])

		return NULL;

	return aift->kzdev[si]->kvm;

};