From patchwork Sun Apr 1 15:53:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Steinar H. Gunderson" X-Patchwork-Id: 10525 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SEN6q-0006qB-Ik for patchwork@linuxtv.org; Sun, 01 Apr 2012 17:54:28 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp for id 1SEN6q-0003Mi-G8; Sun, 01 Apr 2012 17:54:28 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752639Ab2DAPyX (ORCPT ); Sun, 1 Apr 2012 11:54:23 -0400 Received: from cassarossa.samfundet.no ([129.241.93.19]:40853 "EHLO cassarossa.samfundet.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752337Ab2DAPyE (ORCPT ); Sun, 1 Apr 2012 11:54:04 -0400 Received: from pannekake.samfundet.no ([2001:700:300:1800::dddd] ident=unknown) by cassarossa.samfundet.no with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1SEN6R-0001V8-HX; Sun, 01 Apr 2012 17:54:03 +0200 Received: from sesse by pannekake.samfundet.no with local (Exim 4.72) (envelope-from ) id 1SEN6R-0008N9-29; Sun, 01 Apr 2012 17:54:03 +0200 From: "Steinar H. Gunderson" To: linux-media@vger.kernel.org Cc: "Steinar H. Gunderson" Subject: [PATCH 08/11] Remove some unused structure members. Date: Sun, 1 Apr 2012 17:53:48 +0200 Message-Id: <1333295631-31866-8-git-send-email-sgunderson@bigfoot.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <20120401155330.GA31901@uio.no> References: <20120401155330.GA31901@uio.no> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.4.1.154227 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' From: "Steinar H. Gunderson" Signed-off-by: Steinar H. Gunderson --- drivers/media/dvb/mantis/mantis_evm.c | 12 ++++-------- drivers/media/dvb/mantis/mantis_link.h | 8 -------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/drivers/media/dvb/mantis/mantis_evm.c b/drivers/media/dvb/mantis/mantis_evm.c index 0fdf51c..e6012cf 100644 --- a/drivers/media/dvb/mantis/mantis_evm.c +++ b/drivers/media/dvb/mantis/mantis_evm.c @@ -42,10 +42,7 @@ static void mantis_hifevm_work(struct work_struct *work) struct mantis_ca *ca = container_of(work, struct mantis_ca, hif_evm_work); struct mantis_pci *mantis = ca->ca_priv; - u32 gpif_stat, gpif_mask; - - gpif_stat = mmread(MANTIS_GPIF_STATUS); - gpif_mask = mmread(MANTIS_GPIF_IRQCFG); + u32 gpif_stat = mmread(MANTIS_GPIF_STATUS); if (gpif_stat & MANTIS_GPIF_DETSTAT) { if (gpif_stat & MANTIS_CARD_PLUGIN) { @@ -67,13 +64,13 @@ static void mantis_hifevm_work(struct work_struct *work) } } - if (mantis->gpif_status & MANTIS_GPIF_EXTIRQ) + if (gpif_stat & MANTIS_GPIF_EXTIRQ) dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Ext IRQ", mantis->num); - if (mantis->gpif_status & MANTIS_SBUF_WSTO) + if (gpif_stat & MANTIS_SBUF_WSTO) dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer Timeout", mantis->num); - if (mantis->gpif_status & MANTIS_GPIF_OTHERR) + if (gpif_stat & MANTIS_GPIF_OTHERR) dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Alignment Error", mantis->num); if (gpif_stat & MANTIS_SBUF_OVFLW) @@ -92,7 +89,6 @@ static void mantis_hifevm_work(struct work_struct *work) dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer operation complete", mantis->num); if (gpif_stat & MANTIS_SBUF_OPDONE) { - ca->sbuf_status = MANTIS_SBUF_DATA_AVAIL; if (test_and_set_bit(MANTIS_SBUF_OPDONE_BIT, &ca->hif_event)) { dprintk(MANTIS_NOTICE, 1, "Operation done, but SBUF_OPDONE bit was already set!"); } diff --git a/drivers/media/dvb/mantis/mantis_link.h b/drivers/media/dvb/mantis/mantis_link.h index d8fefdf..a0f1428 100644 --- a/drivers/media/dvb/mantis/mantis_link.h +++ b/drivers/media/dvb/mantis/mantis_link.h @@ -25,12 +25,6 @@ #include #include "dvb_ca_en50221.h" -enum mantis_sbuf_status { - MANTIS_SBUF_DATA_AVAIL = 1, - MANTIS_SBUF_DATA_EMPTY = 2, - MANTIS_SBUF_DATA_OVFLW = 3 -}; - struct mantis_slot { u32 timeout; u32 slave_cfg; @@ -54,8 +48,6 @@ struct mantis_ca { wait_queue_head_t hif_data_wq; wait_queue_head_t hif_write_wq; /* HIF Write op */ - enum mantis_sbuf_status sbuf_status; - enum mantis_slot_state slot_state; void *ca_priv;