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

Commit 2b08da3f authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Cleanup/optimize set_state() function callback function 



* Reduce goto usage
* Mark if-statements which are true on hardware error unlikely()
* Cleanup debug messages

This makes the code look nicer and be better optimized since
the chance of hardware errors should be very small.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9dad92b9

drivers/net/wireless/rt2x00/rt2400pci.c

+27 −29
Original line number Diff line number Diff line
@@ -781,25 +781,32 @@ static int rt2400pci_init_registers(struct rt2x00_dev *rt2x00dev) 
	return 0;

}



static int rt2400pci_init_bbp(struct rt2x00_dev *rt2x00dev)

static int rt2400pci_wait_bbp_ready(struct rt2x00_dev *rt2x00dev)

{

	unsigned int i;

	u16 eeprom;

	u8 reg_id;

	u8 value;



	for (i = 0; i < REGISTER_BUSY_COUNT; i++) {

		rt2400pci_bbp_read(rt2x00dev, 0, &value);

		if ((value != 0xff) && (value != 0x00))

			goto continue_csr_init;

		NOTICE(rt2x00dev, "Waiting for BBP register.\n");

			return 0;

		udelay(REGISTER_BUSY_DELAY);

	}



	ERROR(rt2x00dev, "BBP register access failed, aborting.\n");

	return -EACCES;

}



static int rt2400pci_init_bbp(struct rt2x00_dev *rt2x00dev)

{

	unsigned int i;

	u16 eeprom;

	u8 reg_id;

	u8 value;



	if (unlikely(rt2400pci_wait_bbp_ready(rt2x00dev)))

		return -EACCES;



continue_csr_init:

	rt2400pci_bbp_write(rt2x00dev, 1, 0x00);

	rt2400pci_bbp_write(rt2x00dev, 3, 0x27);

	rt2400pci_bbp_write(rt2x00dev, 4, 0x08);
@@ -838,7 +845,8 @@ static void rt2400pci_toggle_rx(struct rt2x00_dev *rt2x00dev, 


	rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg);

	rt2x00_set_field32(&reg, RXCSR0_DISABLE_RX,

			   state == STATE_RADIO_RX_OFF);

			   (state == STATE_RADIO_RX_OFF) ||

			   (state == STATE_RADIO_RX_OFF_LINK));

	rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);

}
@@ -875,17 +883,10 @@ static int rt2400pci_enable_radio(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Initialize all registers.

	 */

	if (rt2400pci_init_queues(rt2x00dev) ||

	if (unlikely(rt2400pci_init_queues(rt2x00dev) ||

		     rt2400pci_init_registers(rt2x00dev) ||

	    rt2400pci_init_bbp(rt2x00dev)) {

		ERROR(rt2x00dev, "Register initialization failed.\n");

		     rt2400pci_init_bbp(rt2x00dev)))

		return -EIO;

	}



	/*

	 * Enable interrupts.

	 */

	rt2400pci_toggle_irq(rt2x00dev, STATE_RADIO_IRQ_ON);



	return 0;

}
@@ -907,11 +908,6 @@ static void rt2400pci_disable_radio(struct rt2x00_dev *rt2x00dev) 
	rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);

	rt2x00_set_field32(&reg, TXCSR0_ABORT, 1);

	rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);



	/*

	 * Disable interrupts.

	 */

	rt2400pci_toggle_irq(rt2x00dev, STATE_RADIO_IRQ_OFF);

}



static int rt2400pci_set_state(struct rt2x00_dev *rt2x00dev,
@@ -946,10 +942,6 @@ static int rt2400pci_set_state(struct rt2x00_dev *rt2x00dev, 
		msleep(10);

	}



	NOTICE(rt2x00dev, "Device failed to enter state %d, "

	       "current device state: bbp %d and rf %d.\n",

	       state, bbp_state, rf_state);



	return -EBUSY;

}
@@ -967,11 +959,13 @@ static int rt2400pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
		break;

	case STATE_RADIO_RX_ON:

	case STATE_RADIO_RX_ON_LINK:

		rt2400pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);

		break;

	case STATE_RADIO_RX_OFF:

	case STATE_RADIO_RX_OFF_LINK:

		rt2400pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);

		rt2400pci_toggle_rx(rt2x00dev, state);

		break;

	case STATE_RADIO_IRQ_ON:

	case STATE_RADIO_IRQ_OFF:

		rt2400pci_toggle_irq(rt2x00dev, state);

		break;

	case STATE_DEEP_SLEEP:

	case STATE_SLEEP:
@@ -984,6 +978,10 @@ static int rt2400pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
		break;

	}



	if (unlikely(retval))

		ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",

		      state, retval);



	return retval;

}

drivers/net/wireless/rt2x00/rt2500pci.c

