Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754722Ab2KMKMM (ORCPT ); Tue, 13 Nov 2012 05:12:12 -0500 Received: from mail-1.atlantis.sk ([80.94.52.57]:45440 "EHLO mail.atlantis.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754436Ab2KMKMK (ORCPT ); Tue, 13 Nov 2012 05:12:10 -0500 From: Ondrej Zary To: Belisko Marek Subject: Re: [RFC, RFT] [PATCH] staging: ft1000: unify struct ft1000_info between USB and PCMCIA drivers Date: Tue, 13 Nov 2012 11:11:38 +0100 User-Agent: KMail/1.9.10 (enterprise35 0.20100827.1168748) Cc: "Greg Kroah-Hartman" , Kernel development list References: <201211092242.34697.linux@rainbow-software.org> In-Reply-To: X-KMail-QuotePrefix: > MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <201211131111.38721.linux@rainbow-software.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2768 Lines: 69 On Monday 12 November 2012, Belisko Marek wrote: > Hi Ondrej, > > On Fri, Nov 9, 2012 at 10:42 PM, Ondrej Zary wrote: > > Unify struct ft1000_info between ft1000-usb and ft1000-pcmcia and move it > > to common ft1000.h. > > > > ft1000-pcmcia seems to work. Please test ft1000-usb. > > > > Signed-off-by: Ondrej Zary > > --- > > drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 33 +----- > > drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 21 ++- > > drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 10 +- > > drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 147 > > ++++++++++---------- .../staging/ft1000/ft1000-usb/ft1000_download.c | > > 70 +++++----- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 99 > > +++++++------- drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 4 > > +- > > drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 30 ++-- > > drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 54 +------ > > drivers/staging/ft1000/ft1000.h | 35 +++++ > > 10 files changed, 236 insertions(+), 267 deletions(-) > > > > diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h > > b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h index adb436e..65f7ab6 > > 100644 > > --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h > > +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h > > @@ -31,41 +31,10 @@ > > #define SUCCESS 0x00 > > #define FAILURE 0x01 > > > > -struct ft1000_info { > > - struct net_device_stats stats; > > - u16 DrvErrNum; > > - u16 AsicID; > > +struct ft1000_pcmcia { > > To be consistent can you please name also usb part not ft100_device > but e.g. ft1000_usb or something? Yes, that's a good idea. I'd like to do that in a separate patch, this one is already big enough. > > @@ -1179,8 +1179,6 @@ static int ft1000_open(struct net_device *dev) > > struct ft1000_info *pInfo = netdev_priv(dev); > > struct timeval tv; > > > > - DEBUG("ft1000_open is called for card %d\n", pInfo->CardNumber); > > ^^^ Why removing this debug? I don't remember exactly (this is from an old patch) but probably because I didn't want to add code to reach CardNumber (which should be removed too). The debug messages are a mess, some are completely useless, some should be non-debug instead. If you have the USB hardware, please test if this patch does not break anything. I have only a PCMCIA card. -- Ondrej Zary -- 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/