From: Olof Johansson <olof@lixom.net>
To: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: linux-ide@vger.kernel.org, akpm@linux-foundation.org,
linuxppc-dev@ozlabs.org
Subject: [PATCH] Fix build break caused by "ide: remove ideprobe_init()"
Date: Fri, 14 Dec 2007 03:09:15 -0600 [thread overview]
Message-ID: <20071214090915.GA28681@lixom.net> (raw)
In-Reply-To: <200711182325.09262.bzolnier@gmail.com>
Fix build break of powerpc holly_defconfig:
In file included from arch/powerpc/platforms/embedded6xx/holly.c:24:
include/linux/ide.h:1206: error: 'CONFIG_IDE_MAX_HWIFS' undeclared here (not in a function)
There's no need to have a sized array in the prototype, might as well
turn it into a pointer.
It could probably be argued that large parts of the include file can be
covered under #ifdef CONFIG_IDE, but that's a larger undertaking.
Signed-off-by: Olof Johansson <olof@lixom.net>
---
On Sun, Nov 18, 2007 at 11:25:09PM +0100, Bartlomiej Zolnierkiewicz wrote:
>
> * Rename ide_device_add() to ide_device_add_all() and make it accept
> 'u8 idx[MAX_HWIFS]' instead of 'u8 idx[4]' as an argument.
>
> * Add ide_device_add() wrapper for ide_device_add_all().
>
> * Convert ide_generic_init() to use ide_device_add_all().
>
> * Remove no longer needed ideprobe_init().
>
> There should be no functionality changes caused by this patch.
This patch broke builds of powerpc holly_defconfig in -mm. It has
CONFIG_EMBEDDED=y, CONFIG_IDE=n but includes linux/ide.h:
Index: mm/drivers/ide/ide-probe.c
===================================================================
--- mm.orig/drivers/ide/ide-probe.c
+++ mm/drivers/ide/ide-probe.c
@@ -1335,7 +1335,7 @@ static void hwif_register_devices(ide_hw
}
}
-int ide_device_add_all(u8 idx[MAX_HWIFS])
+int ide_device_add_all(u8 *idx)
{
ide_hwif_t *hwif;
int i, rc = 0;
Index: mm/include/linux/ide.h
===================================================================
--- mm.orig/include/linux/ide.h
+++ mm/include/linux/ide.h
@@ -1203,7 +1203,7 @@ void ide_unregister_region(struct gendis
void ide_undecoded_slave(ide_drive_t *);
-int ide_device_add_all(u8 idx[MAX_HWIFS]);
+int ide_device_add_all(u8 *idx);
int ide_device_add(u8 idx[4]);
static inline void *ide_get_hwifdata (ide_hwif_t * hwif)
next parent reply other threads:[~2007-12-14 9:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200711182325.09262.bzolnier@gmail.com>
2007-12-14 9:09 ` Olof Johansson [this message]
2007-12-17 20:53 ` [PATCH] Fix build break caused by "ide: remove ideprobe_init()" Bartlomiej Zolnierkiewicz
2007-12-17 22:56 ` Olof Johansson
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=20071214090915.GA28681@lixom.net \
--to=olof@lixom.net \
--cc=akpm@linux-foundation.org \
--cc=bzolnier@gmail.com \
--cc=linux-ide@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.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;
as well as URLs for NNTP newsgroup(s).