+27 −29
Original line number Diff line number Diff line
@@ -924,25 +924,32 @@ static int rt2500pci_init_registers(struct rt2x00_dev *rt2x00dev) 
	return 0;

}



static int rt2500pci_init_bbp(struct rt2x00_dev *rt2x00dev)

static int rt2500pci_wait_bbp_ready(struct rt2x00_dev *rt2x00dev)

{

	unsigned int i;

	u16 eeprom;

	u8 reg_id;

	u8 value;



	for (i = 0; i < REGISTER_BUSY_COUNT; i++) {

		rt2500pci_bbp_read(rt2x00dev, 0, &value);

		if ((value != 0xff) && (value != 0x00))

			goto continue_csr_init;

		NOTICE(rt2x00dev, "Waiting for BBP register.\n");

			return 0;

		udelay(REGISTER_BUSY_DELAY);

	}



	ERROR(rt2x00dev, "BBP register access failed, aborting.\n");

	return -EACCES;

}



static int rt2500pci_init_bbp(struct rt2x00_dev *rt2x00dev)

{

	unsigned int i;

	u16 eeprom;

	u8 reg_id;

	u8 value;



	if (unlikely(rt2500pci_wait_bbp_ready(rt2x00dev)))

		return -EACCES;



continue_csr_init:

	rt2500pci_bbp_write(rt2x00dev, 3, 0x02);

	rt2500pci_bbp_write(rt2x00dev, 4, 0x19);

	rt2500pci_bbp_write(rt2x00dev, 14, 0x1c);
@@ -997,7 +1004,8 @@ static void rt2500pci_toggle_rx(struct rt2x00_dev *rt2x00dev, 


	rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg);

	rt2x00_set_field32(&reg, RXCSR0_DISABLE_RX,

			   state == STATE_RADIO_RX_OFF);

			   (state == STATE_RADIO_RX_OFF) ||

			   (state == STATE_RADIO_RX_OFF_LINK));

	rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);

}
@@ -1034,17 +1042,10 @@ static int rt2500pci_enable_radio(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Initialize all registers.

	 */

	if (rt2500pci_init_queues(rt2x00dev) ||

	if (unlikely(rt2500pci_init_queues(rt2x00dev) ||

		     rt2500pci_init_registers(rt2x00dev) ||

	    rt2500pci_init_bbp(rt2x00dev)) {

		ERROR(rt2x00dev, "Register initialization failed.\n");

		     rt2500pci_init_bbp(rt2x00dev)))

		return -EIO;

	}



	/*

	 * Enable interrupts.

	 */

	rt2500pci_toggle_irq(rt2x00dev, STATE_RADIO_IRQ_ON);



	return 0;

}
@@ -1066,11 +1067,6 @@ static void rt2500pci_disable_radio(struct rt2x00_dev *rt2x00dev) 
	rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);

	rt2x00_set_field32(&reg, TXCSR0_ABORT, 1);

	rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);



	/*

	 * Disable interrupts.

	 */

	rt2500pci_toggle_irq(rt2x00dev, STATE_RADIO_IRQ_OFF);

}



static int rt2500pci_set_state(struct rt2x00_dev *rt2x00dev,
@@ -1105,10 +1101,6 @@ static int rt2500pci_set_state(struct rt2x00_dev *rt2x00dev, 
		msleep(10);

	}



	NOTICE(rt2x00dev, "Device failed to enter state %d, "

	       "current device state: bbp %d and rf %d.\n",

	       state, bbp_state, rf_state);



	return -EBUSY;

}
@@ -1126,11 +1118,13 @@ static int rt2500pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
		break;

	case STATE_RADIO_RX_ON:

	case STATE_RADIO_RX_ON_LINK:

		rt2500pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);

		break;

	case STATE_RADIO_RX_OFF:

	case STATE_RADIO_RX_OFF_LINK:

		rt2500pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);

		rt2500pci_toggle_rx(rt2x00dev, state);

		break;

	case STATE_RADIO_IRQ_ON:

	case STATE_RADIO_IRQ_OFF:

		rt2500pci_toggle_irq(rt2x00dev, state);

		break;

	case STATE_DEEP_SLEEP:

	case STATE_SLEEP:
@@ -1143,6 +1137,10 @@ static int rt2500pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
		break;

	}



	if (unlikely(retval))

		ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",

		      state, retval);



	return retval;

}

drivers/net/wireless/rt2x00/rt2500usb.c

+26 −18
Original line number Diff line number Diff line
@@ -847,25 +847,32 @@ static int rt2500usb_init_registers(struct rt2x00_dev *rt2x00dev) 
	return 0;

}



static int rt2500usb_init_bbp(struct rt2x00_dev *rt2x00dev)

static int rt2500usb_wait_bbp_ready(struct rt2x00_dev *rt2x00dev)

