lkml.org 
[lkml]   [2008]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 8/9] ide_4drives: use struct ide_port_info
    Convert the driver to use struct ide_port_info - as a nice side-effect
    this fixes hwif->channel initialization.

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/ide/legacy/ide-4drives.c | 27 ++++++++++++++++++---------
    1 file changed, 18 insertions(+), 9 deletions(-)

    Index: b/drivers/ide/legacy/ide-4drives.c
    ===================================================================
    --- a/drivers/ide/legacy/ide-4drives.c
    +++ b/drivers/ide/legacy/ide-4drives.c
    @@ -11,6 +11,23 @@ static int probe_4drives;
    module_param_named(probe, probe_4drives, bool, 0);
    MODULE_PARM_DESC(probe, "probe for generic IDE chipset with 4 drives/port");

    +static void ide_4drives_port_init_devs(ide_hwif_t *hwif)
    +{
    + if (hwif->channel) {
    + hwif->drives[0].select.all ^= 0x20;
    + hwif->drives[1].select.all ^= 0x20;
    + }
    +}
    +
    +static const struct ide_port_ops ide_4drives_port_ops = {
    + .port_init_devs = ide_4drives_port_init_devs,
    +};
    +
    +static const struct ide_port_info ide_4drives_port_info = {
    + .port_ops = &ide_4drives_port_ops,
    + .host_flags = IDE_HFLAG_SERIALIZE | IDE_HFLAG_NO_DMA,
    +};
    +
    static int __init ide_4drives_init(void)
    {
    ide_hwif_t *hwif, *mate;
    @@ -49,18 +66,10 @@ static int __init ide_4drives_init(void)
    mate = ide_find_port();
    if (mate) {
    ide_init_port_hw(mate, &hw);
    - mate->drives[0].select.all ^= 0x20;
    - mate->drives[1].select.all ^= 0x20;
    idx[1] = mate->index;
    -
    - if (hwif) {
    - hwif->mate = mate;
    - mate->mate = hwif;
    - hwif->serialized = mate->serialized = 1;
    - }
    }

    - ide_device_add(idx, NULL);
    + ide_device_add(idx, &ide_4drives_port_info);

    return 0;
    }

    \
     
     \ /
      Last update: 2008-06-02 22:27    [W:4.153 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site