Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S264373AbUFSQVE (ORCPT ); Sat, 19 Jun 2004 12:21:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S264251AbUFSQTq (ORCPT ); Sat, 19 Jun 2004 12:19:46 -0400 Received: from mion.elka.pw.edu.pl ([194.29.160.35]:7076 "EHLO mion.elka.pw.edu.pl") by vger.kernel.org with ESMTP id S264260AbUFSQPz (ORCPT ); Sat, 19 Jun 2004 12:15:55 -0400 From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Subject: [PATCH] ide-taskfile.c fixups/cleanups [1/11] Date: Sat, 19 Jun 2004 18:07:22 +0200 User-Agent: KMail/1.5.3 Cc: linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200406191807.22987.bzolnier@elka.pw.edu.pl> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2857 Lines: 77 [PATCH] ide: remove redundant hwgroup->handler checks from ide-taskfile.c Remove checks for hwgroup->handler == NULL from task_[in,mulin,out]_intr() (CONFIG_IDE_TASKFILE_IO=n versions). These functions can be called only from ide_intr() or ide_timer_expiry() and both set hwgroup->handler to NULL first. Signed-off-by: Bartlomiej Zolnierkiewicz linux-2.6.7-bzolnier/drivers/ide/ide-taskfile.c | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff -puN drivers/ide/ide-taskfile.c~ide_handler_checks drivers/ide/ide-taskfile.c --- linux-2.6.7/drivers/ide/ide-taskfile.c~ide_handler_checks 2004-06-19 02:40:54.620473544 +0200 +++ linux-2.6.7-bzolnier/drivers/ide/ide-taskfile.c 2004-06-19 02:40:54.625472784 +0200 @@ -317,8 +317,7 @@ ide_startstop_t task_in_intr (ide_drive_ } if (!(stat & BUSY_STAT)) { DTF("task_in_intr to Soon wait for next interrupt\n"); - if (HWGROUP(drive)->handler == NULL) - ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL); + ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL); return ide_started; } } @@ -332,12 +331,7 @@ ide_startstop_t task_in_intr (ide_drive_ if (--rq->current_nr_sectors <= 0) if (!DRIVER(drive)->end_request(drive, 1, 0)) return ide_stopped; - /* - * ERM, it is techincally legal to leave/exit here but it makes - * a mess of the code ... - */ - if (HWGROUP(drive)->handler == NULL) - ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL); + ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL); return ide_started; } @@ -360,8 +354,7 @@ ide_startstop_t task_mulin_intr (ide_dri return DRIVER(drive)->error(drive, "task_mulin_intr", stat); } /* no data yet, so wait for another interrupt */ - if (HWGROUP(drive)->handler == NULL) - ide_set_handler(drive, &task_mulin_intr, WAIT_WORSTCASE, NULL); + ide_set_handler(drive, &task_mulin_intr, WAIT_WORSTCASE, NULL); return ide_started; } @@ -384,8 +377,7 @@ ide_startstop_t task_mulin_intr (ide_dri return ide_stopped; } } while (msect); - if (HWGROUP(drive)->handler == NULL) - ide_set_handler(drive, &task_mulin_intr, WAIT_WORSTCASE, NULL); + ide_set_handler(drive, &task_mulin_intr, WAIT_WORSTCASE, NULL); return ide_started; } @@ -445,8 +437,7 @@ ide_startstop_t task_out_intr (ide_drive rq->errors = 0; rq->current_nr_sectors--; } - if (HWGROUP(drive)->handler == NULL) - ide_set_handler(drive, &task_out_intr, WAIT_WORSTCASE, NULL); + ide_set_handler(drive, &task_out_intr, WAIT_WORSTCASE, NULL); return ide_started; } _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/