Commit 0d08026a authored by Alex Elder's avatar Alex Elder Committed by David S. Miller
Browse files

net: ipa: kill ipa_clock_get_additional() 



Now that ipa_clock_get_additional() is a trivial wrapper around
pm_runtime_get_if_active(), just open-code it in its only caller
and delete the function.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a71aeff3

drivers/net/ipa/ipa_clock.c

+0 −9
Original line number Diff line number Diff line
@@ -264,15 +264,6 @@ static int ipa_runtime_idle(struct device *dev) 
	return -EAGAIN;

}



/* Get an IPA clock reference, but only if the reference count is

 * already non-zero.  Returns true if the additional reference was

 * added successfully, or false otherwise.

 */

bool ipa_clock_get_additional(struct ipa *ipa)

{

	return pm_runtime_get_if_active(&ipa->pdev->dev, true) > 0;

}



/* Get an IPA clock reference.  If the reference count is non-zero, it is

 * incremented and return is immediate.  Otherwise the IPA clock is

 * enabled.

drivers/net/ipa/ipa_clock.h

+0 −10
Original line number Diff line number Diff line
@@ -62,16 +62,6 @@ void ipa_clock_exit(struct ipa_clock *clock); 
 */

int ipa_clock_get(struct ipa *ipa);



/**

 * ipa_clock_get_additional() - Get an IPA clock reference if not first

 * @ipa:	IPA pointer

 *

 * Return:	true if reference taken, false otherwise

 *

 * This returns immediately, and only takes a reference if not the first

 */

bool ipa_clock_get_additional(struct ipa *ipa);



/**

 * ipa_clock_put() - Drop an IPA clock reference

 * @ipa:	IPA pointer

drivers/net/ipa/ipa_smp2p.c

+4 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/interrupt.h>

#include <linux/notifier.h>

#include <linux/panic_notifier.h>

#include <linux/pm_runtime.h>

#include <linux/soc/qcom/smem.h>

#include <linux/soc/qcom/smem_state.h>
@@ -84,13 +85,15 @@ struct ipa_smp2p { 
 */

static void ipa_smp2p_notify(struct ipa_smp2p *smp2p)

{

	struct device *dev;

	u32 value;

	u32 mask;



	if (smp2p->notified)

		return;



	smp2p->clock_on = ipa_clock_get_additional(smp2p->ipa);

	dev = &smp2p->ipa->pdev->dev;

	smp2p->clock_on = pm_runtime_get_if_active(dev, true) > 0;



	/* Signal whether the clock is enabled */

	mask = BIT(smp2p->enabled_bit);