From patchwork Tue Aug 9 19:25:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 109269 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 64DA8B70B2 for ; Wed, 10 Aug 2011 05:27:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750773Ab1HIT1u (ORCPT ); Tue, 9 Aug 2011 15:27:50 -0400 Received: from mail.dev.rtsoft.ru ([213.79.90.226]:45642 "HELO mail.dev.rtsoft.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750722Ab1HIT1t (ORCPT ); Tue, 9 Aug 2011 15:27:49 -0400 Received: (qmail 25680 invoked from network); 9 Aug 2011 19:27:51 -0000 Received: from unknown (HELO wasted.dev.rtsoft.ru) (192.168.1.70) by 0 with SMTP; 9 Aug 2011 19:27:51 -0000 To: linux-ide@vger.kernel.org, jgarzik@pobox.com Subject: [PATCH] libata-eh: ata_eh_followup_srst_needed() does not need 'classes' parameter Content-Disposition: inline From: Sergei Shtylyov Organization: MontaVista Software Inc. Date: Tue, 9 Aug 2011 23:25:50 +0400 MIME-Version: 1.0 Message-Id: <201108092325.50800.sshtylyov@ru.mvista.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org ... since it does not use it. Signed-off-by: Sergei Shtylyov --- The patch is against the recent Linus' tree. drivers/ata/libata-eh.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6/drivers/ata/libata-eh.c =================================================================== --- linux-2.6.orig/drivers/ata/libata-eh.c +++ linux-2.6/drivers/ata/libata-eh.c @@ -2532,8 +2532,7 @@ static int ata_do_reset(struct ata_link return reset(link, classes, deadline); } -static int ata_eh_followup_srst_needed(struct ata_link *link, - int rc, const unsigned int *classes) +static int ata_eh_followup_srst_needed(struct ata_link *link, int rc) { if ((link->flags & ATA_LFLAG_NO_SRST) || ata_link_offline(link)) return 0; @@ -2726,7 +2725,7 @@ int ata_eh_reset(struct ata_link *link, /* perform follow-up SRST if necessary */ if (reset == hardreset && - ata_eh_followup_srst_needed(link, rc, classes)) { + ata_eh_followup_srst_needed(link, rc)) { reset = softreset; if (!reset) {