Return-path: Received: from mailout2.samsung.com ([203.254.224.25]:48089 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752070Ab3EaGW0 (ORCPT ); Fri, 31 May 2013 02:22:26 -0400 From: Jingoo Han To: 'Yijing Wang' , "'David S. Miller'" Cc: linux-kernel@vger.kernel.org, 'Hanjun Guo' , 'Jiang Liu' , 'Stanislaw Gruszka' , "'John W. Linville'" , netdev@vger.kernel.org, linux-wireless@vger.kernel.org, Jingoo Han References: <1369980332-1344-1-git-send-email-wangyijing@huawei.com> In-reply-to: <1369980332-1344-1-git-send-email-wangyijing@huawei.com> Subject: Re: [PATCH] net: wireless: iwlegacy: fix build error for il_pm_ops Date: Fri, 31 May 2013 15:22:24 +0900 Message-id: <000101ce5dc7$374e8190$a5eb84b0$@samsung.com> (sfid-20130531_082232_358812_588E04D1) MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Sender: linux-wireless-owner@vger.kernel.org List-ID: On Friday, May 31, 2013 3:06 PM, Yijing Wang wrote: > > Fix build error for il_pm_ops if CONFIG_PM is set > but CONFIG_PM_SLEEP is not set. > > ERROR: "il_pm_ops" [drivers/net/wireless/iwlegacy/iwl4965.ko] undefined! > ERROR: "il_pm_ops" [drivers/net/wireless/iwlegacy/iwl3945.ko] undefined! > make[1]: *** [__modpost] Error 1 > make: *** [modules] Error 2 > > Signed-off-by: Yijing Wang > Cc: Stanislaw Gruszka > Cc: "John W. Linville" > Cc: netdev@vger.kernel.org > Cc: linux-wireless@vger.kernel.org > Cc: Jingoo Han It looks good. As you did, 'struct dev_pm_ops il_pm_ops' should be protected by CONFIG_PM_SLEEP. Acked-by: Jingoo Han Best regards, Jingoo Han > --- > drivers/net/wireless/iwlegacy/common.h | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h > index f8246f2..4caaf52 100644 > --- a/drivers/net/wireless/iwlegacy/common.h > +++ b/drivers/net/wireless/iwlegacy/common.h > @@ -1832,16 +1832,16 @@ u32 il_usecs_to_beacons(struct il_priv *il, u32 usec, u32 beacon_interval); > __le32 il_add_beacon_time(struct il_priv *il, u32 base, u32 addon, > u32 beacon_interval); > > -#ifdef CONFIG_PM > +#ifdef CONFIG_PM_SLEEP > extern const struct dev_pm_ops il_pm_ops; > > #define IL_LEGACY_PM_OPS (&il_pm_ops) > > -#else /* !CONFIG_PM */ > +#else /* !CONFIG_PM_SLEEP */ > > #define IL_LEGACY_PM_OPS NULL > > -#endif /* !CONFIG_PM */ > +#endif /* !CONFIG_PM_SLEEP */ > > /***************************************************** > * Error Handling Debugging > -- > 1.7.1