{

	unsigned int i;

	u16 eeprom;

	u8 value;

	u8 reg_id;



	for (i = 0; i < REGISTER_BUSY_COUNT; i++) {

		rt2500usb_bbp_read(rt2x00dev, 0, &value);

		if ((value != 0xff) && (value != 0x00))

			goto continue_csr_init;

		NOTICE(rt2x00dev, "Waiting for BBP register.\n");

			return 0;

		udelay(REGISTER_BUSY_DELAY);

	}



	ERROR(rt2x00dev, "BBP register access failed, aborting.\n");

	return -EACCES;

}



static int rt2500usb_init_bbp(struct rt2x00_dev *rt2x00dev)

{

	unsigned int i;

	u16 eeprom;

	u8 value;

	u8 reg_id;



	if (unlikely(rt2500usb_wait_bbp_ready(rt2x00dev)))

		return -EACCES;



continue_csr_init:

	rt2500usb_bbp_write(rt2x00dev, 3, 0x02);

	rt2500usb_bbp_write(rt2x00dev, 4, 0x19);

	rt2500usb_bbp_write(rt2x00dev, 14, 0x1c);
@@ -921,7 +928,8 @@ static void rt2500usb_toggle_rx(struct rt2x00_dev *rt2x00dev, 


	rt2500usb_register_read(rt2x00dev, TXRX_CSR2, &reg);

	rt2x00_set_field16(&reg, TXRX_CSR2_DISABLE_RX,

			   state == STATE_RADIO_RX_OFF);

			   (state == STATE_RADIO_RX_OFF) ||

			   (state == STATE_RADIO_RX_OFF_LINK));

	rt2500usb_register_write(rt2x00dev, TXRX_CSR2, reg);

}
@@ -930,11 +938,9 @@ static int rt2500usb_enable_radio(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Initialize all registers.

	 */

	if (rt2500usb_init_registers(rt2x00dev) ||

	    rt2500usb_init_bbp(rt2x00dev)) {

		ERROR(rt2x00dev, "Register initialization failed.\n");

	if (unlikely(rt2500usb_init_registers(rt2x00dev) ||

		     rt2500usb_init_bbp(rt2x00dev)))

		return -EIO;

	}



	return 0;

}
@@ -987,10 +993,6 @@ static int rt2500usb_set_state(struct rt2x00_dev *rt2x00dev, 
		msleep(30);

	}



	NOTICE(rt2x00dev, "Device failed to enter state %d, "

	       "current device state: bbp %d and rf %d.\n",

	       state, bbp_state, rf_state);



	return -EBUSY;

}
@@ -1008,11 +1010,13 @@ static int rt2500usb_set_device_state(struct rt2x00_dev *rt2x00dev, 
		break;

	case STATE_RADIO_RX_ON:

	case STATE_RADIO_RX_ON_LINK:

		rt2500usb_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);

		break;

	case STATE_RADIO_RX_OFF:

	case STATE_RADIO_RX_OFF_LINK:

		rt2500usb_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);

		rt2500usb_toggle_rx(rt2x00dev, state);

		break;

	case STATE_RADIO_IRQ_ON:

	case STATE_RADIO_IRQ_OFF:

		/* No support, but no error either */

		break;

	case STATE_DEEP_SLEEP:

	case STATE_SLEEP:
@@ -1025,6 +1029,10 @@ static int rt2500usb_set_device_state(struct rt2x00_dev *rt2x00dev, 
		break;

	}



	if (unlikely(retval))

		ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",

		      state, retval);



	return retval;

}

drivers/net/wireless/rt2x00/rt2x00dev.c

+3 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev) 
	if (status)

		return status;



	rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_RADIO_IRQ_ON);



	rt2x00leds_led_radio(rt2x00dev, true);

	rt2x00led_led_activity(rt2x00dev, true);
@@ -157,6 +159,7 @@ void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev) 
	 * Disable radio.

	 */

	rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_RADIO_OFF);

	rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_RADIO_IRQ_OFF);

	rt2x00led_led_activity(rt2x00dev, false);

	rt2x00leds_led_radio(rt2x00dev, false);

}

drivers/net/wireless/rt2x00/rt61pci.c

+29 −32
Original line number Diff line number Diff line
@@ -1270,25 +1270,32 @@ static int rt61pci_init_registers(struct rt2x00_dev *rt2x00dev) 
	return 0;

}



static int rt61pci_init_bbp(struct rt2x00_dev *rt2x00dev)

static int rt61pci_wait_bbp_ready(struct rt2x00_dev *rt2x00dev)

