Commit 19790951 authored by Alex Elder's avatar Alex Elder Committed by Paolo Abeni
Browse files

net: ipa: call device_init_wakeup() earlier 



Currently, enabling wakeup for the IPA device doesn't occur until
the setup phase of initialization (in ipa_power_setup()).

There is no need to delay doing that, however.  We can conveniently
do it during the config phase, in ipa_interrupt_config(), where we
enable power management wakeup mode for the IPA interrupt.

Moving the device_init_wakeup() out of ipa_power_setup() leaves that
function empty, so it can just be eliminated.

Similarly, rearrange all of the matching inverse calls, disabling
device wakeup in ipa_interrupt_deconfig() and removing that function
as well.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 6f370026

drivers/net/ipa/ipa_interrupt.c

+10 −1
Original line number Diff line number Diff line
@@ -277,17 +277,25 @@ int ipa_interrupt_config(struct ipa *ipa) 
		goto err_free_bitmap;

	}



	ret = device_init_wakeup(dev, true);

	if (ret) {

		dev_err(dev, "error %d enabling wakeup\n", ret);

		goto err_free_irq;

	}



	ret = dev_pm_set_wake_irq(dev, irq);

	if (ret) {

		dev_err(dev, "error %d registering \"ipa\" IRQ as wakeirq\n",

			ret);

		goto err_free_irq;

		goto err_disable_wakeup;

	}



	ipa->interrupt = interrupt;



	return 0;



err_disable_wakeup:

	(void)device_init_wakeup(dev, false);

err_free_irq:

	free_irq(interrupt->irq, interrupt);

err_free_bitmap:
@@ -307,6 +315,7 @@ void ipa_interrupt_deconfig(struct ipa *ipa) 
	ipa->interrupt = NULL;



	dev_pm_clear_wake_irq(dev);

	(void)device_init_wakeup(dev, false);

	free_irq(interrupt->irq, interrupt);

	bitmap_free(interrupt->suspend_enabled);

}

drivers/net/ipa/ipa_main.c

+0 −7
Original line number Diff line number Diff line
@@ -119,10 +119,6 @@ int ipa_setup(struct ipa *ipa) 
	if (ret)

		return ret;



	ret = ipa_power_setup(ipa);

	if (ret)

		goto err_gsi_teardown;



	ipa_endpoint_setup(ipa);



	/* We need to use the AP command TX endpoint to perform other
@@ -169,8 +165,6 @@ int ipa_setup(struct ipa *ipa) 
	ipa_endpoint_disable_one(command_endpoint);

err_endpoint_teardown:

	ipa_endpoint_teardown(ipa);

	ipa_power_teardown(ipa);

err_gsi_teardown:

	gsi_teardown(&ipa->gsi);



	return ret;
@@ -195,7 +189,6 @@ static void ipa_teardown(struct ipa *ipa) 
	command_endpoint = ipa->name_map[IPA_ENDPOINT_AP_COMMAND_TX];

	ipa_endpoint_disable_one(command_endpoint);

	ipa_endpoint_teardown(ipa);

	ipa_power_teardown(ipa);

	gsi_teardown(&ipa->gsi);

}

drivers/net/ipa/ipa_power.c

+0 −10
Original line number Diff line number Diff line
@@ -232,16 +232,6 @@ void ipa_power_retention(struct ipa *ipa, bool enable) 
			ret, enable ? "en" : "dis");

}



int ipa_power_setup(struct ipa *ipa)

{

	return device_init_wakeup(ipa->dev, true);

}



void ipa_power_teardown(struct ipa *ipa)

{

	(void)device_init_wakeup(ipa->dev, false);

}



/* Initialize IPA power management */

struct ipa_power *

ipa_power_init(struct device *dev, const struct ipa_power_data *data)

drivers/net/ipa/ipa_power.h

+0 −14
Original line number Diff line number Diff line
@@ -31,20 +31,6 @@ u32 ipa_core_clock_rate(struct ipa *ipa); 
 */

void ipa_power_retention(struct ipa *ipa, bool enable);



/**

 * ipa_power_setup() - Set up IPA power management

 * @ipa:	IPA pointer

 *

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

 */

int ipa_power_setup(struct ipa *ipa);



/**

 * ipa_power_teardown() - Inverse of ipa_power_setup()

 * @ipa:	IPA pointer

 */

void ipa_power_teardown(struct ipa *ipa);



/**

 * ipa_power_init() - Initialize IPA power management

 * @dev:	IPA device