Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Automatically updated using
perl -pi -0777 -e 's/_disable\s*\(\s*struct dev \*dev\s*\)\s*{\s*struct nic \*nic.*?$/_disable ( struct nic *nic ) {/ms' *.c

perl -pi -0777 -e 's/_disable\s*\(\s*struct dev \*dev(\s*__unused)?\)\s*{/_disable ( struct nic *nic$1 ) {/ms' *.c
  • Loading branch information
Michael Brown committed Apr 12, 2005
1 parent bd9ae7c commit c87ba23
Show file tree
Hide file tree
Showing 31 changed files with 31 additions and 76 deletions.
4 changes: 1 addition & 3 deletions src/drivers/net/3c509.c
Expand Up @@ -379,9 +379,7 @@ static void __t509_disable(void)
outb(0xc0, EP_ID_PORT);
}

static void t509_disable(struct dev *dev)
{
struct nic *nic = (struct nic *)dev;
static void t509_disable ( struct nic *nic ) {
/* reset and disable merge */
t509_reset(nic);
__t509_disable();
Expand Down
4 changes: 1 addition & 3 deletions src/drivers/net/3c515.c
Expand Up @@ -592,9 +592,7 @@ static void t515_transmit(struct nic *nic, const char *d, /* Destination */
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void t515_disable(struct dev *dev)
{
struct nic *nic = (struct nic *) dev;
static void t515_disable ( struct nic *nic ) {

/* merge reset an disable */
t515_reset(nic);
Expand Down
4 changes: 1 addition & 3 deletions src/drivers/net/3c595.c
Expand Up @@ -440,9 +440,7 @@ vxsetlink(void)
GO_WINDOW(1);
}

static void t595_disable(struct dev *dev)
{
struct nic *nic = (struct nic *)dev;
static void t595_disable ( struct nic *nic ) {
t595_reset(nic);

outw(STOP_TRANSCEIVER, BASE + VX_COMMAND);
Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/3c90x.c
Expand Up @@ -663,8 +663,7 @@ a3c90x_poll(struct nic *nic, int retrieve)
*** [Ken]
***/
static void
a3c90x_disable(struct dev *dev __unused)
{
a3c90x_disable ( struct nic *nic __unused ) {
/* reset and disable merge */
a3c90x_reset();
/* Disable the receiver and transmitter. */
Expand Down
4 changes: 1 addition & 3 deletions src/drivers/net/cs89x0.c
Expand Up @@ -438,9 +438,7 @@ static int cs89x0_poll(struct nic *nic, int retrieve)
return 1;
}

static void cs89x0_disable(struct dev *dev)
{
struct nic *nic = (struct nic *)dev;
static void cs89x0_disable ( struct nic *nic ) {
cs89x0_reset(nic);
}

Expand Down
4 changes: 1 addition & 3 deletions src/drivers/net/davicom.c
Expand Up @@ -617,9 +617,7 @@ static int davicom_poll(struct nic *nic, int retrieve)
/*********************************************************************/
/* eth_disable - Disable the interface */
/*********************************************************************/
static void davicom_disable(struct dev *dev)
{
struct nic *nic = (struct nic *)dev;
static void davicom_disable ( struct nic *nic ) {
whereami("davicom_disable\n");

davicom_reset(nic);
Expand Down
4 changes: 1 addition & 3 deletions src/drivers/net/depca.c
Expand Up @@ -648,9 +648,7 @@ static void depca_transmit(
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void depca_disable(struct dev *dev)
{
struct nic *nic = (struct nic *)dev;
static void depca_disable ( struct nic *nic ) {
/* reset and disable merge */
depca_reset(nic);

Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/dmfe.c
Expand Up @@ -446,8 +446,7 @@ static void dmfe_transmit(struct nic *nic,
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void dmfe_disable(struct dev *dev __unused)
{
static void dmfe_disable ( struct nic *nic __unused ) {
/* Reset & stop DM910X board */
outl(DM910X_RESET, BASE + DCR0);
udelay(5);
Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/e1000.c
Expand Up @@ -3509,8 +3509,7 @@ e1000_transmit (struct nic *nic, const char *d, /* Destination */
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void e1000_disable (struct dev *dev __unused)
{
static void e1000_disable ( struct nic *nic __unused ) {
/* Clear the transmit ring */
E1000_WRITE_REG (&hw, TDH, 0);
E1000_WRITE_REG (&hw, TDT, 0);
Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/eepro.c
Expand Up @@ -456,8 +456,7 @@ static void eepro_transmit(
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void eepro_disable(struct dev *dev __unused)
{
static void eepro_disable ( struct nic *nic __unused ) {
eepro_sw2bank0(ioaddr); /* Switch to bank 0 */
/* Flush the Tx and disable Rx */
outb(STOP_RCV_CMD, ioaddr);
Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/eepro100.c
Expand Up @@ -566,8 +566,7 @@ static int eepro100_poll(struct nic *nic, int retrieve)
*
* returns: void.
*/
static void eepro100_disable(struct dev *dev __unused)
{
static void eepro100_disable ( struct nic *nic __unused ) {
/* from eepro100_reset */
outl(0, ioaddr + SCBPort);
/* from eepro100_disable */
Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/epic100.c
Expand Up @@ -415,8 +415,7 @@ epic100_poll(struct nic *nic, int retrieve)


static void
epic100_disable(struct dev *dev __unused)
{
epic100_disable ( struct nic *nic __unused ) {
/* Soft reset the chip. */
outl(GC_SOFT_RESET, genctl);
}
Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/forcedeth.c
Expand Up @@ -875,8 +875,7 @@ static void forcedeth_transmit(struct nic *nic, const char *d, /* Destination */
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void forcedeth_disable(struct dev *dev __unused)
{
static void forcedeth_disable ( struct nic *nic __unused ) {
/* put the card in its initial state */
/* This function serves 3 purposes.
* This disables DMA and interrupts so we don't receive
Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/mtd80x.c
Expand Up @@ -649,8 +649,7 @@ static void mtd_transmit(
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void mtd_disable(struct dev *dev)
{
static void mtd_disable ( struct nic *nic ) {
/* put the card in its initial state */
/* Disable Tx Rx*/
outl( mtdx.crvalue & (~TxEnable) & (~RxEnable), mtdx.ioaddr + TCRRCR);
Expand Down
4 changes: 1 addition & 3 deletions src/drivers/net/natsemi.c
Expand Up @@ -728,9 +728,7 @@ natsemi_poll(struct nic *nic, int retrieve)
*/

static void
natsemi_disable(struct dev *dev)
{
struct nic *nic = (struct nic *)dev;
natsemi_disable ( struct nic *nic ) {
/* merge reset and disable */
natsemi_init(nic);

Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/ns83820.c
Expand Up @@ -756,8 +756,7 @@ static void ns83820_transmit(struct nic *nic, const char *d, /* Destination */
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void ns83820_disable(struct dev *dev)
{
static void ns83820_disable ( struct nic *nic ) {
/* put the card in its initial state */
/* This function serves 3 purposes.
* This disables DMA and interrupts so we don't receive
Expand Down
4 changes: 1 addition & 3 deletions src/drivers/net/ns8390.c
Expand Up @@ -583,9 +583,7 @@ static int ns8390_poll(struct nic *nic, int retrieve)
/**************************************************************************
NS8390_DISABLE - Turn off adapter
**************************************************************************/
static void ns8390_disable(struct dev *dev)
{
struct nic *nic = (struct nic *)dev;
static void ns8390_disable ( struct nic *nic ) {
/* reset and disable merge */
ns8390_reset(nic);
}
Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/pcnet32.c
Expand Up @@ -634,8 +634,7 @@ static void pcnet32_transmit(struct nic *nic __unused, const char *d, /* Destina
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void pcnet32_disable(struct dev *dev __unused)
{
static void pcnet32_disable ( struct nic *nic __unused ) {
/* Stop the PCNET32 here -- it ocassionally polls memory if we don't */
lp->a.write_csr(ioaddr, 0, 0x0004);

Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/prism2.c
Expand Up @@ -727,8 +727,7 @@ static void prism2_transmit(
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void prism2_disable(struct dev *dev __unused)
{
static void prism2_disable ( struct nic *nic __unused ) {
/* put the card in its initial state */
}

Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/r8169.c
Expand Up @@ -683,8 +683,7 @@ static void r8169_reset(struct nic *nic)
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void r8169_disable(struct dev *dev __unused)
{
static void r8169_disable ( struct nic *nic __unused ) {
int i;
/* Stop the chip's Tx and Rx DMA processes. */
RTL_W8(ChipCmd, 0x00);
Expand Down
4 changes: 1 addition & 3 deletions src/drivers/net/rtl8139.c
Expand Up @@ -511,9 +511,7 @@ static void rtl_irq(struct nic *nic, irq_action_t action)
}
}

static void rtl_disable(struct dev *dev)
{
struct nic *nic = (struct nic *)dev;
static void rtl_disable ( struct nic *nic ) {
/* merge reset and disable */
rtl_reset(nic);

Expand Down
4 changes: 1 addition & 3 deletions src/drivers/net/sis900.c
Expand Up @@ -1213,9 +1213,7 @@ sis900_poll(struct nic *nic, int retrieve)
*/

static void
sis900_disable(struct dev *dev)
{
struct nic *nic = (struct nic *)dev;
sis900_disable ( struct nic *nic ) {
/* merge reset and disable */
sis900_init(nic);

Expand Down
4 changes: 1 addition & 3 deletions src/drivers/net/sk_g16.c
Expand Up @@ -728,9 +728,7 @@ const char *pack) /* Packet */
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void SK_disable(struct dev *dev)
{
struct nic *nic = (struct nic *)dev;
static void SK_disable ( struct nic *nic ) {

/* put the card in its initial state */
SK_lance_init(nic, MODE_NORMAL); /* reset and disable merge */
Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/skel.c
Expand Up @@ -81,8 +81,7 @@ static void skel_transmit(
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void skel_disable(struct dev *dev)
{
static void skel_disable ( struct nic *nic ) {
/* put the card in its initial state */
/* This function serves 3 purposes.
* This disables DMA and interrupts so we don't receive
Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/smc9000.c
Expand Up @@ -359,8 +359,7 @@ static int smc9000_poll(struct nic *nic, int retrieve)
return 0;
}

static void smc9000_disable(struct dev *dev __unused)
{
static void smc9000_disable ( struct nic *nic __unused ) {
if(!smc9000_base)
return;

Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/sundance.c
Expand Up @@ -555,8 +555,7 @@ static void sundance_transmit(struct nic *nic, const char *d, /* Destination */
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void sundance_disable(struct dev *dev __unused)
{
static void sundance_disable ( struct nic *nic __unused ) {
/* put the card in its initial state */
/* This function serves 3 purposes.
* This disables DMA and interrupts so we don't receive
Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/tg3.c
Expand Up @@ -3186,8 +3186,7 @@ static void tg3_transmit(struct nic *nic, const char *dst_addr,
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void tg3_disable(struct dev *dev __unused)
{
static void tg3_disable ( struct nic *nic __unused ) {
struct tg3 *tp = &tg3;
/* put the card in its initial state */
/* This function serves 3 purposes.
Expand Down
3 changes: 1 addition & 2 deletions src/drivers/net/tlan.c
Expand Up @@ -718,8 +718,7 @@ static void tlan_transmit(struct nic *nic, const char *d, /* Destination */
/**************************************************************************
DISABLE - Turn off ethernet interface
***************************************************************************/
static void tlan_disable(struct dev *dev __unused)
{
static void tlan_disable ( struct nic *nic __unused ) {
/* put the card in its initial state */
/* This function serves 3 purposes.
* This disables DMA and interrupts so we don't receive
Expand Down
4 changes: 1 addition & 3 deletions src/drivers/net/tulip.c
Expand Up @@ -1180,9 +1180,7 @@ static int tulip_poll(struct nic *nic, int retrieve)
/*********************************************************************/
/* eth_disable - Disable the interface */
/*********************************************************************/
static void tulip_disable(struct dev *dev)
{
struct nic *nic = (struct nic *)dev;
static void tulip_disable ( struct nic *nic ) {
#ifdef TULIP_DEBUG_WHERE
whereami("tulip_disable\n");
#endif
Expand Down
4 changes: 1 addition & 3 deletions src/drivers/net/via-rhine.c
Expand Up @@ -1162,9 +1162,7 @@ rhine_probe1 (struct nic *nic, struct pci_device *pci, int ioaddr, int chip_id,
}

static void
rhine_disable (struct dev *dev)
{
struct nic *nic = (struct nic *)dev;
rhine_disable ( struct nic *nic ) {
struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
int ioaddr = tp->ioaddr;

Expand Down
4 changes: 1 addition & 3 deletions src/drivers/net/w89c840.c
Expand Up @@ -579,9 +579,7 @@ static void w89c840_transmit(
/**************************************************************************
w89c840_disable - Turn off ethernet interface
***************************************************************************/
static void w89c840_disable(struct dev *dev)
{
struct nic *nic = (struct nic *)dev;
static void w89c840_disable ( struct nic *nic ) {
/* merge reset and disable */
w89c840_reset(nic);

Expand Down

0 comments on commit c87ba23

Please sign in to comment.