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

Commit 6167a6c8 authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Rename rt_firmware::firmware_status to status 



Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 292f4b47

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+4 −4
Original line number Diff line number Diff line
@@ -719,19 +719,19 @@ bool rtl92e_start_adapter(struct net_device *dev) 
		rtl92e_writeb(dev, ANAPAR, 0x37);

		mdelay(500);

	}

	priv->pFirmware->firmware_status = FW_STATUS_0_INIT;

	priv->pFirmware->status = FW_STATUS_0_INIT;



	if (priv->RegRfOff)

		priv->rtllib->eRFPowerState = eRfOff;



	ulRegRead = rtl92e_readl(dev, CPU_GEN);

	if (priv->pFirmware->firmware_status == FW_STATUS_0_INIT)

	if (priv->pFirmware->status == FW_STATUS_0_INIT)

		ulRegRead |= CPU_GEN_SYSTEM_RESET;

	else if (priv->pFirmware->firmware_status == FW_STATUS_5_READY)

	else if (priv->pFirmware->status == FW_STATUS_5_READY)

		ulRegRead |= CPU_GEN_FIRMWARE_RESET;

	else

		netdev_err(dev, "%s(): undefined firmware state: %d.\n",

			   __func__, priv->pFirmware->firmware_status);

			   __func__, priv->pFirmware->status);



	rtl92e_writel(dev, CPU_GEN, ulRegRead);

drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c

+7 −7
Original line number Diff line number Diff line
@@ -168,27 +168,27 @@ static bool _rtl92e_fw_check_ready(struct net_device *dev, 


	switch (load_fw_status) {

	case FW_INIT_STEP0_BOOT:

		pfirmware->firmware_status = FW_STATUS_1_MOVE_BOOT_CODE;

		pfirmware->status = FW_STATUS_1_MOVE_BOOT_CODE;

		break;



	case FW_INIT_STEP1_MAIN:

		pfirmware->firmware_status = FW_STATUS_2_MOVE_MAIN_CODE;

		pfirmware->status = FW_STATUS_2_MOVE_MAIN_CODE;



		rt_status = _rtl92e_fw_boot_cpu(dev);

		if (rt_status)

			pfirmware->firmware_status = FW_STATUS_3_TURNON_CPU;

			pfirmware->status = FW_STATUS_3_TURNON_CPU;

		else

			RT_TRACE(COMP_FIRMWARE, "_rtl92e_fw_boot_cpu fail!\n");



		break;



	case FW_INIT_STEP2_DATA:

		pfirmware->firmware_status = FW_STATUS_4_MOVE_DATA_CODE;

		pfirmware->status = FW_STATUS_4_MOVE_DATA_CODE;

		mdelay(1);



		rt_status = _rtl92e_is_fw_ready(dev);

		if (rt_status)

			pfirmware->firmware_status = FW_STATUS_5_READY;

			pfirmware->status = FW_STATUS_5_READY;

		else

			RT_TRACE(COMP_FIRMWARE,

				 "_rtl92e_is_fw_ready fail(%d)!\n",
@@ -219,11 +219,11 @@ bool rtl92e_init_fw(struct net_device *dev) 


	RT_TRACE(COMP_FIRMWARE, " PlatformInitFirmware()==>\n");



	if (pfirmware->firmware_status == FW_STATUS_0_INIT) {

	if (pfirmware->status == FW_STATUS_0_INIT) {

		rst_opt = OPT_SYSTEM_RESET;

		starting_state = FW_INIT_STEP0_BOOT;



	} else if (pfirmware->firmware_status == FW_STATUS_5_READY) {

	} else if (pfirmware->status == FW_STATUS_5_READY) {

		rst_opt = OPT_FIRMWARE_RESET;

		starting_state = FW_INIT_STEP2_DATA;

	} else {

drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct rt_fw_blob { 


#define FW_BLOBS 3

struct rt_firmware {

	enum firmware_status firmware_status;

	enum firmware_status status;

	struct rt_fw_blob blobs[FW_BLOBS];

};