Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757806Ab2FYXXF (ORCPT ); Mon, 25 Jun 2012 19:23:05 -0400 Received: from mail132.messagelabs.com ([216.82.242.115]:45775 "EHLO mail132.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757344Ab2FYXXC (ORCPT ); Mon, 25 Jun 2012 19:23:02 -0400 X-Env-Sender: hartleys@visionengravers.com X-Msg-Ref: server-13.tower-132.messagelabs.com!1340666581!11493432!1 X-Originating-IP: [216.166.12.31] X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked From: H Hartley Sweeten To: Linux Kernel Subject: [PATCH 12/33] staging: comedi: cb_das16_cs: remove unneeded pcmcia private data Date: Mon, 25 Jun 2012 16:22:52 -0700 User-Agent: KMail/1.9.9 CC: , , , MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-ID: <201206251622.53207.hartleys@visionengravers.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1902 Lines: 61 The pcmcia device-specific data is not longer needed by this driver. Remove it. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Cc: Frank Mori Hess Cc: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/cb_das16_cs.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c index df9b075..8661e13 100644 --- a/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/drivers/staging/comedi/drivers/cb_das16_cs.c @@ -623,11 +623,6 @@ static int das16cs_timer_insn_config(struct comedi_device *dev, return -EINVAL; } -struct local_info_t { - struct pcmcia_device *link; - struct bus_operations *bus; -}; - static int das16cs_pcmcia_config_loop(struct pcmcia_device *p_dev, void *priv_data) { @@ -639,16 +634,8 @@ static int das16cs_pcmcia_config_loop(struct pcmcia_device *p_dev, static int das16cs_pcmcia_attach(struct pcmcia_device *link) { - struct local_info_t *local; int ret; - /* Allocate space for private device-specific data */ - local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL); - if (!local) - return -ENOMEM; - local->link = link; - link->priv = local; - /* Do we need to allocate an interrupt? */ link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO; @@ -674,8 +661,6 @@ failed: static void das16cs_pcmcia_detach(struct pcmcia_device *link) { pcmcia_disable_device(link); - /* This points to the parent struct local_info_t struct */ - kfree(link->priv); cur_dev = NULL; } -- 1.7.11 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/