From patchwork Tue Jul 19 07:58:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matvejchikov Ilya X-Patchwork-Id: 105402 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B29CCB6F71 for ; Tue, 19 Jul 2011 17:59:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752525Ab1GSH7K (ORCPT ); Tue, 19 Jul 2011 03:59:10 -0400 Received: from mail-qw0-f46.google.com ([209.85.216.46]:48051 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752339Ab1GSH7I (ORCPT ); Tue, 19 Jul 2011 03:59:08 -0400 Received: by qwk3 with SMTP id 3so1864981qwk.19 for ; Tue, 19 Jul 2011 00:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:reply-to:from:date:message-id:subject:to:content-type; bh=ahZWC44WvB+C4HxDVgwBobnneF9qjaTBRB7yc89TPus=; b=eM+rwWk2jMed0aJFHZ3lozTsEujGqmICSAewBWfb/h+pLE4Mf76uaPfK4OCh/ZqfFE L+a/KwznL4CcgAIH9kROO8H/ySj0e0ABkbLbbb6bAXYXNFAS8epaIla4Q0487GoAFxEc YVV8in6VyrWntNyEtau4rK/TLbzr02V2ulaRY= Received: by 10.229.62.77 with SMTP id w13mr5413979qch.160.1311062348114; Tue, 19 Jul 2011 00:59:08 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.191.149 with HTTP; Tue, 19 Jul 2011 00:58:48 -0700 (PDT) Reply-To: matvejchikov@gmail.com From: Matvejchikov Ilya Date: Tue, 19 Jul 2011 11:58:48 +0400 Message-ID: Subject: [PATCH] slcan: remove unused 'leased', 'line' and 'pid' fields from the 'slcan' structure To: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Matvejchikov Ilya Acked-by: Oliver Hartkopp --- drivers/net/can/slcan.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c index 1b49df6..805ee29 100644 --- a/drivers/net/can/slcan.c +++ b/drivers/net/can/slcan.c @@ -95,10 +95,6 @@ struct slcan { unsigned long flags; /* Flag values/ mode etc */ #define SLF_INUSE 0 /* Channel in use */ #define SLF_ERROR 1 /* Parity, etc. error */ - - unsigned char leased; - dev_t line; - pid_t pid; }; static struct net_device **slcan_devs; @@ -462,7 +458,7 @@ static void slc_sync(void) break; sl = netdev_priv(dev); - if (sl->tty || sl->leased) + if (sl->tty) continue; if (dev->flags & IFF_UP) dev_close(dev); @@ -565,8 +561,6 @@ static int slcan_open(struct tty_struct *tty) sl->tty = tty; tty->disc_data = sl; - sl->line = tty_devnum(tty); - sl->pid = current->pid; if (!test_bit(SLF_INUSE, &sl->flags)) { /* Perform the low-level SLCAN initialization. */ @@ -617,8 +611,6 @@ static void slcan_close(struct tty_struct *tty) tty->disc_data = NULL; sl->tty = NULL; - if (!sl->leased) - sl->line = 0; /* Flush network side */ unregister_netdev(sl->dev);