Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752571Ab1FTIrQ (ORCPT ); Mon, 20 Jun 2011 04:47:16 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:53160 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751583Ab1FTIrK convert rfc822-to-8bit (ORCPT ); Mon, 20 Jun 2011 04:47:10 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=BI1mfgSLpGhbFE9iAAbEwF/fVeCyvJweLeB8rZjAjeAoiBFFjeUWq08wdbLE+Vjs4L pD5AlnC39JKXpc8U2bHmOdmkXpuHMA5cqRDNtjE+EksdrQTq/GbLTEoY5HL3A2l8mvtC 6MpCIOiMH9C78Tkm/zyfufZ8wzX+UFr2cQuVM= MIME-Version: 1.0 In-Reply-To: <4DFF019B.8030605@ru.mvista.com> References: <20110617120704.GH2611@htj.dyndns.org> <1308557202-1895-1-git-send-email-yuanlmm@gmail.com> <4DFF019B.8030605@ru.mvista.com> Date: Mon, 20 Jun 2011 16:47:09 +0800 Message-ID: Subject: Re: [PATCH v4] ahci: move ahci_sb600_softreset to libahci.c and rename it From: Yuan-Hsin Chen To: Sergei Shtylyov Cc: jgarzik@pobox.com, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, tj@kernel.org, Yuan-Hsin Chen Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2442 Lines: 65 Hello. I'm really sorry for ignoring your previous e-mail. I'll fix it in the next patch. Thanks for reviewing my patch. Yuan-Hsin On Mon, Jun 20, 2011 at 4:15 PM, Sergei Shtylyov wrote: > Hello. > > On 20-06-2011 12:06, Yuan-Hsin Chen wrote: > >> From: Yuan-Hsin Chen > >> ahci_sb600_softreset was in ahci.c. This function is used >> to fix soft reset failure and renames as ahci_pmp_retry_srst_softreset >> in libahci.c. > >> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c >> index 71afe03..2de36b6 100644 >> --- a/drivers/ata/ahci.c >> +++ b/drivers/ata/ahci.c >> @@ -79,8 +79,6 @@ enum board_ids { >> ?}; >> >> ?static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id >> *ent); >> -static int ahci_sb600_softreset(struct ata_link *link, unsigned int >> *class, >> - ? ? ? ? ? ? ? ? ? ? ? ? unsigned long deadline); >> ?static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int >> *class, >> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? unsigned long deadline); >> ?static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int >> *class, >> @@ -106,8 +104,7 @@ static struct ata_port_operations ahci_p5wdh_ops = { >> >> ?static struct ata_port_operations ahci_sb600_ops = { >> ? ? ? ?.inherits ? ? ? ? ? ? ? =&ahci_ops, >> - ? ? ? .softreset ? ? ? ? ? ? ?= ahci_sb600_softreset, >> - ? ? ? .pmp_softreset ? ? ? ? ?= ahci_sb600_softreset, >> + ? ? ? .softreset ? ? ? ? ? ? ?= ahci_pmp_retry_srst_softreset, > > ? I have to ask you again: have you tried to compile this? > >> diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c >> index d38c40f..0fd5a30 100644 >> --- a/drivers/ata/libahci.c >> +++ b/drivers/ata/libahci.c >> @@ -82,6 +82,8 @@ static void ahci_pmp_attach(struct ata_port *ap); >> ?static void ahci_pmp_detach(struct ata_port *ap); >> ?static int ahci_softreset(struct ata_link *link, unsigned int *class, >> ? ? ? ? ? ? ? ? ? ? ? ? ?unsigned long deadline); >> +static int ahci_pmp_retry_srst_softreset(struct ata_link *link, unsigned >> int *class, >> + ? ? ? ? ? ? ? ? ? ? ? ? unsigned long deadline); > > ? How come this is static if you reference it outside this module? > > WBR, Sergei > -- 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/