From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758795AbYBMMUl (ORCPT ); Wed, 13 Feb 2008 07:20:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756341AbYBMMUb (ORCPT ); Wed, 13 Feb 2008 07:20:31 -0500 Received: from ik-out-1112.google.com ([66.249.90.178]:5785 "EHLO ik-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754802AbYBMMUa (ORCPT ); Wed, 13 Feb 2008 07:20:30 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:message-id; b=eyk7krKrXw7jWbxQqswbhWVQKvWqhXw48QjrGVwGQieKRP6Pwnx5XqUu+w9pL82uwCK72pRxuZpj8kaSZerYMCqrDVfevcdNWnvanbZ4v595qBAmNJb3ocAtP+FjuycEhbrrzhZPUOMIXFTQXs7SGyGTzjM4cUwmKttnYDK0HdU= From: Bartlomiej Zolnierkiewicz To: michael@ellerman.id.au Subject: Re: [PATCH 09/18] ide: rework PowerMac media-bay support Date: Wed, 13 Feb 2008 13:26:02 +0100 User-Agent: KMail/1.9.6 (enterprise 0.20071204.744707) Cc: linux-ide@vger.kernel.org, linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org References: <20080208004421.17746.32557.sendpatchset@localhost.localdomain> <20080208004523.17746.24578.sendpatchset@localhost.localdomain> <1202887776.7971.19.camel@concordia.ozlabs.ibm.com> In-Reply-To: <1202887776.7971.19.camel@concordia.ozlabs.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200802131326.02783.bzolnier@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Wednesday 13 February 2008, Michael Ellerman wrote: > On Fri, 2008-02-08 at 01:45 +0100, Bartlomiej Zolnierkiewicz wrote: > > Rework PowerMac media-bay support in such way that instead of > > un/registering the IDE interface we un/register IDE devices: > > > > * Add ide_port_scan() helper for probing+registerering devices on a port. > > > > * Rename ide_port_unregister_devices() to __ide_port_unregister_devices(). > > > > * Add ide_port_unregister_devices() helper for unregistering devices on a port. > > > > * Add 'ide_hwif_t *cd_port' to 'struct media_bay_info', pass 'hwif' instead > > of hwif->index to media_bay_set_ide_infos() and use it to setup 'cd_port'. > > > > * Use ide_port_unregister_devices() instead of ide_unregister() > > and ide_port_scan() instead of ide_register_hw() in media_bay_step(). > > > > * Unexport ide_register_hw() and make it static. > > > > Signed-off-by: Bartlomiej Zolnierkiewicz > > --- > > drivers/ide/ide-probe.c | 18 ++++++++++++++++++ > > drivers/ide/ide.c | 22 ++++++++++++++++------ > > drivers/ide/ppc/pmac.c | 3 ++- > > drivers/macintosh/mediabay.c | 17 +++++++---------- > > include/asm-powerpc/mediabay.h | 4 +++- > > include/linux/ide.h | 6 ++---- > > 6 files changed, 48 insertions(+), 22 deletions(-) > > > Index: b/include/asm-powerpc/mediabay.h > > =================================================================== > > --- a/include/asm-powerpc/mediabay.h > > +++ b/include/asm-powerpc/mediabay.h > > @@ -22,10 +22,12 @@ int check_media_bay(struct device_node * > > /* Number of bays in the machine or 0 */ > > extern int media_bay_count; > > > > +#ifdef CONFIG_BLK_DEV_IDE_PMAC Does adding: #include after ifdef help? > > int check_media_bay_by_base(unsigned long base, int what); > > /* called by IDE PMAC host driver to register IDE controller for media bay */ > > int media_bay_set_ide_infos(struct device_node *which_bay, unsigned long base, > > - int irq, int index); > > + int irq, ide_hwif_t *hwif); > > +#endif > > > > #endif /* __KERNEL__ */ > > #endif /* _PPC_MEDIABAY_H */ > > This hunk breaks pmac32_defconfig for me. > > include2/asm/mediabay.h:29: error: syntax error before 'ide_hwif_t' > make[3]: *** [arch/powerpc/platforms/powermac/setup.o] Error 1 > make[2]: *** [arch/powerpc/platforms/powermac] Error 2 > make[1]: *** [arch/powerpc/platforms] Error 2 > make: *** [sub-make] Error 2 > > cheers