lkml.org 
[lkml]   [2008]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 33/60] cio: move irritating comment.
    From: Sebastian Ott <sebott@linux.vnet.ibm.com>

    Due to former patches a comment and device id initialization were
    split from the addressed function call in io_subchannel_probe.

    Move it back to where it belongs.

    Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    ---

    drivers/s390/cio/device.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    Index: quilt-2.6/drivers/s390/cio/device.c
    ===================================================================
    --- quilt-2.6.orig/drivers/s390/cio/device.c
    +++ quilt-2.6/drivers/s390/cio/device.c
    @@ -1179,12 +1179,6 @@ static int io_subchannel_probe(struct su
    return 0;
    }
    io_subchannel_init_fields(sch);
    - /*
    - * First check if a fitting device may be found amongst the
    - * disconnected devices or in the orphanage.
    - */
    - dev_id.devno = sch->schib.pmcw.dev;
    - dev_id.ssid = sch->schid.ssid;
    rc = sysfs_create_group(&sch->dev.kobj,
    &io_subchannel_attr_group);
    if (rc)
    @@ -1196,6 +1190,12 @@ static int io_subchannel_probe(struct su
    rc = -ENOMEM;
    goto out_err;
    }
    + /*
    + * First check if a fitting device may be found amongst the
    + * disconnected devices or in the orphanage.
    + */
    + dev_id.devno = sch->schib.pmcw.dev;
    + dev_id.ssid = sch->schid.ssid;
    cdev = get_disc_ccwdev_by_dev_id(&dev_id, NULL);
    if (!cdev)
    cdev = get_orphaned_ccwdev_by_dev_id(to_css(sch->dev.parent),
    --
    blue skies,
    Martin.

    "Reality continues to ruin my life." - Calvin.



    \
     
     \ /
      Last update: 2008-11-27 11:47    [W:0.024 / U:90.140 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site