2013-09-20 01:22:14

by Grant Grundler

[permalink] [raw]
Subject: [PATCH] mmc: core: remove dead function mmc_try_claim_host

cscsope says there are no callers for mmc_try_claim_host in the kernel.
No reason to keep it.

Signed-off-by: Grant Grundler <[email protected]>
---
drivers/mmc/core/core.c | 25 -------------------------
include/linux/mmc/core.h | 1 -
2 files changed, 26 deletions(-)

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index bf18b6b..006ead2 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -918,31 +918,6 @@ int __mmc_claim_host(struct mmc_host *host, atomic_t *abort)
EXPORT_SYMBOL(__mmc_claim_host);

/**
- * mmc_try_claim_host - try exclusively to claim a host
- * @host: mmc host to claim
- *
- * Returns %1 if the host is claimed, %0 otherwise.
- */
-int mmc_try_claim_host(struct mmc_host *host)
-{
- int claimed_host = 0;
- unsigned long flags;
-
- spin_lock_irqsave(&host->lock, flags);
- if (!host->claimed || host->claimer == current) {
- host->claimed = 1;
- host->claimer = current;
- host->claim_cnt += 1;
- claimed_host = 1;
- }
- spin_unlock_irqrestore(&host->lock, flags);
- if (host->ops->enable && claimed_host && host->claim_cnt == 1)
- host->ops->enable(host);
- return claimed_host;
-}
-EXPORT_SYMBOL(mmc_try_claim_host);
-
-/**
* mmc_release_host - release a host
* @host: mmc host to release
*
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index da51bec..a00fc49 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -188,7 +188,6 @@ extern unsigned int mmc_align_data_size(struct mmc_card *, unsigned int);

extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort);
extern void mmc_release_host(struct mmc_host *host);
-extern int mmc_try_claim_host(struct mmc_host *host);

extern void mmc_get_card(struct mmc_card *card);
extern void mmc_put_card(struct mmc_card *card);
--
1.8.4


2013-09-20 07:35:12

by Ulf Hansson

[permalink] [raw]
Subject: Re: [PATCH] mmc: core: remove dead function mmc_try_claim_host

On 20 September 2013 03:21, Grant Grundler <[email protected]> wrote:
> cscsope says there are no callers for mmc_try_claim_host in the kernel.
> No reason to keep it.
>
> Signed-off-by: Grant Grundler <[email protected]>

Acked-by: Ulf Hansson <[email protected]>

> ---
> drivers/mmc/core/core.c | 25 -------------------------
> include/linux/mmc/core.h | 1 -
> 2 files changed, 26 deletions(-)
>
> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
> index bf18b6b..006ead2 100644
> --- a/drivers/mmc/core/core.c
> +++ b/drivers/mmc/core/core.c
> @@ -918,31 +918,6 @@ int __mmc_claim_host(struct mmc_host *host, atomic_t *abort)
> EXPORT_SYMBOL(__mmc_claim_host);
>
> /**
> - * mmc_try_claim_host - try exclusively to claim a host
> - * @host: mmc host to claim
> - *
> - * Returns %1 if the host is claimed, %0 otherwise.
> - */
> -int mmc_try_claim_host(struct mmc_host *host)
> -{
> - int claimed_host = 0;
> - unsigned long flags;
> -
> - spin_lock_irqsave(&host->lock, flags);
> - if (!host->claimed || host->claimer == current) {
> - host->claimed = 1;
> - host->claimer = current;
> - host->claim_cnt += 1;
> - claimed_host = 1;
> - }
> - spin_unlock_irqrestore(&host->lock, flags);
> - if (host->ops->enable && claimed_host && host->claim_cnt == 1)
> - host->ops->enable(host);
> - return claimed_host;
> -}
> -EXPORT_SYMBOL(mmc_try_claim_host);
> -
> -/**
> * mmc_release_host - release a host
> * @host: mmc host to release
> *
> diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
> index da51bec..a00fc49 100644
> --- a/include/linux/mmc/core.h
> +++ b/include/linux/mmc/core.h
> @@ -188,7 +188,6 @@ extern unsigned int mmc_align_data_size(struct mmc_card *, unsigned int);
>
> extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort);
> extern void mmc_release_host(struct mmc_host *host);
> -extern int mmc_try_claim_host(struct mmc_host *host);
>
> extern void mmc_get_card(struct mmc_card *card);
> extern void mmc_put_card(struct mmc_card *card);
> --
> 1.8.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

2013-09-23 21:56:50

by Grant Grundler

[permalink] [raw]
Subject: Re: [PATCH] mmc: core: remove dead function mmc_try_claim_host

On Fri, Sep 20, 2013 at 12:35 AM, Ulf Hansson <[email protected]> wrote:
> On 20 September 2013 03:21, Grant Grundler <[email protected]> wrote:
>> cscsope says there are no callers for mmc_try_claim_host in the kernel.
>> No reason to keep it.
>>
>> Signed-off-by: Grant Grundler <[email protected]>
>
> Acked-by: Ulf Hansson <[email protected]>

Thank you Ulf!

In which maintainer's git tree/branch should I expect this patch to land?

Just looking for some confirmation that it was applied.

thanks,
grant

>
>> ---
>> drivers/mmc/core/core.c | 25 -------------------------
>> include/linux/mmc/core.h | 1 -
>> 2 files changed, 26 deletions(-)
>>
>> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
>> index bf18b6b..006ead2 100644
>> --- a/drivers/mmc/core/core.c
>> +++ b/drivers/mmc/core/core.c
>> @@ -918,31 +918,6 @@ int __mmc_claim_host(struct mmc_host *host, atomic_t *abort)
>> EXPORT_SYMBOL(__mmc_claim_host);
>>
>> /**
>> - * mmc_try_claim_host - try exclusively to claim a host
>> - * @host: mmc host to claim
>> - *
>> - * Returns %1 if the host is claimed, %0 otherwise.
>> - */
>> -int mmc_try_claim_host(struct mmc_host *host)
>> -{
>> - int claimed_host = 0;
>> - unsigned long flags;
>> -
>> - spin_lock_irqsave(&host->lock, flags);
>> - if (!host->claimed || host->claimer == current) {
>> - host->claimed = 1;
>> - host->claimer = current;
>> - host->claim_cnt += 1;
>> - claimed_host = 1;
>> - }
>> - spin_unlock_irqrestore(&host->lock, flags);
>> - if (host->ops->enable && claimed_host && host->claim_cnt == 1)
>> - host->ops->enable(host);
>> - return claimed_host;
>> -}
>> -EXPORT_SYMBOL(mmc_try_claim_host);
>> -
>> -/**
>> * mmc_release_host - release a host
>> * @host: mmc host to release
>> *
>> diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
>> index da51bec..a00fc49 100644
>> --- a/include/linux/mmc/core.h
>> +++ b/include/linux/mmc/core.h
>> @@ -188,7 +188,6 @@ extern unsigned int mmc_align_data_size(struct mmc_card *, unsigned int);
>>
>> extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort);
>> extern void mmc_release_host(struct mmc_host *host);
>> -extern int mmc_try_claim_host(struct mmc_host *host);
>>
>> extern void mmc_get_card(struct mmc_card *card);
>> extern void mmc_put_card(struct mmc_card *card);
>> --
>> 1.8.4
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/

2013-09-23 21:58:39

by Chris Ball

[permalink] [raw]
Subject: Re: [PATCH] mmc: core: remove dead function mmc_try_claim_host

Hi Grant,

On Mon, Sep 23 2013, Grant Grundler wrote:
> On Fri, Sep 20, 2013 at 12:35 AM, Ulf Hansson <[email protected]> wrote:
>> On 20 September 2013 03:21, Grant Grundler <[email protected]> wrote:
>>> cscsope says there are no callers for mmc_try_claim_host in the kernel.
>>> No reason to keep it.
>>>
>>> Signed-off-by: Grant Grundler <[email protected]>
>>
>> Acked-by: Ulf Hansson <[email protected]>
>
> Thank you Ulf!
>
> In which maintainer's git tree/branch should I expect this patch to land?
>
> Just looking for some confirmation that it was applied.

I'll take this into mmc-next soon. Thanks!

- Chris.
--
Chris Ball <[email protected]> <http://printf.net/>

2013-09-26 01:25:52

by Chris Ball

[permalink] [raw]
Subject: Re: [PATCH] mmc: core: remove dead function mmc_try_claim_host

Hi,

On Fri, Sep 20 2013, Ulf Hansson wrote:
> On 20 September 2013 03:21, Grant Grundler <[email protected]> wrote:
>> cscsope says there are no callers for mmc_try_claim_host in the kernel.
>> No reason to keep it.
>>
>> Signed-off-by: Grant Grundler <[email protected]>
>
> Acked-by: Ulf Hansson <[email protected]>

Thanks, pushed to mmc-next for 3.13 with Ulf's ACK.

- Chris.
--
Chris Ball <[email protected]> <http://printf.net/>