mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 11:49:32 +00:00
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: 625f269a5a
("crypto: inside-secure - add support for...")
Signed-off-by: Pascal van Leeuwen <pvanleeuwen@verimatrix.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
5fc194ea6d
commit
212ef6f29e
1 changed files with 30 additions and 12 deletions
|
@ -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);
|
||||
/* Register platform driver */
|
||||
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)
|
||||
return pcireg_rc;
|
||||
#else
|
||||
return -EINVAL;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if IS_ENABLED(CONFIG_PCI)
|
||||
/* Register PCI driver */
|
||||
rc = pci_register_driver(&safexcel_pci_driver);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __exit safexcel_exit(void)
|
||||
{
|
||||
#if IS_ENABLED(CONFIG_OF)
|
||||
/* Unregister platform driver */
|
||||
/* Unregister platform driver */
|
||||
if (!ofreg_rc)
|
||||
platform_driver_unregister(&crypto_safexcel);
|
||||
#endif
|
||||
|
||||
#if IS_ENABLED(CONFIG_PCI)
|
||||
/* Unregister PCI driver if successfully registered before */
|
||||
/* Unregister PCI driver if successfully registered before */
|
||||
if (!pcireg_rc)
|
||||
pci_unregister_driver(&safexcel_pci_driver);
|
||||
#endif
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue