Timo von Holtz | 1 Feb 2011 02:50
Picon

[PATCH] Staging: bcm: fixed coding style issues

Fixed some coding style issues

Signed-off-by: Timo von Holtz <tvh <at> informatik.uni-kiel.de>
---
 drivers/staging/bcm/Adapter.h                  |   34 +-
 drivers/staging/bcm/Bcmchar.c                  |  380 ++++----
 drivers/staging/bcm/Bcmnet.c                   |    2 +-
 drivers/staging/bcm/CmHost.c                   |  769 +++++++-------
 drivers/staging/bcm/CmHost.h                   |    6 +-
 drivers/staging/bcm/DDRInit.c                  | 1374 ++++++++++++------------
 drivers/staging/bcm/Debug.h                    |   10 +-
 drivers/staging/bcm/HandleControlPacket.c      |   28 +-
 drivers/staging/bcm/IPv6Protocol.c             |   94 +-
 drivers/staging/bcm/IPv6ProtocolHdr.h          |    6 +-
 drivers/staging/bcm/InterfaceAdapter.h         |    6 +-
 drivers/staging/bcm/InterfaceDld.c             |   74 +-
 drivers/staging/bcm/InterfaceIdleMode.c        |   78 +-
 drivers/staging/bcm/InterfaceInit.c            |    4 +-
 drivers/staging/bcm/InterfaceIsr.c             |   30 +-
 drivers/staging/bcm/InterfaceMisc.c            |   42 +-
 drivers/staging/bcm/InterfaceRx.c              |   34 +-
 drivers/staging/bcm/InterfaceTx.c              |   24 +-
 drivers/staging/bcm/Ioctl.h                    |   26 +-
 drivers/staging/bcm/LeakyBucket.c              |   64 +-
 drivers/staging/bcm/Macros.h                   |    4 +-
 drivers/staging/bcm/Misc.c                     |  408 ++++----
 drivers/staging/bcm/PHSDefines.h               |    2 +-
 drivers/staging/bcm/PHSModule.c                |  294 +++---
 drivers/staging/bcm/PHSModule.h                |   14 +-
 drivers/staging/bcm/Protocol.h                 |    4 +-
(Continue reading)

Greg KH | 1 Feb 2011 03:42
Picon

Re: [PATCH] Staging: bcm: fixed coding style issues

On Tue, Feb 01, 2011 at 02:50:24AM +0100, Timo von Holtz wrote:
> Fixed some coding style issues

Which ones?

With such a huge patch, it's best to break it down by type of coding
style cleanup, to make it easier to review and apply.  This is almost
too big to review as-is :(

thanks,

greg k-h
Stephen Hemminger | 1 Feb 2011 04:58
Favicon

Re: [PATCH] Staging: bcm: fixed coding style issues

On Tue,  1 Feb 2011 02:50:24 +0100
Timo von Holtz <tvh <at> informatik.uni-kiel.de> wrote:

> diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
> index 32909e2..3a0b62d 100644
> --- a/drivers/staging/bcm/Adapter.h
> +++ b/drivers/staging/bcm/Adapter.h
>  <at>  <at>  -14,7 +14,7  <at>  <at>  struct _LEADER
>  	UCHAR  	Status;
>  	UCHAR	Unused[3];
>  }__attribute__((packed));
> -typedef struct _LEADER LEADER,*PLEADER;
> +typedef struct _LEADER LEADER, *PLEADER;

Rather than fixing format of these typedef's eliminate
them according to CodingStyle

--

-- 
Dan Carpenter | 1 Feb 2011 06:33
Picon

Re: [PATCH] Staging: bcm: fixed coding style issues

