Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 410ff19d authored by Arun Kumar Khandavalli's avatar Arun Kumar Khandavalli Committed by nshrivas
Browse files

qcacld-3.0: Remove block/unblock shutdown cb 

Modem block/unblock shutdown callbacks are added to syncronize modem
shutdown when the driver is in deinit sequence.

With new changes everything is synchronized via the platform driver,
So remove the the block/unblock shutdown callback's.

Change-Id: If66eed5b51bbce64f024edf49e37a21b222a6a4c
CRs-Fixed: 2489733
parent 2eaac995

core/hdd/src/wlan_hdd_main.c

+0 −5
Original line number Diff line number Diff line
@@ -9565,17 +9565,12 @@ int hdd_psoc_idle_shutdown(struct device *dev) 


	hdd_enter();



	/* Block the modem graceful shutdown till stop modules is completed */

	pld_block_shutdown(hdd_ctx->parent_dev, HDD_BLOCK_MODEM_SHUTDOWN);



	ret = hdd_wlan_stop_modules(hdd_ctx, false);

	if (ret) {

		hdd_err("Failed to start modules");

		return ret;

	}



	pld_block_shutdown(hdd_ctx->parent_dev, HDD_UNBLOCK_MODEM_SHUTDOWN);



	hdd_exit();



	return 0;

core/pld/inc/pld_common.h

+0 −1
Original line number Diff line number Diff line
@@ -577,7 +577,6 @@ void pld_get_msi_address(struct device *dev, uint32_t *msi_addr_low, 
unsigned int pld_socinfo_get_serial_number(struct device *dev);

int pld_is_qmi_disable(struct device *dev);

int pld_is_fw_down(struct device *dev);

void pld_block_shutdown(struct device *dev, bool status);

int pld_force_assert_target(struct device *dev);

bool pld_is_fw_dump_skipped(struct device *dev);

core/pld/src/pld_common.c

+0 −24
Original line number Diff line number Diff line
@@ -1604,30 +1604,6 @@ int pld_is_fw_rejuvenate(struct device *dev) 
	return ret;

}



/**

 * pld_block_shutdown() - Block/Unblock modem shutdown

 * @dev: device

 * @status: status true or false

 *

 * This API will be called to Block/Unblock modem shutdown.

 * True - Block shutdown

 * False - Unblock shutdown

 *

 * Return: None

 */

void pld_block_shutdown(struct device *dev, bool status)

{

	enum pld_bus_type type = pld_get_bus_type(dev);



	switch (type) {

	case PLD_BUS_TYPE_SNOC:

		pld_snoc_block_shutdown(status);

		break;

	default:

		break;

	}

}



int pld_idle_shutdown(struct device *dev,

		      int (*shutdown_cb)(struct device *dev))

{

core/pld/src/pld_snoc.h

+0 −9
Original line number Diff line number Diff line
@@ -146,10 +146,6 @@ static inline int pld_snoc_is_fw_rejuvenate(void) 
{

	return 0;

}

static inline void pld_snoc_block_shutdown(bool status)

{

}



#else

int pld_snoc_register_driver(void);

void pld_snoc_unregister_driver(void);
@@ -288,11 +284,6 @@ static inline int pld_snoc_is_fw_rejuvenate(void) 
{

	return icnss_is_rejuvenate();

}

static inline void pld_snoc_block_shutdown(bool status)

{

	icnss_block_shutdown(status);

}



static inline int pld_snoc_idle_restart(struct device *dev)

{

	return icnss_idle_restart(dev);