Replace the explicit defined(CONFIG_PATA_TOSHIBA[_MODULE]) checks with
the new-fangled IS_ENABLED() check in the ata_generic[] definition...
Signed-off-by: Sergey Shtylyov <s.shtylyov@xxxxxx>
---
Changes in version 2:
- refreshed atop of the newly added patch #1;
- rephrased the patch description.
drivers/ata/ata_generic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index d6c210510c36..d5b2fa2ba6ad 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -225,7 +225,7 @@ static struct pci_device_id ata_generic[] = {
* these chips were handled by the generic driver; keep the
* old behavior if the dedicated driver is not enabled...
*/
-#if !defined(CONFIG_PATA_TOSHIBA) && !defined(CONFIG_PATA_TOSHIBA_MODULE)
+#if !IS_ENABLED(CONFIG_PATA_TOSHIBA)
{ PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), },
{ PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2), },
{ PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_3), },
--
2.47.0
