lkml.org 
[lkml]   [2008]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/3] ide: remove "paranoia" checks for hwgroup->busy
    Date
    Remove "paranoia" checks for hwgroup->busy from ide_timer_expiry()
    and ide_intr(). This is a preparation for future changes.

    Cc: Michael Schmitz <schmitz@biophys.uni-duesseldorf.de>
    Cc: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Elias Oltmanns <eo@nebensachen.de>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    against current pata-2.6 tree (should also apply fine to linux-next)

    drivers/ide/ide-io.c | 9 +--------
    1 file changed, 1 insertion(+), 8 deletions(-)

    Index: b/drivers/ide/ide-io.c
    ===================================================================
    --- a/drivers/ide/ide-io.c
    +++ b/drivers/ide/ide-io.c
    @@ -1018,10 +1018,7 @@ void ide_timer_expiry (unsigned long dat
    } else {
    ide_hwif_t *hwif;
    ide_startstop_t startstop = ide_stopped;
    - if (!hwgroup->busy) {
    - hwgroup->busy = 1; /* paranoia */
    - printk(KERN_ERR "%s: ide_timer_expiry: hwgroup->busy was 0 ??\n", drive->name);
    - }
    +
    if ((expiry = hwgroup->expiry) != NULL) {
    /* continue */
    if ((wait = expiry(drive)) > 0) {
    @@ -1234,10 +1231,6 @@ irqreturn_t ide_intr (int irq, void *dev
    */
    goto out;

    - if (!hwgroup->busy) {
    - hwgroup->busy = 1; /* paranoia */
    - printk(KERN_ERR "%s: ide_intr: hwgroup->busy was 0 ??\n", drive->name);
    - }
    hwgroup->handler = NULL;
    hwgroup->req_gen++;
    del_timer(&hwgroup->timer);

    \
     
     \ /
      Last update: 2008-11-18 21:25    [W:0.022 / U:58.704 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site