From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753099AbXFCWwt (ORCPT ); Sun, 3 Jun 2007 18:52:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751719AbXFCWwk (ORCPT ); Sun, 3 Jun 2007 18:52:40 -0400 Received: from lixom.net ([66.141.50.11]:53229 "EHLO mail.lixom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751277AbXFCWwj (ORCPT ); Sun, 3 Jun 2007 18:52:39 -0400 Date: Sun, 3 Jun 2007 17:58:40 -0500 To: Jeff Garzik Cc: linux-ide@vger.kernel.org, LKML , Alan Cox Subject: [PATCH] libata: CONFIG_PM=n compile fix Message-ID: <20070603225840.GA25465@lixom.net> References: <20070527030954.GA18974@havoc.gtf.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070527030954.GA18974@havoc.gtf.org> User-Agent: Mutt/1.5.13 (2006-08-11) From: olof@lixom.net (Olof Johansson) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_PM=n compile fix. Signed-off-by: Olof Johansson --- 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);