From 055162dcc3202ea09d1497a53010260097d87135 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 25 Feb 2004 20:29:55 -0800 Subject: [PATCH] [IRDA]: Kill dev_flags, unused. --- drivers/net/irda/ali-ircc.c | 2 -- drivers/net/irda/donauboe.c | 4 ---- drivers/net/irda/irda-usb.c | 8 -------- drivers/net/irda/irport.c | 3 --- drivers/net/irda/nsc-ircc.c | 2 -- drivers/net/irda/sir_dev.c | 2 -- drivers/net/irda/smsc-ircc2.c | 2 -- drivers/net/irda/via-ircc.c | 3 --- drivers/net/irda/w83977af_ir.c | 2 -- include/net/irda/ali-ircc.h | 1 - include/net/irda/au1000_ircc.h | 1 - include/net/irda/irda-usb.h | 1 - include/net/irda/nsc-ircc.h | 1 - include/net/irda/smc-ircc.h | 1 - include/net/irda/toshoboe.h | 1 - include/net/irda/w83977af_ir.h | 1 - 16 files changed, 35 deletions(-) diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index b0ec453876557..42be47215fcd3 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c @@ -299,8 +299,6 @@ static int ali_ircc_open(int i, chipio_t *info) irda_qos_bits_to_value(&self->qos); - self->flags = IFF_FIR|IFF_MIR|IFF_SIR|IFF_DMA|IFF_PIO; // benjamin 2000/11/8 05:27PM - /* Max DMA buffer size needed = (data_size + 6) * (window_size) + 6; */ self->rx_buff.truesize = 14384; self->tx_buff.truesize = 14384; diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c index 967837772dcc5..8192c6c383dd1 100644 --- a/drivers/net/irda/donauboe.c +++ b/drivers/net/irda/donauboe.c @@ -1646,13 +1646,11 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid) if (max_baud >= 1152000) { self->qos.baud_rate.bits |= IR_1152000; - self->flags |= IFF_MIR; } #endif if (max_baud >= 4000000) { self->qos.baud_rate.bits |= (IR_4000000 << 8); - self->flags |= IFF_FIR; } /*FIXME: work this out... */ @@ -1660,8 +1658,6 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid) irda_qos_bits_to_value (&self->qos); - self->flags = IFF_SIR | IFF_DMA | IFF_PIO; - /* Allocate twice the size to guarantee alignment */ self->ringbuf = (void *) kmalloc (OBOE_RING_LEN << 1, GFP_KERNEL); if (!self->ringbuf) diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c index 617289d1add31..4e0154a8982c4 100644 --- a/drivers/net/irda/irda-usb.c +++ b/drivers/net/irda/irda-usb.c @@ -1136,14 +1136,6 @@ static inline void irda_usb_init_qos(struct irda_usb_cb *self) * the transmit path will be set differently - Jean II */ irda_qos_bits_to_value(&self->qos); - - self->flags |= IFF_SIR; - if (self->qos.baud_rate.value > 115200) - self->flags |= IFF_MIR; - if (self->qos.baud_rate.value > 1152000) - self->flags |= IFF_FIR; - if (self->qos.baud_rate.value > 4000000) - self->flags |= IFF_VFIR; } /*------------------------------------------------------------------*/ diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c index 557fc4d9280c6..a5aa4147b3456 100644 --- a/drivers/net/irda/irport.c +++ b/drivers/net/irda/irport.c @@ -178,9 +178,6 @@ irport_open(int i, unsigned int iobase, unsigned int irq) self->qos.min_turn_time.bits = qos_mtt_bits; irda_qos_bits_to_value(&self->qos); - self->flags = IFF_SIR|IFF_PIO; - self->mode = IRDA_IRLAP; - /* Bootstrap ZeroCopy Rx */ self->rx_buff.truesize = IRDA_SKB_MAX_MTU; self->rx_buff.skb = __dev_alloc_skb(self->rx_buff.truesize, diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index 31b0ede0b68d3..5d0c8368a8080 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c @@ -302,8 +302,6 @@ static int __init nsc_ircc_open(int i, chipio_t *info) self->qos.min_turn_time.bits = qos_mtt_bits; irda_qos_bits_to_value(&self->qos); - self->flags = IFF_FIR|IFF_MIR|IFF_SIR|IFF_DMA|IFF_PIO|IFF_DONGLE; - /* Max DMA buffer size needed = (data_size + 6) * (window_size) + 6; */ self->rx_buff.truesize = 14384; self->tx_buff.truesize = 14384; diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c index 1c887279f1cae..abcd98eb71098 100644 --- a/drivers/net/irda/sir_dev.c +++ b/drivers/net/irda/sir_dev.c @@ -620,8 +620,6 @@ struct sir_dev * sirdev_get_instance(const struct sir_driver *drv, const char *n SET_MODULE_OWNER(ndev); - dev->flags = IFF_SIR | IFF_PIO; - /* Override the network functions we need to use */ ndev->hard_start_xmit = sirdev_hard_xmit; ndev->open = sirdev_open; diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index b263993567baa..e57ec51ce2f65 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c @@ -441,8 +441,6 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u smsc_ircc_setup_qos(self); - self->flags = IFF_FIR|IFF_MIR|IFF_SIR|IFF_DMA|IFF_PIO; - smsc_ircc_init_chip(self); if(ircc_transceiver > 0 && diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index bb152de5ad4fd..1e87f1c69f888 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c @@ -377,9 +377,6 @@ static __devinit int via_ircc_open(int i, chipio_t * info, unsigned int id) self->qos.min_turn_time.bits = qos_mtt_bits; irda_qos_bits_to_value(&self->qos); - self->flags = - IFF_FIR | IFF_MIR | IFF_SIR | IFF_DMA | IFF_PIO | IFF_DONGLE; - /* Max DMA buffer size needed = (data_size + 6) * (window_size) + 6; */ self->rx_buff.truesize = 14384 + 2048; self->tx_buff.truesize = 14384 + 2048; diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index 443d9a68215d8..cd5e8f2a5a678 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c @@ -202,8 +202,6 @@ int w83977af_open(int i, unsigned int iobase, unsigned int irq, self->qos.min_turn_time.bits = qos_mtt_bits; irda_qos_bits_to_value(&self->qos); - self->flags = IFF_FIR|IFF_MIR|IFF_SIR|IFF_DMA|IFF_PIO; - /* Max DMA buffer size needed = (data_size + 6) * (window_size) + 6; */ self->rx_buff.truesize = 14384; self->tx_buff.truesize = 4000; diff --git a/include/net/irda/ali-ircc.h b/include/net/irda/ali-ircc.h index dbd5a1cf77c1b..dc5edd12b8f8e 100644 --- a/include/net/irda/ali-ircc.h +++ b/include/net/irda/ali-ircc.h @@ -212,7 +212,6 @@ struct ali_ircc_cb { spinlock_t lock; /* For serializing operations */ - __u32 flags; /* Interface flags */ __u32 new_speed; int index; /* Instance index */ diff --git a/include/net/irda/au1000_ircc.h b/include/net/irda/au1000_ircc.h index ac621e9506313..7a31d4659ed6f 100644 --- a/include/net/irda/au1000_ircc.h +++ b/include/net/irda/au1000_ircc.h @@ -115,7 +115,6 @@ struct au1k_private { struct irlap_cb *irlap; u8 open; - u32 flags; /* Interface flags */ u32 speed; u32 newspeed; diff --git a/include/net/irda/irda-usb.h b/include/net/irda/irda-usb.h index 7c8c9de11c360..bd8f66542322f 100644 --- a/include/net/irda/irda-usb.h +++ b/include/net/irda/irda-usb.h @@ -159,6 +159,5 @@ struct irda_usb_cb { __s16 new_xbofs; /* xbofs we need to set */ __u32 speed; /* Current speed */ __s32 new_speed; /* speed we need to set */ - __u32 flags; /* Interface flags */ }; diff --git a/include/net/irda/nsc-ircc.h b/include/net/irda/nsc-ircc.h index 96d629a0e7e22..0f541aa719356 100644 --- a/include/net/irda/nsc-ircc.h +++ b/include/net/irda/nsc-ircc.h @@ -263,7 +263,6 @@ struct nsc_ircc_cb { spinlock_t lock; /* For serializing operations */ - __u32 flags; /* Interface flags */ __u32 new_speed; int index; /* Instance index */ diff --git a/include/net/irda/smc-ircc.h b/include/net/irda/smc-ircc.h index 456aa60265309..6ef49e7e5abad 100644 --- a/include/net/irda/smc-ircc.h +++ b/include/net/irda/smc-ircc.h @@ -170,7 +170,6 @@ struct ircc_cb { * synchronised - Jean II */ __u32 new_speed; - __u32 flags; /* Interface flags */ int tx_buff_offsets[10]; /* Offsets between frames in tx_buff */ int tx_len; /* Number of frames in tx_buff */ diff --git a/include/net/irda/toshoboe.h b/include/net/irda/toshoboe.h index 9bf4fb9c38cc6..7d7a227d1d353 100644 --- a/include/net/irda/toshoboe.h +++ b/include/net/irda/toshoboe.h @@ -146,7 +146,6 @@ struct toshoboe_cb chipio_t io; /* IrDA controller information */ - __u32 flags; /* Interface flags */ __u32 new_speed; struct pci_dev *pdev; /*PCI device */ diff --git a/include/net/irda/w83977af_ir.h b/include/net/irda/w83977af_ir.h index 2609588885c22..c578ddc1a0eb2 100644 --- a/include/net/irda/w83977af_ir.h +++ b/include/net/irda/w83977af_ir.h @@ -185,7 +185,6 @@ struct w83977af_ir { * locking strategy. - Jean II */ spinlock_t lock; /* For serializing operations */ - __u32 flags; /* Interface flags */ __u32 new_speed; }; -- 2.53.0