Hi.
On Sun, 2007-06-03 at 17:58 -0500, Olof Johansson wrote:
> CONFIG_PM=n compile fix.
>
> Signed-off-by: Olof Johansson <olof@xxxxxxxxx>
>
> ---
>
> 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:
signature.asc
Description: This is a digitally signed message part
