Commit b7ac48fa authored by Mark Einon's avatar Mark Einon Committed by Greg Kroah-Hartman
Browse files

staging: et131x: Remove typedefs from et1310_phy.h 



Fixes the associated checkpatch warnings.
Tested with ifconfig/general use of a device (Agere Systems ET-131x PCI-E
Ethernet Controller (rev 02)).

Signed-off-by: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 13425aa1

drivers/staging/et131x/et1310_phy.c

+8 −7
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ static void et131x_xcvr_init(struct et131x_adapter *etdev) 
	u16 lcr2;



	/* Zero out the adapter structure variable representing BMSR */

	etdev->Bmsr.value = 0;

	etdev->bmsr = 0;



	MiRead(etdev, (u8) offsetof(struct mi_regs, isr), &isr);

	MiRead(etdev, (u8) offsetof(struct mi_regs, imr), &imr);
@@ -729,7 +729,7 @@ static void et131x_xcvr_init(struct et131x_adapter *etdev) 
}



void et131x_Mii_check(struct et131x_adapter *etdev,

		      MI_BMSR_t bmsr, MI_BMSR_t bmsr_ints)

		      u16 bmsr, u16 bmsr_ints)

{

	u8 link_status;

	u32 autoneg_status;
@@ -740,8 +740,8 @@ void et131x_Mii_check(struct et131x_adapter *etdev, 
	u32 polarity;

	unsigned long flags;



	if (bmsr_ints.bits.link_status) {

		if (bmsr.bits.link_status) {

	if (bmsr_ints & MI_BMSR_LINK_STATUS) {

		if (bmsr & MI_BMSR_LINK_STATUS) {

			etdev->boot_coma = 20;



			/* Update our state variables and indicate the
@@ -820,9 +820,10 @@ void et131x_Mii_check(struct et131x_adapter *etdev, 
		}

	}



	if (bmsr_ints.bits.auto_neg_complete ||

	    (etdev->AiForceDpx == 3 && bmsr_ints.bits.link_status)) {

		if (bmsr.bits.auto_neg_complete || etdev->AiForceDpx == 3) {

	if ((bmsr_ints & MI_BMSR_AUTO_NEG_COMPLETE) ||

	    (etdev->AiForceDpx == 3 && (bmsr_ints & MI_BMSR_LINK_STATUS))) {

		if ((bmsr & MI_BMSR_AUTO_NEG_COMPLETE) ||

		    etdev->AiForceDpx == 3) {

			ET1310_PhyLinkStatus(etdev,

					     &link_status, &autoneg_status,

					     &speed, &duplex, &mdi_mdix,

drivers/staging/et131x/et1310_phy.h

+58 −111
Original line number Diff line number Diff line
@@ -126,119 +126,66 @@ struct mi_regs { 
	u8 mi_res4[3];	/* Future use by MI working group(Reg 0x1D - 0x1F) */

};



/* MI Register 0: Basic mode control register */

typedef union _MI_BMCR_t {

	u16 value;

	struct {

#ifdef _BIT_FIELDS_HTOL

		u16 reset:1;		/* bit 15 */

		u16 loopback:1;		/* bit 14 */

		u16 speed_sel:1;		/* bit 13 */

		u16 enable_autoneg:1;	/* bit 12 */

		u16 power_down:1;		/* bit 11 */

		u16 isolate:1;		/* bit 10 */

		u16 restart_autoneg:1;	/* bit 9 */

		u16 duplex_mode:1;		/* bit 8 */

		u16 col_test:1;		/* bit 7 */

		u16 speed_1000_sel:1;	/* bit 6 */

		u16 res1:6;		/* bits 0-5 */

#else

		u16 res1:6;		/* bits 0-5 */

		u16 speed_1000_sel:1;	/* bit 6 */

		u16 col_test:1;		/* bit 7 */

		u16 duplex_mode:1;		/* bit 8 */

		u16 restart_autoneg:1;	/* bit 9 */

		u16 isolate:1;		/* bit 10 */

		u16 power_down:1;		/* bit 11 */

		u16 enable_autoneg:1;	/* bit 12 */

		u16 speed_sel:1;		/* bit 13 */

		u16 loopback:1;		/* bit 14 */

		u16 reset:1;		/* bit 15 */

#endif

	} bits;

} MI_BMCR_t, *PMI_BMCR_t;



/* MI Register 1:  Basic mode status register */

typedef union _MI_BMSR_t {

	u16 value;

	struct {

#ifdef _BIT_FIELDS_HTOL

		u16 link_100T4:1;		/* bit 15 */

		u16 link_100fdx:1;		/* bit 14 */

		u16 link_100hdx:1;		/* bit 13 */

		u16 link_10fdx:1;		/* bit 12 */

		u16 link_10hdx:1;		/* bit 11 */

		u16 link_100T2fdx:1;	/* bit 10 */

		u16 link_100T2hdx:1;	/* bit 9 */

		u16 extend_status:1;	/* bit 8 */

		u16 res1:1;		/* bit 7 */

		u16 preamble_supress:1;	/* bit 6 */

		u16 auto_neg_complete:1;	/* bit 5 */

		u16 remote_fault:1;	/* bit 4 */

		u16 auto_neg_able:1;	/* bit 3 */

		u16 link_status:1;		/* bit 2 */

		u16 jabber_detect:1;	/* bit 1 */

		u16 ext_cap:1;		/* bit 0 */

#else

		u16 ext_cap:1;		/* bit 0 */

		u16 jabber_detect:1;	/* bit 1 */

		u16 link_status:1;		/* bit 2 */

		u16 auto_neg_able:1;	/* bit 3 */

		u16 remote_fault:1;	/* bit 4 */

		u16 auto_neg_complete:1;	/* bit 5 */

		u16 preamble_supress:1;	/* bit 6 */

		u16 res1:1;		/* bit 7 */

		u16 extend_status:1;	/* bit 8 */

		u16 link_100T2hdx:1;	/* bit 9 */

		u16 link_100T2fdx:1;	/* bit 10 */

		u16 link_10hdx:1;		/* bit 11 */

		u16 link_10fdx:1;		/* bit 12 */

		u16 link_100hdx:1;		/* bit 13 */

		u16 link_100fdx:1;		/* bit 14 */

		u16 link_100T4:1;		/* bit 15 */

#endif

	} bits;

} MI_BMSR_t, *PMI_BMSR_t;



/* MI Register 4: Auto-negotiation advertisement register */

typedef union _MI_ANAR_t {

	u16 value;

	struct {

#ifdef _BIT_FIELDS_HTOL

		u16 np_indication:1;	/* bit 15 */

		u16 res2:1;		/* bit 14 */

		u16 remote_fault:1;	/* bit 13 */

		u16 res1:1;		/* bit 12 */

		u16 cap_asmpause:1;	/* bit 11 */

		u16 cap_pause:1;		/* bit 10 */

		u16 cap_100T4:1;		/* bit 9 */

		u16 cap_100fdx:1;		/* bit 8 */

		u16 cap_100hdx:1;		/* bit 7 */

		u16 cap_10fdx:1;		/* bit 6 */

		u16 cap_10hdx:1;		/* bit 5 */

		u16 selector:5;		/* bits 0-4 */

#else

		u16 selector:5;		/* bits 0-4 */

		u16 cap_10hdx:1;		/* bit 5 */

		u16 cap_10fdx:1;		/* bit 6 */

		u16 cap_100hdx:1;		/* bit 7 */

		u16 cap_100fdx:1;		/* bit 8 */

		u16 cap_100T4:1;		/* bit 9 */

		u16 cap_pause:1;		/* bit 10 */

		u16 cap_asmpause:1;	/* bit 11 */

		u16 res1:1;		/* bit 12 */

		u16 remote_fault:1;	/* bit 13 */

		u16 res2:1;		/* bit 14 */

		u16 np_indication:1;	/* bit 15 */

#endif

	} bits;

} MI_ANAR_t, *PMI_ANAR_t;

/*

 * MI Register 0: Basic mode control register

 *	15:	reset

 *	14:	loopback

 *	13:	speed_sel

 *	12:	enable_autoneg

 *	11:	power_down

 *	10:	isolate

 *	9:	restart_autoneg

 *	8:	duplex_mode

 *	7:	col_test

 *	6:	speed_1000_sel

 *	5-0:	res1

 */



/*

 * MI Register 1:  Basic mode status register

 *	15:	link_100T4

 *	14:	link_100fdx

 *	13:	link_100hdx

 *	12:	link_10fdx

 *	11:	link_10hdx

 *	10:	link_100T2fdx

 *	9:	link_100T2hdx

 *	8:	extend_status

 *	7:	res1

 *	6:	preamble_supress

 *	5:	auto_neg_complete

 *	4:	remote_fault

 *	3:	auto_neg_able

 *	2:	link_status

 *	1:	jabber_detect

 *	0:	ext_cap

 */



#define MI_BMSR_LINK_STATUS	  0x04

#define MI_BMSR_AUTO_NEG_COMPLETE 0x20



/*

 * MI Register 4: Auto-negotiation advertisement register

 *

 *	15:	np_indication

 *	14:	res2

 *	13:	remote_fault

 *	12:	res1

 *	11:	cap_asmpause

 *	10:	cap_pause

 *	9:	cap_100T4

 *	8:	cap_100fdx

 *	7:	cap_100hdx

 *	6:	cap_10fdx

 *	5:	cap_10hdx

 *	4-0:	selector

 */



/* MI Register 5: Auto-negotiation link partner advertisement register

 *	15:	np_indication

 *	14:	acknowledge

 *	13:	remote_fault

 *	12:	res1:1;		

 *	12:	res1

 *	11:	cap_asmpause

 *	10:	cap_pause

 *	9:	cap_100T4

drivers/staging/et131x/et131x.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ int PhyMiRead(struct et131x_adapter *adapter, u8 xcvrAddr, 
int32_t MiWrite(struct et131x_adapter *adapter,

		u8 xcvReg, u16 value);

void et131x_Mii_check(struct et131x_adapter *pAdapter,

		      MI_BMSR_t bmsr, MI_BMSR_t bmsr_ints);

		      u16 bmsr, u16 bmsr_ints);



/* This last is not strictly required (the driver could call the TPAL

 * version instead), but this sets the adapter up correctly, and calls the

drivers/staging/et131x/et131x_adapter.h

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ struct et131x_adapter { 
	u32 CachedMaskValue;



	/* Xcvr status at last poll */

	MI_BMSR_t Bmsr;

	u16 bmsr;



	/* Tx Memory Variables */

	struct tx_ring tx_ring;

drivers/staging/et131x/et131x_initpci.c

+2 −2
Original line number Diff line number Diff line
@@ -274,14 +274,14 @@ void et131x_error_timer_handler(unsigned long data) 
		dev_err(&etdev->pdev->dev,

		    "No interrupts, in PHY coma, pm_csr = 0x%x\n", pm_csr);



	if (!etdev->Bmsr.bits.link_status &&

	if (!(etdev->bmsr & MI_BMSR_LINK_STATUS) &&

	    etdev->RegistryPhyComa &&

	    etdev->boot_coma < 11) {

		etdev->boot_coma++;

	}



	if (etdev->boot_coma == 10) {

		if (!etdev->Bmsr.bits.link_status

		if (!(etdev->bmsr & MI_BMSR_LINK_STATUS)

		    && etdev->RegistryPhyComa) {

			if ((pm_csr & ET_PM_PHY_SW_COMA) == 0) {

				/* NOTE - This was originally a 'sync with

CRA Git | Maintained and supported by SUSTech CRA and CCSE