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

net: ipa: kill ipa_clock_get() 



The only remaining user of the ipa_clock_{get,put}() interface is
ipa_isr_thread().  Replace calls to ipa_clock_get() there calling
pm_runtime_get_sync() instead.  And call pm_runtime_put() there
rather than ipa_clock_put().  Warn if we ever get an error.

With that, we can get rid of ipa_clock_get() and ipa_clock_put().

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

drivers/net/ipa/ipa_clock.c

+0 −17
Original line number Original line Diff line number Diff line
@@ -272,23 +272,6 @@ static int ipa_runtime_idle(struct device *dev) 
	return -EAGAIN;

	return -EAGAIN;

}

}





/* 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.

 */

int ipa_clock_get(struct ipa *ipa)

{

	return pm_runtime_get_sync(&ipa->pdev->dev);

}



/* Attempt to remove an IPA clock reference.  If this represents the

 * last reference, disable the IPA clock.

 */

int ipa_clock_put(struct ipa *ipa)

{

	return pm_runtime_put(&ipa->pdev->dev);

}



static int ipa_suspend(struct device *dev)

static int ipa_suspend(struct device *dev)

{

{

	struct ipa *ipa = dev_get_drvdata(dev);

	struct ipa *ipa = dev_get_drvdata(dev);

drivers/net/ipa/ipa_clock.h

+0 −24
Original line number Original line Diff line number Diff line
@@ -70,28 +70,4 @@ struct ipa_clock *ipa_clock_init(struct device *dev, 
 */

 */

void ipa_clock_exit(struct ipa_clock *clock);

void ipa_clock_exit(struct ipa_clock *clock);





/**

 * ipa_clock_get() - Get an IPA clock reference

 * @ipa:	IPA pointer

 *

 * Return:	0 if clock started, 1 if clock already running, or a negative

 *		error code

 *

 * This call blocks if this is the first reference.  A reference is

 * taken even if an error occurs starting the IPA clock.

 */

int ipa_clock_get(struct ipa *ipa);



/**

 * ipa_clock_put() - Drop an IPA clock reference

 * @ipa:	IPA pointer

 *

 * Return:	0 if successful, or a negative error code

 *

 * This drops a clock reference.  If the last reference is being dropped,

 * the clock is stopped and RX endpoints are suspended.  This call will

 * not block unless the last reference is dropped.

 */

int ipa_clock_put(struct ipa *ipa);



#endif /* _IPA_CLOCK_H_ */
 
#endif /* _IPA_CLOCK_H_ */

drivers/net/ipa/ipa_interrupt.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -21,9 +21,9 @@ 




#include <linux/types.h>

#include <linux/types.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/pm_runtime.h>





#include "ipa.h"

#include "ipa.h"

#include "ipa_clock.h"

#include "ipa_reg.h"

#include "ipa_reg.h"

#include "ipa_endpoint.h"

#include "ipa_endpoint.h"

#include "ipa_interrupt.h"

#include "ipa_interrupt.h"
@@ -80,14 +80,16 @@ static irqreturn_t ipa_isr_thread(int irq, void *dev_id) 
	struct ipa_interrupt *interrupt = dev_id;

	struct ipa_interrupt *interrupt = dev_id;

	struct ipa *ipa = interrupt->ipa;

	struct ipa *ipa = interrupt->ipa;

	u32 enabled = interrupt->enabled;

	u32 enabled = interrupt->enabled;

	struct device *dev;

	u32 pending;

	u32 pending;

	u32 offset;

	u32 offset;

	u32 mask;

	u32 mask;

	int ret;

	int ret;





	ret = ipa_clock_get(ipa);

	dev = &ipa->pdev->dev;

	ret = pm_runtime_get_sync(dev);

	if (WARN_ON(ret < 0))

	if (WARN_ON(ret < 0))

		goto out_clock_put;

		goto out_power_put;





	/* The status register indicates which conditions are present,

	/* The status register indicates which conditions are present,

	 * including conditions whose interrupt is not enabled.  Handle

	 * including conditions whose interrupt is not enabled.  Handle
@@ -108,15 +110,13 @@ static irqreturn_t ipa_isr_thread(int irq, void *dev_id) 




	/* If any disabled interrupts are pending, clear them */

	/* If any disabled interrupts are pending, clear them */

	if (pending) {

	if (pending) {

		struct device *dev = &ipa->pdev->dev;



		dev_dbg(dev, "clearing disabled IPA interrupts 0x%08x\n",

		dev_dbg(dev, "clearing disabled IPA interrupts 0x%08x\n",

			pending);

			pending);

		offset = ipa_reg_irq_clr_offset(ipa->version);

		offset = ipa_reg_irq_clr_offset(ipa->version);

		iowrite32(pending, ipa->reg_virt + offset);

		iowrite32(pending, ipa->reg_virt + offset);

	}

	}

out_clock_put:

out_power_put:

	(void)ipa_clock_put(ipa);

	(void)pm_runtime_put(dev);





	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}