LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Nigel Cunningham <nigel@nigel.suspend2.net>
To: Olof Johansson <olof@lixom.net>
Cc: Jeff Garzik <jeff@garzik.org>,
	linux-ide@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	Alan Cox <alan@lxorguk.ukuu.org.uk>
Subject: Re: [PATCH] libata: CONFIG_PM=n compile fix
Date: Mon, 04 Jun 2007 11:38:15 +1000	[thread overview]
Message-ID: <1180921096.7782.105.camel@nigel.suspend2.net> (raw)
In-Reply-To: <20070603225840.GA25465@lixom.net>

[-- Attachment #1: Type: text/plain, Size: 1494 bytes --]

Hi.

On Sun, 2007-06-03 at 17:58 -0500, Olof Johansson wrote:
> CONFIG_PM=n compile fix.
> 
> Signed-off-by: Olof Johansson <olof@lixom.net>
> 
> ---
> 
> Hi,
> 
> On Sat, May 26, 2007 at 11:09:54PM -0400, Jeff Garzik wrote:
> 
> > This is checked into the 'mv-ahci-pata' branch of
> > git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
> 
> Didn't build for me without this change, since I had CONFIG_PM=n.
> 
> 
> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
> index 21df81e..07d5a95 100644
> --- a/drivers/ata/ahci.c
> +++ b/drivers/ata/ahci.c
> @@ -1818,6 +1836,14 @@ static void ahci_post_internal_cmd(struct ata_queued_cmd *qc)
>  	}
>  }
>  
> +static int ahci_port_resume(struct ata_port *ap)
> +{
> +	ahci_power_up(ap);
> +	ahci_start_port(ap);
> +
> +	return 0;
> +}
> +
>  #ifdef CONFIG_PM
>  static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg)
>  {
> @@ -1835,14 +1861,6 @@ static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg)
>  	return rc;
>  }
>  
> -static int ahci_port_resume(struct ata_port *ap)
> -{
> -	ahci_power_up(ap);
> -	ahci_start_port(ap);
> -
> -	return 0;
> -}
> -
>  static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
>  {
>  	struct ata_host *host = dev_get_drvdata(&pdev->dev);

At first glance, this looked wrong to me, but I see Jeff is using
ahci_port_resume from ahci_port_start, so it is right.

Regards,

Nigel

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

  reply	other threads:[~2007-06-04  1:38 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-05-27  3:09 [PATCH] Add Marvell 6141 PATA support to AHCI driver Jeff Garzik
2007-05-27 12:18 ` Alan Cox
2007-06-03 22:58 ` [PATCH] libata: CONFIG_PM=n compile fix Olof Johansson
2007-06-04  1:38   ` Nigel Cunningham [this message]
2007-07-03 14:16   ` Jeff Garzik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1180921096.7782.105.camel@nigel.suspend2.net \
    --to=nigel@nigel.suspend2.net \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=jeff@garzik.org \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=olof@lixom.net \
    --subject='Re: [PATCH] libata: CONFIG_PM=n compile fix' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).