Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 212ef6f2 authored by Pascal van Leeuwen's avatar Pascal van Leeuwen Committed by Herbert Xu
Browse files

crypto: inside-secure - Fix unused variable warning when CONFIG_PCI=n 



This patch fixes an unused variable warning from the compiler when the
driver is being compiled without PCI support in the kernel.

Fixes: 625f269a ("crypto: inside-secure - add support for...")
Signed-off-by: default avatarPascal van Leeuwen <pvanleeuwen@verimatrix.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5fc194ea

drivers/crypto/inside-secure/safexcel.c

+29 −11
Original line number Diff line number Diff line
@@ -1789,32 +1789,50 @@ static struct pci_driver safexcel_pci_driver = { 
};

#endif



/* Unfortunately, we have to resort to global variables here */

#if IS_ENABLED(CONFIG_PCI)

int pcireg_rc = -EINVAL; /* Default safe value */

#endif

#if IS_ENABLED(CONFIG_OF)

int ofreg_rc = -EINVAL; /* Default safe value */

#endif



static int __init safexcel_init(void)

{

	int rc;

#if IS_ENABLED(CONFIG_PCI)

	/* Register PCI driver */

	pcireg_rc = pci_register_driver(&safexcel_pci_driver);

#endif



#if IS_ENABLED(CONFIG_OF)

	/* Register platform driver */

		platform_driver_register(&crypto_safexcel);

	ofreg_rc = platform_driver_register(&crypto_safexcel);

 #if IS_ENABLED(CONFIG_PCI)

	/* Return success if either PCI or OF registered OK */

	return pcireg_rc ? ofreg_rc : 0;

 #else

	return ofreg_rc;

 #endif



#else

 #if IS_ENABLED(CONFIG_PCI)

		/* Register PCI driver */

		rc = pci_register_driver(&safexcel_pci_driver);

	return pcireg_rc;

 #else

	return -EINVAL;

 #endif

#endif



	return 0;

}



static void __exit safexcel_exit(void)

{

#if IS_ENABLED(CONFIG_OF)

	/* Unregister platform driver */

	if (!ofreg_rc)

		platform_driver_unregister(&crypto_safexcel);

#endif



#if IS_ENABLED(CONFIG_PCI)

	/* Unregister PCI driver if successfully registered before */

	if (!pcireg_rc)

		pci_unregister_driver(&safexcel_pci_driver);

#endif

}