2013-04-27 02:49:35

by wwang

Subject: [PATCH] linux-next:usb-stor:realtek_cr:Fix compile error

From: Wei WANG <[email protected]>

To fix the compile error when CONFIG_PM_RUNTIME is not enabled,
move the declaration of us out of CONFIG_REALTEK_AUTOPM macro in rts51x_chip.

drivers/usb/storage/realtek_cr.c: In function 'realtek_cr_destructor':
drivers/usb/storage/realtek_cr.c:942:11: error: 'struct rts51x_chip' has no member named 'us'

Signed-off-by: Wei WANG <[email protected]>
---
drivers/usb/storage/realtek_cr.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index 4797228..64c2b28 100644
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -105,8 +105,9 @@ struct rts51x_chip {
int status_len;

u32 flag;
-#ifdef CONFIG_REALTEK_AUTOPM
struct us_data *us;
+
+#ifdef CONFIG_REALTEK_AUTOPM
struct timer_list rts51x_suspend_timer;
unsigned long timer_expires;
int pwr_state;
@@ -991,6 +992,7 @@ static int init_realtek_cr(struct us_data *us)
us->extra = chip;
us->extra_destructor = realtek_cr_destructor;
us->max_lun = chip->max_lun = rts51x_get_max_lun(us);
+ chip->us = us;

usb_stor_dbg(us, "chip->max_lun = %d\n", chip->max_lun);

@@ -1013,10 +1015,8 @@ static int init_realtek_cr(struct us_data *us)
SET_AUTO_DELINK(chip);
}
#ifdef CONFIG_REALTEK_AUTOPM
- if (ss_en) {
- chip->us = us;
+ if (ss_en)
realtek_cr_autosuspend_setup(us);
- }
#endif

usb_stor_dbg(us, "chip->flag = 0x%x\n", chip->flag);
--
1.7.11.3

2013-04-28 22:22:59

by Randy Dunlap

Subject: Re: [PATCH] linux-next:usb-stor:realtek_cr:Fix compile error

On 04/26/13 19:49, [email protected] wrote:
> From: Wei WANG <[email protected]>
>
> To fix the compile error when CONFIG_PM_RUNTIME is not enabled,
> move the declaration of us out of CONFIG_REALTEK_AUTOPM macro in rts51x_chip.
>
> drivers/usb/storage/realtek_cr.c: In function 'realtek_cr_destructor':
> drivers/usb/storage/realtek_cr.c:942:11: error: 'struct rts51x_chip' has no member named 'us'
>
> Signed-off-by: Wei WANG <[email protected]>

Reported-by: Randy Dunlap <[email protected]>
Acked-by: Randy Dunlap <[email protected]>

Thanks.

> ---
> drivers/usb/storage/realtek_cr.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
> index 4797228..64c2b28 100644
> --- a/drivers/usb/storage/realtek_cr.c
> +++ b/drivers/usb/storage/realtek_cr.c
> @@ -105,8 +105,9 @@ struct rts51x_chip {
> int status_len;
>
> u32 flag;
> -#ifdef CONFIG_REALTEK_AUTOPM
> struct us_data *us;
> +
> +#ifdef CONFIG_REALTEK_AUTOPM
> struct timer_list rts51x_suspend_timer;
> unsigned long timer_expires;
> int pwr_state;
> @@ -991,6 +992,7 @@ static int init_realtek_cr(struct us_data *us)
> us->extra = chip;
> us->extra_destructor = realtek_cr_destructor;
> us->max_lun = chip->max_lun = rts51x_get_max_lun(us);
> + chip->us = us;
>
> usb_stor_dbg(us, "chip->max_lun = %d\n", chip->max_lun);
>
> @@ -1013,10 +1015,8 @@ static int init_realtek_cr(struct us_data *us)
> SET_AUTO_DELINK(chip);
> }
> #ifdef CONFIG_REALTEK_AUTOPM
> - if (ss_en) {
> - chip->us = us;
> + if (ss_en)
> realtek_cr_autosuspend_setup(us);
> - }
> #endif
>
> usb_stor_dbg(us, "chip->flag = 0x%x\n", chip->flag);
>


--
~Randy