From patchwork Wed Jan 14 11:25:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Joseph Barrow X-Patchwork-Id: 18419 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 7C6B1DE242 for ; Wed, 14 Jan 2009 22:26:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755114AbZANL0G (ORCPT ); Wed, 14 Jan 2009 06:26:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754697AbZANL0E (ORCPT ); Wed, 14 Jan 2009 06:26:04 -0500 Received: from mailer1.option.com ([81.246.70.162]:55069 "EHLO mailer1.option.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752587AbZANL0C (ORCPT ); Wed, 14 Jan 2009 06:26:02 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Aj4BACBabUkKAAAZ/2dsb2JhbAAIzUeFbw Received: from unknown (HELO smtp3.option.com) ([10.0.0.25]) by mailer1.option.local with ESMTP; 14 Jan 2009 12:26:00 +0100 Received: from [10.30.1.59] ([10.30.1.59]) by smtp3.option.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 14 Jan 2009 12:25:59 +0100 Message-ID: <496DCBC7.5010302@option.com> Date: Wed, 14 Jan 2009 12:25:59 +0100 From: Denis Joseph Barrow User-Agent: Thunderbird 2.0.0.16 (X11/20080724) MIME-Version: 1.0 To: Linux netdev Mailing list , Linux USB kernel mailing list Subject: [PATCH 02/02] hso remove dead workfunc code X-OriginalArrivalTime: 14 Jan 2009 11:25:59.0659 (UTC) FILETIME=[E0178BB0:01C9763A] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Sorry I left this rubbish lying around Index: linux-2.6/drivers/net/usb/hso.c =================================================================== --- linux-2.6.orig/drivers/net/usb/hso.c 2009-01-14 12:02:56.000000000 +0100 +++ linux-2.6/drivers/net/usb/hso.c 2009-01-14 12:03:11.000000000 +0100 @@ -270,7 +270,6 @@ u16 curr_rx_urb_offset; u8 rx_urb_filled[MAX_RX_URBS]; struct tasklet_struct unthrottle_tasklet; - struct work_struct retry_unthrottle_workqueue; }; struct hso_device { @@ -1264,14 +1263,6 @@ tasklet_hi_schedule(&serial->unthrottle_tasklet); } -void hso_unthrottle_workfunc(struct work_struct *work) -{ - struct hso_serial *serial = - container_of(work, struct hso_serial, - retry_unthrottle_workqueue); - hso_unthrottle_tasklet(serial); -} - /* open the requested serial port */ static int hso_serial_open(struct tty_struct *tty, struct file *filp) { @@ -1310,8 +1301,6 @@ tasklet_init(&serial->unthrottle_tasklet, (void (*)(unsigned long))hso_unthrottle_tasklet, (unsigned long)serial); - INIT_WORK(&serial->retry_unthrottle_workqueue, - hso_unthrottle_workfunc); result = hso_start_serial_device(serial->parent, GFP_KERNEL); if (result) { hso_stop_serial_device(serial->parent); @@ -1367,7 +1356,6 @@ if (!usb_gone) hso_stop_serial_device(serial->parent); tasklet_kill(&serial->unthrottle_tasklet); - cancel_work_sync(&serial->retry_unthrottle_workqueue); } if (!usb_gone) usb_autopm_put_interface(serial->parent->interface);