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

Commit 5219d653 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Tejun Heo
Browse files

ata: Use IS_ENABLED() instead of checking for built-in or module 



The IS_ENABLED() macro checks if a Kconfig symbol has been enabled either
built-in or as a module, use that macro instead of open coding the same.

Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent d2abf98e

drivers/ata/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ static struct pci_driver ahci_pci_driver = { 
	},

};



#if defined(CONFIG_PATA_MARVELL) || defined(CONFIG_PATA_MARVELL_MODULE)

#if IS_ENABLED(CONFIG_PATA_MARVELL)

static int marvell_enable;

#else

static int marvell_enable = 1;

drivers/ata/pata_marvell.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i 
	if (pdev->device == 0x6101)

		ppi[1] = &ata_dummy_port_info;



#if defined(CONFIG_SATA_AHCI) || defined(CONFIG_SATA_AHCI_MODULE)

#if IS_ENABLED(CONFIG_SATA_AHCI)

	if (!marvell_pata_active(pdev)) {

		printk(KERN_INFO DRV_NAME ": PATA port not active, deferring to AHCI driver.\n");

		return -ENODEV;