Commit 5b8d98f1 authored by Himadri Pandya's avatar Himadri Pandya Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: rename bSurpriseRemoved to surprise_removed 



 - Rename structure field bSurprisedRemoved to surprised_removed to avoid
camelcase. Suggested by checkpatch.
 - Change type to bool as the variable is used as a boolean.

Signed-off-by: default avatarHimadri Pandya <himadri18.07@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ec6fc6f

drivers/staging/rtl8712/drv_types.h

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ struct _adapter { 
	struct	led_priv	ledpriv;

	struct mp_priv  mppriv;

	bool	driver_stopped;

	s32	bSurpriseRemoved;

	bool	surprise_removed;

	s32	bSuspended;

	u32	IsrContent;

	u32	ImrContent;

drivers/staging/rtl8712/os_intfs.c

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static int netdev_open(struct net_device *pnetdev) 
	mutex_lock(&padapter->mutex_start);

	if (!padapter->bup) {

		padapter->driver_stopped = false;

		padapter->bSurpriseRemoved = false;

		padapter->surprise_removed = false;

		padapter->bup = true;

		if (rtl871x_hal_init(padapter) != _SUCCESS)

			goto netdev_open_error;

drivers/staging/rtl8712/rtl8712_cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ int r8712_cmd_thread(void *context) 
	while (1) {

		if (wait_for_completion_interruptible(cmd_queue_comp))

			break;

		if (padapter->driver_stopped || padapter->bSurpriseRemoved)

		if (padapter->driver_stopped || padapter->surprise_removed)

			break;

		if (r8712_register_cmd_alive(padapter) != _SUCCESS)

			continue;
@@ -369,7 +369,7 @@ int r8712_cmd_thread(void *context) 
			memcpy((u8 *)pcmdbuf, pcmd->parmbuf, pcmd->cmdsz);

			while (check_cmd_fifo(padapter, wr_sz) == _FAIL) {

				if (padapter->driver_stopped ||

				    padapter->bSurpriseRemoved)

				    padapter->surprise_removed)

					break;

				msleep(100);

				continue;

drivers/staging/rtl8712/rtl8712_io.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ void r8712_read_mem(struct _adapter *adapter, u32 addr, u32 cnt, u8 *pmem) 
{

	struct intf_hdl *hdl = &adapter->pio_queue->intf;



	if (adapter->driver_stopped || adapter->bSurpriseRemoved)

	if (adapter->driver_stopped || adapter->surprise_removed)

		return;



	hdl->io_ops._read_mem(hdl, addr, cnt, pmem);
@@ -85,7 +85,7 @@ void r8712_read_port(struct _adapter *adapter, u32 addr, u32 cnt, u8 *pmem) 
{

	struct intf_hdl *hdl = &adapter->pio_queue->intf;



	if (adapter->driver_stopped || adapter->bSurpriseRemoved)

	if (adapter->driver_stopped || adapter->surprise_removed)

		return;



	hdl->io_ops._read_port(hdl, addr, cnt, pmem);

drivers/staging/rtl8712/rtl8712_led.c

+3 −3
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static void SwLedOn(struct _adapter *padapter, struct LED_871x *pLed) 
{

	u8	LedCfg;



	if (padapter->bSurpriseRemoved || padapter->driver_stopped)

	if (padapter->surprise_removed || padapter->driver_stopped)

		return;

	LedCfg = r8712_read8(padapter, LEDCFG);

	switch (pLed->LedPin) {
@@ -137,7 +137,7 @@ static void SwLedOff(struct _adapter *padapter, struct LED_871x *pLed) 
{

	u8	LedCfg;



	if (padapter->bSurpriseRemoved || padapter->driver_stopped)

	if (padapter->surprise_removed || padapter->driver_stopped)

		return;

	LedCfg = r8712_read8(padapter, LEDCFG);

	switch (pLed->LedPin) {
@@ -816,7 +816,7 @@ static void BlinkTimerCallback(struct timer_list *t) 
	/* This fixed the crash problem on Fedora 12 when trying to do the

	 * insmod;ifconfig up;rmmod commands.

	 */

	if (pLed->padapter->bSurpriseRemoved || pLed->padapter->driver_stopped)

	if (pLed->padapter->surprise_removed || pLed->padapter->driver_stopped)

		return;

	schedule_work(&pLed->BlinkWorkItem);

}