On Tue, Feb 01, 2011 at 02:50:24AM +0100, Timo von Holtz wrote:
>  static struct file_operations bcm_fops = {
>  	.owner    = THIS_MODULE,
> -	.open     = bcm_char_open,
> +	.open     = bcm_char_open,,
                                 ^^
Only one comma needed.

>  	.release  = bcm_char_release,
>  	.read     = bcm_char_read,

regards,
dan carpenter
Winkler, Tomas | 1 Feb 2011 06:39
Picon
Favicon

RE: [staging-next 1/4] staging: easycap: don't cast NULL pointer



> -----Original Message-----
> From: Greg KH [mailto:greg <at> kroah.com]
> Sent: Tuesday, February 01, 2011 12:01 AM
> To: Winkler, Tomas
> Cc: gregkh <at> suse.de; devel <at> linuxdriverproject.org
> Subject: Re: [staging-next 1/4] staging: easycap: don't cast NULL pointer
> 
> On Tue, Jan 25, 2011 at 05:33:27PM +0200, Tomas Winkler wrote:
> > Signed-off-by: Tomas Winkler <tomas.winkler <at> intel.com>
> 
> Something in this patch series causes the following build breakage to
> happen:
> drivers/staging/easycap/easycap_sound_oss.c:711:29: error: expected ‘=’,
> ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘ioctl’
> drivers/staging/easycap/easycap_sound_oss.c:1009:20: error:
> ‘easyoss_unlocked_ioctl’ undeclared here (not in a function)
> make[3]: *** [drivers/staging/easycap/easycap_sound_oss.o] Error 1

Hmm, looks like broken comment or something like that...here compiles everything fine.
Sorry for troubles I will check that again.

> 
> Care to fix it up and resend _all_ of the easycap patches you have sent
> to me but that I haven't applied?  I've purged them all from my to-apply
> queue as I don't want to mess with picking some and not others as that
> gets messy really quickly.

Sure.
(Continue reading)

Greg KH | 1 Feb 2011 06:51
Picon

Re: [staging-next 1/4] staging: easycap: don't cast NULL pointer

On Tue, Feb 01, 2011 at 07:39:02AM +0200, Winkler, Tomas wrote:
> 
> 
> > -----Original Message-----
> > From: Greg KH [mailto:greg <at> kroah.com]
> > Sent: Tuesday, February 01, 2011 12:01 AM
> > To: Winkler, Tomas
> > Cc: gregkh <at> suse.de; devel <at> linuxdriverproject.org
> > Subject: Re: [staging-next 1/4] staging: easycap: don't cast NULL pointer
> > 
> > On Tue, Jan 25, 2011 at 05:33:27PM +0200, Tomas Winkler wrote:
> > > Signed-off-by: Tomas Winkler <tomas.winkler <at> intel.com>
> > 
> > Something in this patch series causes the following build breakage to
> > happen:
> > drivers/staging/easycap/easycap_sound_oss.c:711:29: error: expected ‘=’,
> > ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘ioctl’
> > drivers/staging/easycap/easycap_sound_oss.c:1009:20: error:
> > ‘easyoss_unlocked_ioctl’ undeclared here (not in a function)
> > make[3]: *** [drivers/staging/easycap/easycap_sound_oss.o] Error 1
> 
> Hmm, looks like broken comment or something like that...here compiles everything fine.
> Sorry for troubles I will check that again.

Make sure you have the OSS config option selected, I think that might be
the issue.

> > Care to fix it up and resend _all_ of the easycap patches you have sent
> > to me but that I haven't applied?  I've purged them all from my to-apply
> > queue as I don't want to mess with picking some and not others as that
(Continue reading)

Roland Vossen | 1 Feb 2011 10:32
Favicon

[PATCH 4/4] staging: brcm80211: removed references to 32 bit DMA registers

Code cleanup. Removed unused references.

Signed-off-by: Roland Vossen <rvossen <at> broadcom.com>
---
 drivers/staging/brcm80211/brcmsmac/d11.h      |    7 -------
 drivers/staging/brcm80211/brcmsmac/wlc_bmac.c |    7 ++-----
 drivers/staging/brcm80211/include/hnddma.h    |    3 ---
 drivers/staging/brcm80211/util/hnddma.c       |   11 -----------
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/drivers/staging/brcm80211/brcmsmac/d11.h b/drivers/staging/brcm80211/brcmsmac/d11.h
index 50883af..841e940 100644
--- a/drivers/staging/brcm80211/brcmsmac/d11.h
+++ b/drivers/staging/brcm80211/brcmsmac/d11.h
 <at>  <at>  -76,12 +76,6  <at>  <at>  typedef volatile union {
 	pio4regp_t b4;		/* >= corerev 8 */
 } u_pioreg_t;

-/* dma/pio corerev < 11 */
-typedef volatile struct {
-	dma32regp_t dmaregs[8];	/* 0x200 - 0x2fc */
-	u_pioreg_t pioregs[8];	/* 0x300 */
-} fifo32_t;
-
 /* dma/pio corerev >= 11 */
 typedef volatile struct {
 	dma64regs_t dmaxmt;	/* dma tx */
 <at>  <at>  -168,7 +162,6  <at>  <at>  typedef volatile struct _d11regs {

 	/* 0x200-0x37F dma/pio registers */
(Continue reading)

Roland Vossen | 1 Feb 2011 10:32
Favicon

[PATCH 1/4] staging: brcm80211: removed unused DMA32 related code

removed C code and that was never invoked, and declarations that are not used
anymore.

Signed-off-by: Roland Vossen <rvossen <at> broadcom.com>
---
 drivers/staging/brcm80211/include/hnddma.h |   43 +---------
 drivers/staging/brcm80211/util/hnddma.c    |  133 ----------------------------
 2 files changed, 1 insertions(+), 175 deletions(-)

diff --git a/drivers/staging/brcm80211/include/hnddma.h b/drivers/staging/brcm80211/include/hnddma.h
index 4c5462b..002c118 100644
--- a/drivers/staging/brcm80211/include/hnddma.h
+++ b/drivers/staging/brcm80211/include/hnddma.h
 <at>  <at>  -148,47 +148,7  <at>  <at>  extern struct hnddma_pub *dma_attach(struct osl_info *osh, char *name,
 			    void *dmaregstx, void *dmaregsrx, uint ntxd,
 			    uint nrxd, uint rxbufsize, int rxextheadroom,
 			    uint nrxpost, uint rxoffset, uint *msg_level);
-#ifdef BCMDMA32
-
-#define dma_detach(di)			((di)->di_fn->detach(di))
-#define dma_txreset(di)			((di)->di_fn->txreset(di))
-#define dma_rxreset(di)			((di)->di_fn->rxreset(di))
-#define dma_rxidle(di)			((di)->di_fn->rxidle(di))
-#define dma_txinit(di)                  ((di)->di_fn->txinit(di))
-#define dma_txenabled(di)               ((di)->di_fn->txenabled(di))
-#define dma_rxinit(di)                  ((di)->di_fn->rxinit(di))
-#define dma_txsuspend(di)               ((di)->di_fn->txsuspend(di))
-#define dma_txresume(di)                ((di)->di_fn->txresume(di))
-#define dma_txsuspended(di)             ((di)->di_fn->txsuspended(di))
-#define dma_txsuspendedidle(di)         ((di)->di_fn->txsuspendedidle(di))
(Continue reading)

Roland Vossen | 1 Feb 2011 10:32
Favicon

[PATCH 0/4] staging: brcm80211: removal of inactive DMA code

Code cleanup. 32 bits DMA nor PCI are required by the chips that this driver
supports. Therefore inactive code was removed. 

Reviewed-by: Arend van Spriel <arend <at> broadcom.com>
Reviewed-by: Brett Rudley <brudley <at> broadcom.com>
Signed-off-by: Roland Vossen <rvossen <at> broadcom.com>

  staging: brcm80211: removed unused DMA32 related code
  staging: brcm80211: removed more unused dma32 code
  staging: brcm80211: removed 32 bit DMA functions
  staging: brcm80211: removed references to 32 bit DMA registers

 drivers/staging/brcm80211/brcmsmac/d11.h      |    7 -
 drivers/staging/brcm80211/brcmsmac/wlc_bmac.c |    7 +-
 drivers/staging/brcm80211/include/hnddma.h    |   46 +-
 drivers/staging/brcm80211/util/hnddma.c       | 1223 ++++---------------------
 4 files changed, 166 insertions(+), 1117 deletions(-)
Roland Vossen | 1 Feb 2011 10:32
Favicon

[PATCH 2/4] staging: brcm80211: removed more unused dma32 code

Since two preprocessor defines are always '1', could remove code that was
never compiled in and removed references to these preprocessor defines
(DMA64_ENAB and DMA64_MODE).

Signed-off-by: Roland Vossen <rvossen <at> broadcom.com>
---
 drivers/staging/brcm80211/util/hnddma.c |  394 +++++++++++++------------------
 1 files changed, 162 insertions(+), 232 deletions(-)

diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c
index c91a5d2..3269c5b 100644
--- a/drivers/staging/brcm80211/util/hnddma.c
+++ b/drivers/staging/brcm80211/util/hnddma.c
 <at>  <at>  -151,9 +151,6  <at>  <at>  typedef struct dma_info {
 	bool aligndesc_4k;	/* descriptor base need to be aligned or not */
 } dma_info_t;

-#define	DMA64_ENAB(di)		1
-#define	DMA64_MODE(di)		1
-
 /* DMA Scatter-gather list is supported. Note this is limited to TX direction only */
 #ifdef BCMDMASGLISTOSL
 #define DMASGLIST_ENAB true
 <at>  <at>  -380,11 +377,7  <at>  <at>  struct hnddma_pub *dma_attach(struct osl_info *osh, char *name, si_t *sih,
 	/* old chips w/o sb is no longer supported */
 	ASSERT(sih != NULL);

-	if (DMA64_ENAB(di))
-		di->dma64 =
-		    ((si_core_sflags(sih, 0, 0) & SISF_DMA64) == SISF_DMA64);
(Continue reading)


Gmane