From: Sergey Shtylyov <s.shtylyov@omp.ru>
To: <linux-ide@vger.kernel.org>, Damien Le Moal <dlemoal@kernel.org>,
Niklas Cassel <cassel@kernel.org>
Cc: <lvc-project@linuxtesting.org>
Subject: [PATCH] ata: ata_generic: use IS_ENABLED() macro
Date: Mon, 9 Sep 2024 23:51:25 +0300 [thread overview]
Message-ID: <d9c0acab-909e-da06-decf-be5de59d23bf@omp.ru> (raw)
Replace now gone out of fashion defined(CONFIG_PATA_TOSHIBA[_MODULE])
with the new-fangled IS_ENABLED() macro in the ata_generic[] definition.
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
---
This patch is against the for-next branch of the LibATA Group's repo.
drivers/ata/ata_generic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux/drivers/ata/ata_generic.c
===================================================================
--- linux.orig/drivers/ata/ata_generic.c
+++ linux/drivers/ata/ata_generic.c
@@ -220,7 +220,7 @@ static struct pci_device_id ata_generic[
{ PCI_DEVICE(PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C558), },
{ PCI_DEVICE(PCI_VENDOR_ID_CENATEK,PCI_DEVICE_ID_CENATEK_IDE),
.driver_data = ATA_GEN_FORCE_DMA },
-#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), },
next reply other threads:[~2024-09-09 20:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-09 20:51 Sergey Shtylyov [this message]
2024-09-10 4:50 ` [PATCH] ata: ata_generic: use IS_ENABLED() macro Damien Le Moal
2024-09-10 8:52 ` Sergey Shtylyov
2024-09-10 13:09 ` Damien Le Moal
2024-09-10 14:32 ` Sergey Shtylyov
2024-09-10 14:36 ` Sergey Shtylyov
2024-09-10 22:22 ` Damien Le Moal
2024-09-11 17:14 ` Sergey Shtylyov
2024-09-13 6:57 ` Niklas Cassel
2024-09-13 19:36 ` Sergey Shtylyov
2024-09-14 17:53 ` Sergey Shtylyov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d9c0acab-909e-da06-decf-be5de59d23bf@omp.ru \
--to=s.shtylyov@omp.ru \
--cc=cassel@kernel.org \
--cc=dlemoal@kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=lvc-project@linuxtesting.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox