From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Subject: Re: [PATCH 1/4] PM: Drop the SET_PM_RUNTIME_PM_OPS() macro Date: Wed, 03 Dec 2014 23:51:44 +0100 Message-ID: <2647870.gu06V1GGvo@vostro.rjw.lan> References: <37310416.jZXoh5nfSC@vostro.rjw.lan> <3484329.phAPviVnbd@vostro.rjw.lan> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7Bit Return-path: Received: from v094114.home.net.pl ([79.96.170.134]:64295 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751124AbaLCWaU (ORCPT ); Wed, 3 Dec 2014 17:30:20 -0500 In-Reply-To: Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: Ulf Hansson Cc: Linux PM list , Linux PCI , Linux Kernel Mailing List , ACPI Devel Maling List , Alan Stern , Bjorn Helgaas , Kevin Hilman , Geert Uytterhoeven On Wednesday, December 03, 2014 03:15:49 PM Ulf Hansson wrote: > On 27 November 2014 at 01:38, Rafael J. Wysocki wrote: > > From: Rafael J. Wysocki > > > > The SET_PM_RUNTIME_PM_OPS() and SET_RUNTIME_PM_OPS() macros are > > identical except that one of them is not empty for CONFIG_PM set, > > while the other one is not empty for CONFIG_PM_RUNTIME set, > > respectively. > > > > However, after commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if > > PM_SLEEP is selected) PM_RUNTIME is always set if PM is set, so one > > of these macros is now redundant. > > > > For this reason, drop SET_PM_RUNTIME_PM_OPS() and replace it with > > SET_RUNTIME_PM_OPS() everywhere. > > Hi Rafael, > > Apparently, I have queued an mmc patch in my mmc tree, which means one > mmc driver starts using the SET_PM_RUNTIME_PM_OPS macro. It should > cause a build error in linux-next with @subject patch. > > I have shared that patch through an immutable branch, I have also > checked potential conflicts and it shouldn't be any problems to pull > that in to your tree. Then you can fix $subject patch by also > converting the mmc driver to use SET_RUNTIME_PM_OPS macro. > > The branch is available at: > git://git.linaro.org/people/ulf.hansson/mmc.git mmc_for_linux_pm Thanks for letting me know! What about adding the following line to the $subject patch instead: #define SET_PM_RUNTIME_PM_OPS SET_RUNTIME_PM_OPS and fixing things up when all has been merged? -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.