{

	unsigned int i;

	u16 eeprom;

	u8 reg_id;

	u8 value;



	for (i = 0; i < REGISTER_BUSY_COUNT; i++) {

		rt61pci_bbp_read(rt2x00dev, 0, &value);

		if ((value != 0xff) && (value != 0x00))

			goto continue_csr_init;

		NOTICE(rt2x00dev, "Waiting for BBP register.\n");

			return 0;

		udelay(REGISTER_BUSY_DELAY);

	}



	ERROR(rt2x00dev, "BBP register access failed, aborting.\n");

	return -EACCES;

}



static int rt61pci_init_bbp(struct rt2x00_dev *rt2x00dev)

{

	unsigned int i;

	u16 eeprom;

	u8 reg_id;

	u8 value;



	if (unlikely(rt61pci_wait_bbp_ready(rt2x00dev)))

		return -EACCES;



continue_csr_init:

	rt61pci_bbp_write(rt2x00dev, 3, 0x00);

	rt61pci_bbp_write(rt2x00dev, 15, 0x30);

	rt61pci_bbp_write(rt2x00dev, 21, 0xc8);
@@ -1337,7 +1344,8 @@ static void rt61pci_toggle_rx(struct rt2x00_dev *rt2x00dev, 


	rt2x00pci_register_read(rt2x00dev, TXRX_CSR0, &reg);

	rt2x00_set_field32(&reg, TXRX_CSR0_DISABLE_RX,

			   state == STATE_RADIO_RX_OFF);

			   (state == STATE_RADIO_RX_OFF) ||

			   (state == STATE_RADIO_RX_OFF_LINK));

	rt2x00pci_register_write(rt2x00dev, TXRX_CSR0, reg);

}
@@ -1389,17 +1397,10 @@ static int rt61pci_enable_radio(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Initialize all registers.

	 */

	if (rt61pci_init_queues(rt2x00dev) ||

	if (unlikely(rt61pci_init_queues(rt2x00dev) ||

		     rt61pci_init_registers(rt2x00dev) ||

	    rt61pci_init_bbp(rt2x00dev)) {

		ERROR(rt2x00dev, "Register initialization failed.\n");

		     rt61pci_init_bbp(rt2x00dev)))

		return -EIO;

	}



	/*

	 * Enable interrupts.

	 */

	rt61pci_toggle_irq(rt2x00dev, STATE_RADIO_IRQ_ON);



	/*

	 * Enable RX.
@@ -1431,11 +1432,6 @@ static void rt61pci_disable_radio(struct rt2x00_dev *rt2x00dev) 
	rt2x00_set_field32(&reg, TX_CNTL_CSR_ABORT_TX_AC2, 1);

	rt2x00_set_field32(&reg, TX_CNTL_CSR_ABORT_TX_AC3, 1);

	rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg);



	/*

	 * Disable interrupts.

	 */

	rt61pci_toggle_irq(rt2x00dev, STATE_RADIO_IRQ_OFF);

}



static int rt61pci_set_state(struct rt2x00_dev *rt2x00dev, enum dev_state state)
@@ -1443,7 +1439,6 @@ static int rt61pci_set_state(struct rt2x00_dev *rt2x00dev, enum dev_state state) 
	u32 reg;

	unsigned int i;

	char put_to_sleep;

	char current_state;



	put_to_sleep = (state != STATE_AWAKE);
@@ -1459,16 +1454,12 @@ static int rt61pci_set_state(struct rt2x00_dev *rt2x00dev, enum dev_state state) 
	 */

	for (i = 0; i < REGISTER_BUSY_COUNT; i++) {

		rt2x00pci_register_read(rt2x00dev, MAC_CSR12, &reg);

		current_state =

		    rt2x00_get_field32(reg, MAC_CSR12_BBP_CURRENT_STATE);

		if (current_state == !put_to_sleep)

		state = rt2x00_get_field32(reg, MAC_CSR12_BBP_CURRENT_STATE);

		if (state == !put_to_sleep)

			return 0;

		msleep(10);

	}



	NOTICE(rt2x00dev, "Device failed to enter state %d, "

	       "current device state %d.\n", !put_to_sleep, current_state);



	return -EBUSY;

}
@@ -1486,11 +1477,13 @@ static int rt61pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
		break;

	case STATE_RADIO_RX_ON:

	case STATE_RADIO_RX_ON_LINK:

		rt61pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);

		break;

	case STATE_RADIO_RX_OFF:

	case STATE_RADIO_RX_OFF_LINK:

		rt61pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);

		rt61pci_toggle_rx(rt2x00dev, state);

		break;

	case STATE_RADIO_IRQ_ON:

	case STATE_RADIO_IRQ_OFF:

		rt61pci_toggle_irq(rt2x00dev, state);

		break;

	case STATE_DEEP_SLEEP:

	case STATE_SLEEP:
@@ -1503,6 +1496,10 @@ static int rt61pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
		break;

	}



	if (unlikely(retval))

		ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",

		      state, retval);



	return retval;

}