Re: linux-next: build failure after merge of the ide tree

Stephen Rothwell
2020-04-05T03:10:08Z

[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]

Hi all,

On Sun, 5 Apr 2020 11:13:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the ide tree, yesterday's linux-next build (mips
^^^^^^^^^^^
Actually "today's".

> bigsur_defconfig) failed like this:
>
> drivers/ide/ide-scan-pci.c:104:13: error: incompatible type for argument 1 of ‘list_del’
>
> Caused by commit
>
> 6a0033457f23 ("drivers/ide: convert to list_for_each_entry_safe()")
>
> list_del() takes a "struct list_head *", struct pci_driver::node is a
> "struct list_head" i.e. there is a missing '&'.
>
> Reported by the kernelci.org bot.

I also had it fail my powerpc allyesconfig build, so I added this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 5 Apr 2020 13:00:22 +1000
Subject: [PATCH] drivers/ide: fix for conversion

Fixes: 6a0033457f23 ("drivers/ide: convert to list_for_each_entry_safe()")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/ide/ide-scan-pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/ide/ide-scan-pci.c b/drivers/ide/ide-scan-pci.c
index 383f0d813001..b0411a1827a3 100644
--- a/drivers/ide/ide-scan-pci.c
+++ b/drivers/ide/ide-scan-pci.c
@@ -101,7 +101,7 @@ static int __init ide_scan_pcibus(void)
*/

list_for_each_entry_safe(d, tmp, &ide_pci_drivers, node) {
- list_del(d->node);
+ list_del(&d->node);
if (__pci_register_driver(d, d->driver.owner,
d->driver.mod_name))
printk(KERN_ERR "%s: failed to register %s driver\n",
--
2.25.0

--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]