[PATCH v3 6/9] omap: hsmmc: remove unused variable

Adrian Hunter adrian.hunter at nokia.com
Wed Aug 11 06:28:44 EDT 2010


Ohad Ben-Cohen wrote:
> On Wed, Aug 11, 2010 at 12:55 PM, Adrian Hunter <adrian.hunter at nokia.com> wrote:
>> Ohad Ben-Cohen wrote:
>>> Make this go away:
>>>
>>> drivers/mmc/host/omap_hsmmc.c: In function 'omap_hsmmc_suspend':
>>> drivers/mmc/host/omap_hsmmc.c:2328: warning: unused variable 'state'
>> Was done a while ago.
> 
> Are you sure ?

Oops sorry =0_o=  It is still there. 

> 
> I can still see the unused state variable in Linus' tree:
> 
> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=drivers/mmc/host/omap_hsmmc.c;h=b032828c61263028963bd412a7455546d5e86ce7;hb=HEAD#l2275
> 
> 
>> See 1a13f8fa76c880be41d6b1e6a2b44404bcbfdf9e in linus' tree.
> 
> This commit only seem to adapt to the API change (the state variable
> is not removed):
> 
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index d25b19b..b032828 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -2292,7 +2292,7 @@ static int omap_hsmmc_suspend(struct device *dev)
>                 }
>                 cancel_work_sync(&host->mmc_carddetect_work);
>                 mmc_host_enable(host->mmc);
> -               ret = mmc_suspend_host(host->mmc, state);
> +               ret = mmc_suspend_host(host->mmc);
>                 if (ret == 0) {
>                         omap_hsmmc_disable_irq(host);
>                         OMAP_HSMMC_WRITE(host->base, HCTL,
> 
>>> Signed-off-by: Ohad Ben-Cohen <ohad at wizery.com>
>>> ---
>>>  drivers/mmc/host/omap_hsmmc.c |    1 -
>>>  1 files changed, 0 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
>>> index b032828..d50e917 100644
>>> --- a/drivers/mmc/host/omap_hsmmc.c
>>> +++ b/drivers/mmc/host/omap_hsmmc.c
>>> @@ -2272,7 +2272,6 @@ static int omap_hsmmc_suspend(struct device *dev)
>>>        int ret = 0;
>>>        struct platform_device *pdev = to_platform_device(dev);
>>>        struct omap_hsmmc_host *host = platform_get_drvdata(pdev);
>>> -       pm_message_t state = PMSG_SUSPEND; /* unused by MMC core */
>>>        if (host && host->suspended)
>>>                return 0;
>>
> 




More information about the linux-arm-kernel mailing list