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

Commit e2963962 authored Sep 04, 2011 by Mark Einon Committed by Greg Kroah-Hartman Sep 06, 2011

staging: et131x: Remove redundant struct adapter members



adapter->speed_duplex was never referenced.
adapter->registry_phy_coma was always set to zero, even in the vendor driver.

Removing all member references and associated dead code.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent 06530d81

drivers/staging/et131x/et1310_phy.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -496,12 +496,6 @@ void et131x_mii_check(struct et131x_adapter *adapter,

		/* Setup ET1310 as per the documentation */
		et131x_adapter_setup(adapter);

		/* Setup the PHY into coma mode until the cable is
		* plugged back in
		*/
		if (adapter->registry_phy_coma == 1)
		et1310_enable_phy_coma(adapter);
		}
		}

drivers/staging/et131x/et131x_adapter.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -178,9 +178,7 @@ struct et131x_adapter {
		struct address_map __iomem *regs;

		/* Registry parameters */
		u8 speed_duplex; /* speed/duplex */
		u8 wanted_flow; /* Flow we want for 802.3x flow control */
		u8 registry_phy_coma; /* Phy Coma mode enable/disable */

		u32 registry_rx_mem_end; /* Size of internal rx memory */
		u32 registry_jumbo_packet; /* Max supported ethernet packet size */

drivers/staging/et131x/et131x_initpci.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -250,14 +250,12 @@ void et131x_error_timer_handler(unsigned long data)
		"No interrupts, in PHY coma, pm_csr = 0x%x\n", pm_csr);

		if (!(adapter->bmsr & BMSR_LSTATUS) &&
		adapter->registry_phy_coma &&
		adapter->boot_coma < 11) {
		adapter->boot_coma++;
		}

		if (adapter->boot_coma == 10) {
		if (!(adapter->bmsr & BMSR_LSTATUS)
		&& adapter->registry_phy_coma) {
		if (!(adapter->bmsr & BMSR_LSTATUS)) {
		if ((pm_csr & ET_PM_PHY_SW_COMA) == 0) {
		/* NOTE - This was originally a 'sync with
		* interrupt'. How to do that under Linux?