Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 625f269a5a7a ("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>

authored by

Pascal van Leeuwen and committed by
Herbert Xu
212ef6f2 5fc194ea

+30 -12
+30 -12
drivers/crypto/inside-secure/safexcel.c
··· 1789 1789 }; 1790 1790 #endif 1791 1791 1792 + /* Unfortunately, we have to resort to global variables here */ 1793 + #if IS_ENABLED(CONFIG_PCI) 1794 + int pcireg_rc = -EINVAL; /* Default safe value */ 1795 + #endif 1796 + #if IS_ENABLED(CONFIG_OF) 1797 + int ofreg_rc = -EINVAL; /* Default safe value */ 1798 + #endif 1799 + 1792 1800 static int __init safexcel_init(void) 1793 1801 { 1794 - int rc; 1802 + #if IS_ENABLED(CONFIG_PCI) 1803 + /* Register PCI driver */ 1804 + pcireg_rc = pci_register_driver(&safexcel_pci_driver); 1805 + #endif 1795 1806 1796 1807 #if IS_ENABLED(CONFIG_OF) 1797 - /* Register platform driver */ 1798 - platform_driver_register(&crypto_safexcel); 1808 + /* Register platform driver */ 1809 + ofreg_rc = platform_driver_register(&crypto_safexcel); 1810 + #if IS_ENABLED(CONFIG_PCI) 1811 + /* Return success if either PCI or OF registered OK */ 1812 + return pcireg_rc ? ofreg_rc : 0; 1813 + #else 1814 + return ofreg_rc; 1815 + #endif 1816 + #else 1817 + #if IS_ENABLED(CONFIG_PCI) 1818 + return pcireg_rc; 1819 + #else 1820 + return -EINVAL; 1821 + #endif 1799 1822 #endif 1800 - 1801 - #if IS_ENABLED(CONFIG_PCI) 1802 - /* Register PCI driver */ 1803 - rc = pci_register_driver(&safexcel_pci_driver); 1804 - #endif 1805 - 1806 - return 0; 1807 1823 } 1808 1824 1809 1825 static void __exit safexcel_exit(void) 1810 1826 { 1811 1827 #if IS_ENABLED(CONFIG_OF) 1812 - /* Unregister platform driver */ 1828 + /* Unregister platform driver */ 1829 + if (!ofreg_rc) 1813 1830 platform_driver_unregister(&crypto_safexcel); 1814 1831 #endif 1815 1832 1816 1833 #if IS_ENABLED(CONFIG_PCI) 1817 - /* Unregister PCI driver if successfully registered before */ 1834 + /* Unregister PCI driver if successfully registered before */ 1835 + if (!pcireg_rc) 1818 1836 pci_unregister_driver(&safexcel_pci_driver); 1819 1837 #endif 1820 1838 }