Commit 906ad742 authored by Deepak Mishra's avatar Deepak Mishra Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: Fixed CamelCase for EepromAddressSize 



This patch renames CamelCase EepromAddressSizefrom to eeprom_address_size in
struct _adapter and in related files drv_types.h, rtl871x_eeprom.c, usb_intf.c

This was reported by checkpatch.pl

Signed-off-by: default avatarDeepak Mishra <linux.dkm@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2af0ada2

drivers/staging/rtl8712/drv_types.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ struct _adapter { 
	bool	suspended;

	u32	IsrContent;

	u32	ImrContent;

	u8	EepromAddressSize;

	u8	eeprom_address_size;

	u8	hw_init_completed;

	struct task_struct *cmdThread;

	pid_t evtThread;

drivers/staging/rtl8712/rtl871x_eeprom.c

+3 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ void r8712_eeprom_write16(struct _adapter *padapter, u16 reg, u16 data) 
	x |= _EEM1 | _EECS;

	r8712_write8(padapter, EE_9346CR, x);

	shift_out_bits(padapter, EEPROM_EWEN_OPCODE, 5);

	if (padapter->EepromAddressSize == 8)	/*CF+ and SDIO*/

	if (padapter->eeprom_address_size == 8)	/*CF+ and SDIO*/

		shift_out_bits(padapter, 0, 6);

	else	/* USB */

		shift_out_bits(padapter, 0, 4);
@@ -165,7 +165,7 @@ void r8712_eeprom_write16(struct _adapter *padapter, u16 reg, u16 data) 
	 */

	shift_out_bits(padapter, EEPROM_WRITE_OPCODE, 3);

	/* select which word in the EEPROM that we are writing to. */

	shift_out_bits(padapter, reg, padapter->EepromAddressSize);

	shift_out_bits(padapter, reg, padapter->eeprom_address_size);

	/* write the data to the selected EEPROM word. */

	shift_out_bits(padapter, data, 16);

	if (wait_eeprom_cmd_done(padapter)) {
@@ -207,7 +207,7 @@ u16 r8712_eeprom_read16(struct _adapter *padapter, u16 reg) /*ReadEEprom*/ 
	 * The opcode is 3bits in length, reg is 6 bits long

	 */

	shift_out_bits(padapter, EEPROM_READ_OPCODE, 3);

	shift_out_bits(padapter, reg, padapter->EepromAddressSize);

	shift_out_bits(padapter, reg, padapter->eeprom_address_size);

	/* Now read the data (16 bits) in from the selected EEPROM word */

	data = shift_in_bits(padapter);

	eeprom_clean(padapter);

drivers/staging/rtl8712/usb_intf.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static uint r8712_usb_dvobj_init(struct _adapter *padapter) 
	struct usb_device *pusbd = pdvobjpriv->pusbdev;



	pdvobjpriv->padapter = padapter;

	padapter->EepromAddressSize = 6;

	padapter->eeprom_address_size = 6;

	phost_iface = &pintf->altsetting[0];

	piface_desc = &phost_iface->desc;

	pdvobjpriv->nr_endpoint = piface_desc->bNumEndpoints;