From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Subject: Re: [PATCH v4] ahci: move ahci_sb600_softreset to libahci.c and rename it Date: Mon, 20 Jun 2011 12:15:23 +0400 Message-ID: <4DFF019B.8030605@ru.mvista.com> References: <20110617120704.GH2611@htj.dyndns.org> <1308557202-1895-1-git-send-email-yuanlmm@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wy0-f174.google.com ([74.125.82.174]:54475 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751439Ab1FTIQ2 (ORCPT ); Mon, 20 Jun 2011 04:16:28 -0400 In-Reply-To: <1308557202-1895-1-git-send-email-yuanlmm@gmail.com> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Yuan-Hsin Chen Cc: jgarzik@pobox.com, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, tj@kernel.org, sshtylyov@mvista.com, Yuan-Hsin Chen 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