* [PATCH] mmc: core: Fix build warning with !CONFIG_SUSPEND
@ 2012-05-19 7:58 ` Santosh Shilimkar
0 siblings, 0 replies; 6+ messages in thread
From: Santosh Shilimkar @ 2012-05-19 7:58 UTC (permalink / raw)
To: linux-mmc; +Cc: linux-kernel, Santosh Shilimkar, Chris Ball
With !CONFIG_SUSPEND, mmc core layer throws below build warnings.
drivers/mmc/core/bus.c:125: warning: 'mmc_bus_suspend' defined but not used
drivers/mmc/core/bus.c:136: warning: 'mmc_bus_resume' defined but not used
drivers/mmc/core/sdio_bus.c:197: warning: 'pm_no_operation' defined but not used
Fix is by wrapping suspend hooks under CONFIG_SUSPEND
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Chris Ball <cjb@laptop.org>
---
drivers/mmc/core/bus.c | 2 ++
drivers/mmc/core/sdio_bus.c | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index c60cee9..ca8925d 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -122,6 +122,7 @@ static int mmc_bus_remove(struct device *dev)
return 0;
}
+#ifdef CONFIG_SUSPEND
static int mmc_bus_suspend(struct device *dev)
{
struct mmc_driver *drv = to_mmc_driver(dev->driver);
@@ -143,6 +144,7 @@ static int mmc_bus_resume(struct device *dev)
ret = drv->resume(card);
return ret;
}
+#endif
#ifdef CONFIG_PM_RUNTIME
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index 236842e..87d1b7e 100644
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -192,7 +192,7 @@ static int sdio_bus_remove(struct device *dev)
return ret;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_SUSPEND
static int pm_no_operation(struct device *dev)
{
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] mmc: core: Fix build warning with !CONFIG_SUSPEND
@ 2012-05-19 7:58 ` Santosh Shilimkar
0 siblings, 0 replies; 6+ messages in thread
From: Santosh Shilimkar @ 2012-05-19 7:58 UTC (permalink / raw)
To: linux-mmc; +Cc: linux-kernel, Santosh Shilimkar, Chris Ball
With !CONFIG_SUSPEND, mmc core layer throws below build warnings.
drivers/mmc/core/bus.c:125: warning: 'mmc_bus_suspend' defined but not used
drivers/mmc/core/bus.c:136: warning: 'mmc_bus_resume' defined but not used
drivers/mmc/core/sdio_bus.c:197: warning: 'pm_no_operation' defined but not used
Fix is by wrapping suspend hooks under CONFIG_SUSPEND
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Chris Ball <cjb@laptop.org>
---
drivers/mmc/core/bus.c | 2 ++
drivers/mmc/core/sdio_bus.c | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index c60cee9..ca8925d 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -122,6 +122,7 @@ static int mmc_bus_remove(struct device *dev)
return 0;
}
+#ifdef CONFIG_SUSPEND
static int mmc_bus_suspend(struct device *dev)
{
struct mmc_driver *drv = to_mmc_driver(dev->driver);
@@ -143,6 +144,7 @@ static int mmc_bus_resume(struct device *dev)
ret = drv->resume(card);
return ret;
}
+#endif
#ifdef CONFIG_PM_RUNTIME
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index 236842e..87d1b7e 100644
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -192,7 +192,7 @@ static int sdio_bus_remove(struct device *dev)
return ret;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_SUSPEND
static int pm_no_operation(struct device *dev)
{
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] mmc: core: Fix build warning with !CONFIG_SUSPEND
2012-05-19 7:58 ` Santosh Shilimkar
(?)
@ 2012-05-26 17:22 ` Shilimkar, Santosh
-1 siblings, 0 replies; 6+ messages in thread
From: Shilimkar, Santosh @ 2012-05-26 17:22 UTC (permalink / raw)
To: Chris Ball; +Cc: linux-kernel, Santosh Shilimkar, linux-mmc
Chris,
On Sat, May 19, 2012 at 1:28 PM, Santosh Shilimkar
<santosh.shilimkar@ti.com> wrote:
> With !CONFIG_SUSPEND, mmc core layer throws below build warnings.
>
> drivers/mmc/core/bus.c:125: warning: 'mmc_bus_suspend' defined but not used
> drivers/mmc/core/bus.c:136: warning: 'mmc_bus_resume' defined but not used
> drivers/mmc/core/sdio_bus.c:197: warning: 'pm_no_operation' defined but not used
>
> Fix is by wrapping suspend hooks under CONFIG_SUSPEND
>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Cc: Chris Ball <cjb@laptop.org>
> ---
Ping
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mmc: core: Fix build warning with !CONFIG_SUSPEND
2012-05-19 7:58 ` Santosh Shilimkar
@ 2012-05-27 2:52 ` Chris Ball
-1 siblings, 0 replies; 6+ messages in thread
From: Chris Ball @ 2012-05-27 2:52 UTC (permalink / raw)
To: Santosh Shilimkar; +Cc: linux-mmc, linux-kernel
Hi,
On Sat, May 19 2012, Santosh Shilimkar wrote:
> With !CONFIG_SUSPEND, mmc core layer throws below build warnings.
>
> drivers/mmc/core/bus.c:125: warning: 'mmc_bus_suspend' defined but not used
> drivers/mmc/core/bus.c:136: warning: 'mmc_bus_resume' defined but not used
> drivers/mmc/core/sdio_bus.c:197: warning: 'pm_no_operation' defined but not used
>
> Fix is by wrapping suspend hooks under CONFIG_SUSPEND
>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Cc: Chris Ball <cjb@laptop.org>
> ---
> drivers/mmc/core/bus.c | 2 ++
> drivers/mmc/core/sdio_bus.c | 2 +-
> 2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
> index c60cee9..ca8925d 100644
> --- a/drivers/mmc/core/bus.c
> +++ b/drivers/mmc/core/bus.c
> @@ -122,6 +122,7 @@ static int mmc_bus_remove(struct device *dev)
> return 0;
> }
>
> +#ifdef CONFIG_SUSPEND
> static int mmc_bus_suspend(struct device *dev)
> {
> struct mmc_driver *drv = to_mmc_driver(dev->driver);
> @@ -143,6 +144,7 @@ static int mmc_bus_resume(struct device *dev)
> ret = drv->resume(card);
> return ret;
> }
> +#endif
>
> #ifdef CONFIG_PM_RUNTIME
>
> diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
> index 236842e..87d1b7e 100644
> --- a/drivers/mmc/core/sdio_bus.c
> +++ b/drivers/mmc/core/sdio_bus.c
> @@ -192,7 +192,7 @@ static int sdio_bus_remove(struct device *dev)
> return ret;
> }
>
> -#ifdef CONFIG_PM
> +#ifdef CONFIG_SUSPEND
>
> static int pm_no_operation(struct device *dev)
> {
This patch doesn't apply against mmc-next, and I think this has already
been fixed upstream -- please could you retest against Linus HEAD?
Thanks,
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mmc: core: Fix build warning with !CONFIG_SUSPEND
@ 2012-05-27 2:52 ` Chris Ball
0 siblings, 0 replies; 6+ messages in thread
From: Chris Ball @ 2012-05-27 2:52 UTC (permalink / raw)
To: Santosh Shilimkar; +Cc: linux-mmc, linux-kernel
Hi,
On Sat, May 19 2012, Santosh Shilimkar wrote:
> With !CONFIG_SUSPEND, mmc core layer throws below build warnings.
>
> drivers/mmc/core/bus.c:125: warning: 'mmc_bus_suspend' defined but not used
> drivers/mmc/core/bus.c:136: warning: 'mmc_bus_resume' defined but not used
> drivers/mmc/core/sdio_bus.c:197: warning: 'pm_no_operation' defined but not used
>
> Fix is by wrapping suspend hooks under CONFIG_SUSPEND
>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Cc: Chris Ball <cjb@laptop.org>
> ---
> drivers/mmc/core/bus.c | 2 ++
> drivers/mmc/core/sdio_bus.c | 2 +-
> 2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
> index c60cee9..ca8925d 100644
> --- a/drivers/mmc/core/bus.c
> +++ b/drivers/mmc/core/bus.c
> @@ -122,6 +122,7 @@ static int mmc_bus_remove(struct device *dev)
> return 0;
> }
>
> +#ifdef CONFIG_SUSPEND
> static int mmc_bus_suspend(struct device *dev)
> {
> struct mmc_driver *drv = to_mmc_driver(dev->driver);
> @@ -143,6 +144,7 @@ static int mmc_bus_resume(struct device *dev)
> ret = drv->resume(card);
> return ret;
> }
> +#endif
>
> #ifdef CONFIG_PM_RUNTIME
>
> diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
> index 236842e..87d1b7e 100644
> --- a/drivers/mmc/core/sdio_bus.c
> +++ b/drivers/mmc/core/sdio_bus.c
> @@ -192,7 +192,7 @@ static int sdio_bus_remove(struct device *dev)
> return ret;
> }
>
> -#ifdef CONFIG_PM
> +#ifdef CONFIG_SUSPEND
>
> static int pm_no_operation(struct device *dev)
> {
This patch doesn't apply against mmc-next, and I think this has already
been fixed upstream -- please could you retest against Linus HEAD?
Thanks,
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mmc: core: Fix build warning with !CONFIG_SUSPEND
2012-05-27 2:52 ` Chris Ball
(?)
@ 2012-05-27 10:41 ` Shilimkar, Santosh
-1 siblings, 0 replies; 6+ messages in thread
From: Shilimkar, Santosh @ 2012-05-27 10:41 UTC (permalink / raw)
To: Chris Ball; +Cc: linux-mmc, linux-kernel
On Sun, May 27, 2012 at 8:22 AM, Chris Ball <cjb@laptop.org> wrote:
> Hi,
>
> On Sat, May 19 2012, Santosh Shilimkar wrote:
>> With !CONFIG_SUSPEND, mmc core layer throws below build warnings.
>>
>> drivers/mmc/core/bus.c:125: warning: 'mmc_bus_suspend' defined but not used
>> drivers/mmc/core/bus.c:136: warning: 'mmc_bus_resume' defined but not used
>> drivers/mmc/core/sdio_bus.c:197: warning: 'pm_no_operation' defined but not used
>>
>> Fix is by wrapping suspend hooks under CONFIG_SUSPEND
>>
>> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
>> Cc: Chris Ball <cjb@laptop.org>
>> ---
>> drivers/mmc/core/bus.c | 2 ++
>> drivers/mmc/core/sdio_bus.c | 2 +-
>> 2 files changed, 3 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
>> index c60cee9..ca8925d 100644
>> --- a/drivers/mmc/core/bus.c
>> +++ b/drivers/mmc/core/bus.c
>> @@ -122,6 +122,7 @@ static int mmc_bus_remove(struct device *dev)
>> return 0;
>> }
>>
>> +#ifdef CONFIG_SUSPEND
>> static int mmc_bus_suspend(struct device *dev)
>> {
>> struct mmc_driver *drv = to_mmc_driver(dev->driver);
>> @@ -143,6 +144,7 @@ static int mmc_bus_resume(struct device *dev)
>> ret = drv->resume(card);
>> return ret;
>> }
>> +#endif
>>
>> #ifdef CONFIG_PM_RUNTIME
>>
>> diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
>> index 236842e..87d1b7e 100644
>> --- a/drivers/mmc/core/sdio_bus.c
>> +++ b/drivers/mmc/core/sdio_bus.c
>> @@ -192,7 +192,7 @@ static int sdio_bus_remove(struct device *dev)
>> return ret;
>> }
>>
>> -#ifdef CONFIG_PM
>> +#ifdef CONFIG_SUSPEND
>>
>> static int pm_no_operation(struct device *dev)
>> {
>
> This patch doesn't apply against mmc-next, and I think this has already
> been fixed upstream -- please could you retest against Linus HEAD?
>
Indeed. It got fixed by commit 0dd1bfeb6.
Thanks for the update.
Regards
Santosh
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-05-27 10:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-19 7:58 [PATCH] mmc: core: Fix build warning with !CONFIG_SUSPEND Santosh Shilimkar
2012-05-19 7:58 ` Santosh Shilimkar
2012-05-26 17:22 ` Shilimkar, Santosh
2012-05-27 2:52 ` Chris Ball
2012-05-27 2:52 ` Chris Ball
2012-05-27 10:41 ` Shilimkar, Santosh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.