From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932403AbXCCFe0 (ORCPT ); Sat, 3 Mar 2007 00:34:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933368AbXCCFeZ (ORCPT ); Sat, 3 Mar 2007 00:34:25 -0500 Received: from nigel.suspend2.net ([203.171.70.205]:39370 "EHLO nigel.suspend2.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932403AbXCCFeY (ORCPT ); Sat, 3 Mar 2007 00:34:24 -0500 Subject: Re: [linux-pm] [PATCH 2/2 -stable] libata: add missing CONFIG_PM in LLDs From: Nigel Cunningham Reply-To: nigel@nigel.suspend2.net To: Tejun Heo Cc: Guennadi Liakhovetski , linux-ide@vger.kernel.org, jgarzik@pobox.com, linux-pm@lists.osdl.org, stable@kernel.org, Alan , linux-kernel@vger.kernel.org In-Reply-To: <45E8E983.5030109@gmail.com> References: <20061122172841.0b90f042@localhost.localdomain> <20070302084530.GN20322@htj.dyndns.org> <20070302084649.GO20322@htj.dyndns.org> <1172881095.18544.108.camel@nigel.suspend2.net> <45E8E983.5030109@gmail.com> Content-Type: text/plain Date: Sat, 03 Mar 2007 16:34:25 +1100 Message-Id: <1172900065.18544.119.camel@nigel.suspend2.net> Mime-Version: 1.0 X-Mailer: Evolution 2.9.92 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Hi. On Sat, 2007-03-03 at 12:20 +0900, Tejun Heo wrote: > Hello, Nigel. > > Nigel Cunningham wrote: > >> Index: work1/drivers/ata/ahci.c > >> =================================================================== > >> --- work1.orig/drivers/ata/ahci.c > >> +++ work1/drivers/ata/ahci.c > >> @@ -225,10 +225,12 @@ static void ahci_thaw(struct ata_port *a > >> static void ahci_error_handler(struct ata_port *ap); > >> static void ahci_vt8251_error_handler(struct ata_port *ap); > >> static void ahci_post_internal_cmd(struct ata_queued_cmd *qc); > >> +#ifdef CONFIG_PM > >> static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg); > >> static int ahci_port_resume(struct ata_port *ap); > >> static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg); > >> static int ahci_pci_device_resume(struct pci_dev *pdev); > > > > Wouldn't it be simpler to add > > > > #else > > #define ahci_port_suspend(port, message) (NULL) > > > > etc (or something similar)? > > ahci_port_suspend() is used to fill ata_port_ops vector, so it needs to > be a function. If you're talking about defining NULL function, yeah, > that will remove half of CONFIG_PMs but would require dummy definitions > for all functions. I think both are ugly. :-) Yeah, I didn't look really carefully; an empty static function would have been what I'd have written if I'd paid more attention. > I'm working on a linker trick. Please take a look at the following thread. > > http://thread.gmane.org/gmane.linux.ide/16475 Not familiar with fancy things like that, so I'll just pipe down and leave you to it :). Regards, Nigel