lkml.org 
[lkml]   [2010]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/24] drivers/block/floppy.c: Remove LAST_OUT macro
    Date
    Macros with hidden returns are not nice.
    Convert the 2 uses to use direct code.

    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    drivers/block/floppy.c | 12 ++++++++----
    1 files changed, 8 insertions(+), 4 deletions(-)

    diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
    index 461c99a..9f7a658 100644
    --- a/drivers/block/floppy.c
    +++ b/drivers/block/floppy.c
    @@ -1198,8 +1198,6 @@ static int output_byte(char byte)
    return -1;
    }

    -#define LAST_OUT(x) if (output_byte(x)<0){ reset_fdc();return;}
    -
    /* gets the response from the fdc */
    static int result(void)
    {
    @@ -1679,7 +1677,10 @@ static void seek_floppy(void)
    do_floppy = seek_interrupt;
    output_byte(FD_SEEK);
    output_byte(UNIT(current_drive));
    - LAST_OUT(track);
    + if (output_byte(track) < 0) {
    + reset_fdc();
    + return;
    + }
    debugt("seek command:");
    }

    @@ -1809,7 +1810,10 @@ static void recalibrate_floppy(void)
    debugt("recalibrate floppy:");
    do_floppy = recal_interrupt;
    output_byte(FD_RECALIBRATE);
    - LAST_OUT(UNIT(current_drive));
    + if (output_byte(UNIT(current_drive)) < 0) {
    + reset_fdc();
    + return;
    + }
    }

    /*
    --
    1.6.6.rc0.57.gad7a


    \
     
     \ /
      Last update: 2010-01-22 06:01    [W:4.157 / U:1.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site