Skip to content

L
linux
Commit 9e86d35e authored by Randy Dunlap's avatar Randy Dunlap Committed by Jeff Garzik
Browse files
Options

[PATCH] use netdev_priv() in /hamradio/

parent 77ab4639
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
drivers/net/hamradio/baycom_epp.c
View file @ 9e86d35e
...@@ -646,7 +646,7 @@ static int transmit(struct baycom_state *bc, int cnt, unsigned char stat) ...@@ -646,7 +646,7 @@ static int transmit(struct baycom_state *bc, int cnt, unsigned char stat)
static void do_rxpacket(struct net_device *dev) static void do_rxpacket(struct net_device *dev)
{ {
struct baycom_state *bc = (struct baycom_state *)dev->priv; struct baycom_state *bc = netdev_priv(dev);
struct sk_buff *skb; struct sk_buff *skb;
unsigned char *cp; unsigned char *cp;
unsigned pktlen; unsigned pktlen;
...@@ -705,7 +705,7 @@ static void do_rxpacket(struct net_device *dev) ...@@ -705,7 +705,7 @@ static void do_rxpacket(struct net_device *dev)
static int receive(struct net_device *dev, int cnt) static int receive(struct net_device *dev, int cnt)
{ {
struct baycom_state *bc = (struct baycom_state *)dev->priv; struct baycom_state *bc = netdev_priv(dev);
struct parport *pp = bc->pdev->port; struct parport *pp = bc->pdev->port;
unsigned int bitbuf, notbitstream, bitstream, numbits, state; unsigned int bitbuf, notbitstream, bitstream, numbits, state;
unsigned char tmp[128]; unsigned char tmp[128];
...@@ -790,7 +790,7 @@ static void epp_bh(struct net_device *dev) ...@@ -790,7 +790,7 @@ static void epp_bh(struct net_device *dev)
int cnt, cnt2; int cnt, cnt2;
baycom_paranoia_check_void(dev, "epp_bh"); baycom_paranoia_check_void(dev, "epp_bh");
bc = (struct baycom_state *)dev->priv; bc = netdev_priv(dev);
if (!bc->work_running) if (!bc->work_running)
return; return;
baycom_int_freq(bc); baycom_int_freq(bc);
...@@ -908,7 +908,7 @@ static int baycom_send_packet(struct sk_buff *skb, struct net_device *dev) ...@@ -908,7 +908,7 @@ static int baycom_send_packet(struct sk_buff *skb, struct net_device *dev)
struct baycom_state *bc; struct baycom_state *bc;
baycom_paranoia_check(dev, "baycom_send_packet", 0); baycom_paranoia_check(dev, "baycom_send_packet", 0);
bc = (struct baycom_state *)dev->priv; bc = netdev_priv(dev);
if (skb->data[0] != 0) { if (skb->data[0] != 0) {
do_kiss_params(bc, skb->data, skb->len); do_kiss_params(bc, skb->data, skb->len);
dev_kfree_skb(skb); dev_kfree_skb(skb);
...@@ -944,7 +944,7 @@ static struct net_device_stats *baycom_get_stats(struct net_device *dev) ...@@ -944,7 +944,7 @@ static struct net_device_stats *baycom_get_stats(struct net_device *dev)
struct baycom_state *bc; struct baycom_state *bc;
baycom_paranoia_check(dev, "baycom_get_stats", NULL); baycom_paranoia_check(dev, "baycom_get_stats", NULL);
bc = (struct baycom_state *)dev->priv; bc = netdev_priv(dev);
/* /*
* Get the current statistics. This may be called with the * Get the current statistics. This may be called with the
* card open or closed. * card open or closed.
...@@ -960,7 +960,7 @@ static void epp_wakeup(void *handle) ...@@ -960,7 +960,7 @@ static void epp_wakeup(void *handle)
struct baycom_state *bc; struct baycom_state *bc;
baycom_paranoia_check_void(dev, "epp_wakeup"); baycom_paranoia_check_void(dev, "epp_wakeup");
bc = (struct baycom_state *)dev->priv; bc = netdev_priv(dev);
printk(KERN_DEBUG "baycom_epp: %s: why am I being woken up?\n", dev->name); printk(KERN_DEBUG "baycom_epp: %s: why am I being woken up?\n", dev->name);
if (!parport_claim(bc->pdev)) if (!parport_claim(bc->pdev))
printk(KERN_DEBUG "baycom_epp: %s: I'm broken.\n", dev->name); printk(KERN_DEBUG "baycom_epp: %s: I'm broken.\n", dev->name);
...@@ -987,7 +987,7 @@ static int epp_open(struct net_device *dev) ...@@ -987,7 +987,7 @@ static int epp_open(struct net_device *dev)
unsigned long tstart; unsigned long tstart;
baycom_paranoia_check(dev, "epp_open", -ENXIO); baycom_paranoia_check(dev, "epp_open", -ENXIO);
bc = (struct baycom_state *)dev->priv; bc = netdev_priv(dev);
pp = parport_find_base(dev->base_addr); pp = parport_find_base(dev->base_addr);
if (!pp) { if (!pp) {
printk(KERN_ERR "%s: parport at 0x%lx unknown\n", bc_drvname, dev->base_addr); printk(KERN_ERR "%s: parport at 0x%lx unknown\n", bc_drvname, dev->base_addr);
...@@ -1102,7 +1102,7 @@ static int epp_close(struct net_device *dev) ...@@ -1102,7 +1102,7 @@ static int epp_close(struct net_device *dev)
unsigned char tmp[1]; unsigned char tmp[1];
baycom_paranoia_check(dev, "epp_close", -EINVAL); baycom_paranoia_check(dev, "epp_close", -EINVAL);
bc = (struct baycom_state *)dev->priv; bc = netdev_priv(dev);
pp = bc->pdev->port; pp = bc->pdev->port;
bc->work_running = 0; bc->work_running = 0;
flush_scheduled_work(); flush_scheduled_work();
...@@ -1163,7 +1163,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -1163,7 +1163,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
struct hdlcdrv_ioctl hi; struct hdlcdrv_ioctl hi;
baycom_paranoia_check(dev, "baycom_ioctl", -EINVAL); baycom_paranoia_check(dev, "baycom_ioctl", -EINVAL);
bc = (struct baycom_state *)dev->priv; bc = netdev_priv(dev);
if (cmd != SIOCDEVPRIVATE) if (cmd != SIOCDEVPRIVATE)
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
if (get_user(cmd, (int *)ifr->ifr_data)) if (get_user(cmd, (int *)ifr->ifr_data))
...@@ -1290,7 +1290,7 @@ static void baycom_probe(struct net_device *dev) ...@@ -1290,7 +1290,7 @@ static void baycom_probe(struct net_device *dev)
/* /*
* not a real probe! only initialize data structures * not a real probe! only initialize data structures
*/ */
bc = (struct baycom_state *)dev->priv; bc = netdev_priv(dev);
/* /*
* initialize the baycom_state struct * initialize the baycom_state struct
*/ */
...@@ -1351,7 +1351,7 @@ MODULE_LICENSE("GPL"); ...@@ -1351,7 +1351,7 @@ MODULE_LICENSE("GPL");
static void __init baycom_epp_dev_setup(struct net_device *dev) static void __init baycom_epp_dev_setup(struct net_device *dev)
{ {
struct baycom_state *bc = dev->priv; struct baycom_state *bc = netdev_priv(dev);
/* /*
* initialize part of the baycom_state struct * initialize part of the baycom_state struct
...@@ -1415,7 +1415,7 @@ static void __exit cleanup_baycomepp(void) ...@@ -1415,7 +1415,7 @@ static void __exit cleanup_baycomepp(void)
struct net_device *dev = baycom_device[i]; struct net_device *dev = baycom_device[i];
if (dev) { if (dev) {
struct baycom_state *bc = dev->priv; struct baycom_state *bc = netdev_priv(dev);
if (bc->magic == BAYCOM_MAGIC) { if (bc->magic == BAYCOM_MAGIC) {
unregister_netdev(dev); unregister_netdev(dev);
free_netdev(dev); free_netdev(dev);
......
drivers/net/hamradio/baycom_par.c
View file @ 9e86d35e
...@@ -272,7 +272,7 @@ static __inline__ void par96_rx(struct net_device *dev, struct baycom_state *bc) ...@@ -272,7 +272,7 @@ static __inline__ void par96_rx(struct net_device *dev, struct baycom_state *bc)
static void par96_interrupt(int irq, void *dev_id, struct pt_regs *regs) static void par96_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = (struct net_device *)dev_id;
struct baycom_state *bc = (struct baycom_state *)dev->priv; struct baycom_state *bc = netdev_priv(dev);
if (!dev || !bc || bc->hdrv.magic != HDLCDRV_MAGIC) if (!dev || !bc || bc->hdrv.magic != HDLCDRV_MAGIC)
return; return;
...@@ -302,7 +302,7 @@ static void par96_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -302,7 +302,7 @@ static void par96_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static void par96_wakeup(void *handle) static void par96_wakeup(void *handle)
{ {
struct net_device *dev = (struct net_device *)handle; struct net_device *dev = (struct net_device *)handle;
struct baycom_state *bc = (struct baycom_state *)dev->priv; struct baycom_state *bc = netdev_priv(dev);
printk(KERN_DEBUG "baycom_par: %s: why am I being woken up?\n", dev->name); printk(KERN_DEBUG "baycom_par: %s: why am I being woken up?\n", dev->name);
if (!parport_claim(bc->pdev)) if (!parport_claim(bc->pdev))
...@@ -313,7 +313,7 @@ static void par96_wakeup(void *handle) ...@@ -313,7 +313,7 @@ static void par96_wakeup(void *handle)
static int par96_open(struct net_device *dev) static int par96_open(struct net_device *dev)
{ {
struct baycom_state *bc = (struct baycom_state *)dev->priv; struct baycom_state *bc = netdev_priv(dev);
struct parport *pp; struct parport *pp;
if (!dev || !bc) if (!dev || !bc)
...@@ -362,7 +362,7 @@ static int par96_open(struct net_device *dev) ...@@ -362,7 +362,7 @@ static int par96_open(struct net_device *dev)
static int par96_close(struct net_device *dev) static int par96_close(struct net_device *dev)
{ {
struct baycom_state *bc = (struct baycom_state *)dev->priv; struct baycom_state *bc = netdev_priv(dev);
struct parport *pp; struct parport *pp;
if (!dev || !bc) if (!dev || !bc)
...@@ -424,7 +424,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, ...@@ -424,7 +424,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr,
printk(KERN_ERR "bc_ioctl: invalid device struct\n"); printk(KERN_ERR "bc_ioctl: invalid device struct\n");
return -EINVAL; return -EINVAL;
} }
bc = (struct baycom_state *)dev->priv; bc = netdev_priv(dev);
if (cmd != SIOCDEVPRIVATE) if (cmd != SIOCDEVPRIVATE)
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
...@@ -524,7 +524,7 @@ static int __init init_baycompar(void) ...@@ -524,7 +524,7 @@ static int __init init_baycompar(void)
if (IS_ERR(dev)) if (IS_ERR(dev))
break; break;
bc = (struct baycom_state *)dev->priv; bc = netdev_priv(dev);
if (set_hw && baycom_setmode(bc, mode[i])) if (set_hw && baycom_setmode(bc, mode[i]))
set_hw = 0; set_hw = 0;
found++; found++;
......
drivers/net/hamradio/baycom_ser_fdx.c
View file @ 9e86d35e
...@@ -281,7 +281,7 @@ static __inline__ void ser12_rx(struct net_device *dev, struct baycom_state *bc, ...@@ -281,7 +281,7 @@ static __inline__ void ser12_rx(struct net_device *dev, struct baycom_state *bc,
static irqreturn_t ser12_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t ser12_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = (struct net_device *)dev_id;
struct baycom_state *bc = (struct baycom_state *)dev->priv; struct baycom_state *bc = netdev_priv(dev);
struct timeval tv; struct timeval tv;
unsigned char iir, msr; unsigned char iir, msr;
unsigned int txcount = 0; unsigned int txcount = 0;
...@@ -407,7 +407,7 @@ static enum uart ser12_check_uart(unsigned int iobase) ...@@ -407,7 +407,7 @@ static enum uart ser12_check_uart(unsigned int iobase)
static int ser12_open(struct net_device *dev) static int ser12_open(struct net_device *dev)
{ {
struct baycom_state *bc = (struct baycom_state *)dev->priv; struct baycom_state *bc = netdev_priv(dev);
enum uart u; enum uart u;
if (!dev || !bc) if (!dev || !bc)
...@@ -466,7 +466,7 @@ static int ser12_open(struct net_device *dev) ...@@ -466,7 +466,7 @@ static int ser12_open(struct net_device *dev)
static int ser12_close(struct net_device *dev) static int ser12_close(struct net_device *dev)
{ {
struct baycom_state *bc = (struct baycom_state *)dev->priv; struct baycom_state *bc = netdev_priv(dev);
if (!dev || !bc) if (!dev || !bc)
return -EINVAL; return -EINVAL;
...@@ -536,7 +536,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, ...@@ -536,7 +536,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr,
printk(KERN_ERR "bc_ioctl: invalid device struct\n"); printk(KERN_ERR "bc_ioctl: invalid device struct\n");
return -EINVAL; return -EINVAL;
} }
bc = (struct baycom_state *)dev->priv; bc = netdev_priv(dev);
if (cmd != SIOCDEVPRIVATE) if (cmd != SIOCDEVPRIVATE)
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
...@@ -644,7 +644,7 @@ static int __init init_baycomserfdx(void) ...@@ -644,7 +644,7 @@ static int __init init_baycomserfdx(void)
if (IS_ERR(dev)) if (IS_ERR(dev))
break; break;
bc = (struct baycom_state *)dev->priv; bc = netdev_priv(dev);
if (set_hw && baycom_setmode(bc, mode[i])) if (set_hw && baycom_setmode(bc, mode[i]))
set_hw = 0; set_hw = 0;
bc->baud = baud[i]; bc->baud = baud[i];
......
drivers/net/hamradio/baycom_ser_hdx.c
View file @ 9e86d35e
...@@ -375,7 +375,7 @@ static inline void ser12_rx(struct net_device *dev, struct baycom_state *bc) ...@@ -375,7 +375,7 @@ static inline void ser12_rx(struct net_device *dev, struct baycom_state *bc)
static irqreturn_t ser12_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t ser12_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = (struct net_device *)dev_id;
struct baycom_state *bc = (struct baycom_state *)dev->priv; struct baycom_state *bc = netdev_priv(dev);
unsigned char iir; unsigned char iir;
if (!dev || !bc || bc->hdrv.magic != HDLCDRV_MAGIC) if (!dev || !bc || bc->hdrv.magic != HDLCDRV_MAGIC)
...@@ -468,7 +468,7 @@ static enum uart ser12_check_uart(unsigned int iobase) ...@@ -468,7 +468,7 @@ static enum uart ser12_check_uart(unsigned int iobase)
static int ser12_open(struct net_device *dev) static int ser12_open(struct net_device *dev)
{ {
struct baycom_state *bc = (struct baycom_state *)dev->priv; struct baycom_state *bc = netdev_priv(dev);
enum uart u; enum uart u;
if (!dev || !bc) if (!dev || !bc)
...@@ -511,7 +511,7 @@ static int ser12_open(struct net_device *dev) ...@@ -511,7 +511,7 @@ static int ser12_open(struct net_device *dev)
static int ser12_close(struct net_device *dev) static int ser12_close(struct net_device *dev)
{ {
struct baycom_state *bc = (struct baycom_state *)dev->priv; struct baycom_state *bc = netdev_priv(dev);
if (!dev || !bc) if (!dev || !bc)
return -EINVAL; return -EINVAL;
...@@ -576,7 +576,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, ...@@ -576,7 +576,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr,
printk(KERN_ERR "bc_ioctl: invalid device struct\n"); printk(KERN_ERR "bc_ioctl: invalid device struct\n");
return -EINVAL; return -EINVAL;
} }
bc = (struct baycom_state *)dev->priv; bc = netdev_priv(dev);
if (cmd != SIOCDEVPRIVATE) if (cmd != SIOCDEVPRIVATE)
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
...@@ -681,7 +681,7 @@ static int __init init_baycomserhdx(void) ...@@ -681,7 +681,7 @@ static int __init init_baycomserhdx(void)
if (IS_ERR(dev)) if (IS_ERR(dev))
break; break;
bc = (struct baycom_state *)dev->priv; bc = netdev_priv(dev);
if (set_hw && baycom_setmode(bc, mode[i])) if (set_hw && baycom_setmode(bc, mode[i]))
set_hw = 0; set_hw = 0;
found++; found++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7