lkml.org 
[lkml]   [2008]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/4] ide-pmac: add ->init_dev method (take 2)
    Date

    v2:
    * Build fix from Stephen Rothwell.

    There should be no functional changes caused by this patch.

    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    replacement patch

    drivers/ide/ppc/pmac.c | 27 ++++++++++++++++++---------
    1 file changed, 18 insertions(+), 9 deletions(-)

    Index: b/drivers/ide/ppc/pmac.c
    ===================================================================
    --- a/drivers/ide/ppc/pmac.c
    +++ b/drivers/ide/ppc/pmac.c
    @@ -941,7 +941,23 @@ static u8 pmac_ide_cable_detect(ide_hwif
    return ATA_CBL_PATA40;
    }

    +static void pmac_ide_init_dev(ide_drive_t *drive)
    +{
    + ide_hwif_t *hwif = drive->hwif;
    + pmac_ide_hwif_t *pmif =
    + (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
    +
    + if (pmif->mediabay) {
    +#ifdef CONFIG_PMAC_MEDIABAY
    + if (check_media_bay(np->parent, MB_CD) == -ENODEV)
    + return;
    +#endif
    + drive->noprobe = 1;
    + }
    +}
    +
    static const struct ide_port_ops pmac_ide_ata6_port_ops = {
    + .init_dev = pmac_ide_init_dev,
    .set_pio_mode = pmac_ide_set_pio_mode,
    .set_dma_mode = pmac_ide_set_dma_mode,
    .selectproc = pmac_ide_kauai_selectproc,
    @@ -949,6 +965,7 @@ static const struct ide_port_ops pmac_id
    };

    static const struct ide_port_ops pmac_ide_ata4_port_ops = {
    + .init_dev = pmac_ide_init_dev,
    .set_pio_mode = pmac_ide_set_pio_mode,
    .set_dma_mode = pmac_ide_set_dma_mode,
    .selectproc = pmac_ide_selectproc,
    @@ -956,6 +973,7 @@ static const struct ide_port_ops pmac_id
    };

    static const struct ide_port_ops pmac_ide_port_ops = {
    + .init_dev = pmac_ide_init_dev,
    .set_pio_mode = pmac_ide_set_pio_mode,
    .set_dma_mode = pmac_ide_set_dma_mode,
    .selectproc = pmac_ide_selectproc,
    @@ -1065,15 +1083,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *p
    hwif->index, model_name[pmif->kind], pmif->aapl_bus_id,
    pmif->mediabay ? " (mediabay)" : "", hwif->irq);

    - if (pmif->mediabay) {
    -#ifdef CONFIG_PMAC_MEDIABAY
    - if (check_media_bay(np->parent, MB_CD) == -ENODEV)
    - break;
    -#endif
    - hwif->drives[0].noprobe = 1;
    - hwif->drives[1].noprobe = 1;
    - }
    -
    idx[0] = hwif->index;

    ide_device_add(idx, &d);

    \
     
     \ /
      Last update: 2008-06-16 21:27    [W:0.023 / U:31.676 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site