aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorMatvejchikov Ilya <matvejchikov@gmail.com>2011-07-18 17:58:48 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-19 19:55:42 -0400
commit7ad711b49e661a0979ed1a84bed16bc9fa7f872b (patch)
treec00d8448d17f627d026e525643fa3bfb466fb5fb /drivers/net/can
parenta9481a38b1474aab0f686b30e4e2b57880065ad2 (diff)
slcan: remove unused 'leased', 'line' and 'pid' fields from the 'slcan' structure
Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com> Acked-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/slcan.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index 65e54fd0a8d7..f523f1cc5142 100644
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -96,10 +96,6 @@ struct slcan {
96 unsigned long flags; /* Flag values/ mode etc */ 96 unsigned long flags; /* Flag values/ mode etc */
97#define SLF_INUSE 0 /* Channel in use */ 97#define SLF_INUSE 0 /* Channel in use */
98#define SLF_ERROR 1 /* Parity, etc. error */ 98#define SLF_ERROR 1 /* Parity, etc. error */
99
100 unsigned char leased;
101 dev_t line;
102 pid_t pid;
103}; 99};
104 100
105static struct net_device **slcan_devs; 101static struct net_device **slcan_devs;
@@ -446,7 +442,7 @@ static void slc_sync(void)
446 break; 442 break;
447 443
448 sl = netdev_priv(dev); 444 sl = netdev_priv(dev);
449 if (sl->tty || sl->leased) 445 if (sl->tty)
450 continue; 446 continue;
451 if (dev->flags & IFF_UP) 447 if (dev->flags & IFF_UP)
452 dev_close(dev); 448 dev_close(dev);
@@ -534,8 +530,6 @@ static int slcan_open(struct tty_struct *tty)
534 530
535 sl->tty = tty; 531 sl->tty = tty;
536 tty->disc_data = sl; 532 tty->disc_data = sl;
537 sl->line = tty_devnum(tty);
538 sl->pid = current->pid;
539 533
540 if (!test_bit(SLF_INUSE, &sl->flags)) { 534 if (!test_bit(SLF_INUSE, &sl->flags)) {
541 /* Perform the low-level SLCAN initialization. */ 535 /* Perform the low-level SLCAN initialization. */
@@ -586,8 +580,6 @@ static void slcan_close(struct tty_struct *tty)
586 580
587 tty->disc_data = NULL; 581 tty->disc_data = NULL;
588 sl->tty = NULL; 582 sl->tty = NULL;
589 if (!sl->leased)
590 sl->line = 0;
591 583
592 /* Flush network side */ 584 /* Flush network side */
593 unregister_netdev(sl->dev); 585 unregister_netdev(sl->dev);