lkml.org 
[lkml]   [2008]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH 09/18] ide: rework PowerMac media-bay support
    From
    Date
    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 <bzolnier@gmail.com>
    > ---
    > 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
    > 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

    --
    Michael Ellerman
    OzLabs, IBM Australia Development Lab

    wwweb: http://michael.ellerman.id.au
    phone: +61 2 6212 1183 (tie line 70 21183)

    We do not inherit the earth from our ancestors,
    we borrow it from our children. - S.M.A.R.T Person
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2008-02-13 08:33    [W:0.023 / U:62.864 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site