| Message ID | 427196876874fef7e956b10d035d06eed5895743.1330588911.git.viresh.kumar@st.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On 3/1/2012 1:34 PM, Viresh KUMAR wrote: > #ifdef, #endif is not required in definition/usage of arasan_cf_pm_ops. So, move > this definition and its usage outside of them. > > Signed-off-by: Viresh Kumar <viresh.kumar@st.com> > --- > drivers/ata/pata_arasan_cf.c | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) Hi Jeff, Can you please apply this patch.
On 3/1/2012 1:34 PM, Viresh KUMAR wrote: > #ifdef, #endif is not required in definition/usage of arasan_cf_pm_ops. So, move > this definition and its usage outside of them. > > Signed-off-by: Viresh Kumar <viresh.kumar@st.com> > --- > drivers/ata/pata_arasan_cf.c | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) Hi Jeff, Can you please apply this patch?
On 04/10/2012 05:32 AM, Viresh Kumar wrote: > On 3/1/2012 1:34 PM, Viresh KUMAR wrote: >> #ifdef, #endif is not required in definition/usage of arasan_cf_pm_ops. So, move >> this definition and its usage outside of them. >> >> Signed-off-by: Viresh Kumar<viresh.kumar@st.com> >> --- >> drivers/ata/pata_arasan_cf.c | 4 +--- >> 1 files changed, 1 insertions(+), 3 deletions(-) > > Hi Jeff, > > Can you please apply this patch? This has been upstream for a while now. -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 4/13/2012 1:37 AM, Jeff Garzik wrote: > On 04/10/2012 05:32 AM, Viresh Kumar wrote: >> On 3/1/2012 1:34 PM, Viresh KUMAR wrote: >>> #ifdef, #endif is not required in definition/usage of arasan_cf_pm_ops. So, move >>> this definition and its usage outside of them. >>> >>> Signed-off-by: Viresh Kumar<viresh.kumar@st.com> >>> --- >>> drivers/ata/pata_arasan_cf.c | 4 +--- >>> 1 files changed, 1 insertions(+), 3 deletions(-) >> >> Hi Jeff, >> >> Can you please apply this patch? > > This has been upstream for a while now. I couldn't see this in linux-next/master :( You pushed following patch earlier: Author: Viresh Kumar <viresh.kumar@st.com> Date: Thu Feb 23 15:03:53 2012 +0530 ata/pata_arasan_cf: Add Hibernation support And this one is a fix over it.
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c index fc2db2a..3239517 100644 --- a/drivers/ata/pata_arasan_cf.c +++ b/drivers/ata/pata_arasan_cf.c @@ -943,9 +943,9 @@ static int arasan_cf_resume(struct device *dev) return 0; } +#endif static SIMPLE_DEV_PM_OPS(arasan_cf_pm_ops, arasan_cf_suspend, arasan_cf_resume); -#endif static struct platform_driver arasan_cf_driver = { .probe = arasan_cf_probe, @@ -953,9 +953,7 @@ static struct platform_driver arasan_cf_driver = { .driver = { .name = DRIVER_NAME, .owner = THIS_MODULE, -#ifdef CONFIG_PM .pm = &arasan_cf_pm_ops, -#endif }, };
#ifdef, #endif is not required in definition/usage of arasan_cf_pm_ops. So, move this definition and its usage outside of them. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> --- drivers/ata/pata_arasan_cf.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)