Commit 37b5a603 authored by Ben Hutchings's avatar Ben Hutchings Committed by Jeff Garzik
Browse files

sfc: Use kernel I2C system and i2c-algo-bit driver 



Remove our own implementation of I2C bit-banging.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 9e833be3

drivers/net/sfc/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ config SFC 
	select MII

	select INET_LRO

	select CRC32

	select I2C

	select I2C_ALGOBIT

	help

	  This driver supports 10-gigabit Ethernet cards based on

	  the Solarflare Communications Solarstorm SFC4000 controller.

drivers/net/sfc/Makefile

+1 −1
Original line number Diff line number Diff line 
sfc-y			+= efx.o falcon.o tx.o rx.o falcon_xmac.o \

			   i2c-direct.o selftest.o ethtool.o xfp_phy.o \

			   selftest.o ethtool.o xfp_phy.o \

			   mdio_10g.o tenxpress.o boards.o sfe4001.o



obj-$(CONFIG_SFC)	+= sfc.o

drivers/net/sfc/boards.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static struct efx_board_data board_data[] = { 
	[EFX_BOARD_INVALID] =

	{NULL,	    NULL,                  dummy_init},

	[EFX_BOARD_SFE4001] =

	{"SFE4001", "10GBASE-T adapter",   sfe4001_poweron},

	{"SFE4001", "10GBASE-T adapter",   sfe4001_init},

	[EFX_BOARD_SFE4002] =

	{"SFE4002", "XFP adapter",         sfe4002_init},

};

drivers/net/sfc/boards.h

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ enum efx_board_type { 
};



extern int efx_set_board_info(struct efx_nic *efx, u16 revision_info);

extern int sfe4001_poweron(struct efx_nic *efx);

extern void sfe4001_poweroff(struct efx_nic *efx);

extern int sfe4001_init(struct efx_nic *efx);

/* Are we putting the PHY into flash config mode */

extern unsigned int sfe4001_phy_flash_cfg;

drivers/net/sfc/efx.c

+2 −0
Original line number Diff line number Diff line
@@ -1815,6 +1815,7 @@ static struct efx_board efx_dummy_board_info = { 
	.init    = efx_nic_dummy_op_int,

	.init_leds = efx_port_dummy_op_int,

	.set_fault_led = efx_port_dummy_op_blink,

	.fini	= efx_port_dummy_op_void,

};



/**************************************************************************
@@ -1941,6 +1942,7 @@ static void efx_pci_remove_main(struct efx_nic *efx) 
	efx_fini_port(efx);



	/* Shutdown the board, then the NIC and board state */

	efx->board_info.fini(efx);

	falcon_fini_interrupt(efx);



	efx_fini_napi(efx);