2013-05-31 06:06:17

by Yijing Wang

Subject: [PATCH] net: wireless: iwlegacy: fix build error for il_pm_ops

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 <[email protected]>
Cc: Stanislaw Gruszka <[email protected]>
Cc: "John W. Linville" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Jingoo Han <[email protected]>
---
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

2013-05-31 06:22:34

by Jingoo Han

Subject: Re: [PATCH] net: wireless: iwlegacy: fix build error for il_pm_ops

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 <[email protected]>
> Cc: Stanislaw Gruszka <[email protected]>
> Cc: "John W. Linville" <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: Jingoo Han <[email protected]>

It looks good.
As you did, 'struct dev_pm_ops il_pm_ops' should be protected
by CONFIG_PM_SLEEP.

Acked-by: Jingoo Han <[email protected]>

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