Sean MacLennan | 1 Dec 2011 01:07
Picon
Favicon
Gravatar

[PATCH] rtl8192e: remove unused header files

The header files rtl_crypto.h and r819xE_phyreg.h are not used, remove
them.

Signed-off-by: Sean MacLennan <seanm <at> seanm.ca>
---
 drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h |  915 ---------------------
 drivers/staging/rtl8192e/rtl8192e/rtl_crypto.h    |  382 ---------
 2 files changed, 0 insertions(+), 1297 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h b/drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h
deleted file mode 100644
index d5de279..0000000
--- a/drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h
+++ /dev/null
 <at>  <at>  -1,915 +0,0  <at>  <at> 
-#ifndef _R819XU_PHYREG_H
-#define _R819XU_PHYREG_H
-
-
-#define   RF_DATA				0x1d4					// FW will write RF data in the register.
-
-//Register   //duplicate register due to connection: RF_Mode, TRxRN, NumOf L-STF
-//page 1
-#define rPMAC_Reset               		0x100
-#define rPMAC_TxStart             		0x104
-#define rPMAC_TxLegacySIG         		0x108
-#define rPMAC_TxHTSIG1            		0x10c
-#define rPMAC_TxHTSIG2            		0x110
-#define rPMAC_PHYDebug            		0x114
-#define rPMAC_TxPacketNum         		0x118
-#define rPMAC_TxIdle              		0x11c
(Continue reading)

Sean MacLennan | 1 Dec 2011 01:29
Picon
Favicon
Gravatar

[PATCH] rtl8192u: Remove unused files

The rtl8192u/ieee80211 contains some unused header and c files. Remove
them. Also the file ieee80211_crypt.h was in the top level rtl8192u
directory but was not used.

Signed-off-by: Sean MacLennan <seanm <at> seanm.ca>
---
 drivers/staging/rtl8192u/ieee80211/EndianFree.h    |  194 --------
 drivers/staging/rtl8192u/ieee80211/Makefile        |   28 --
 drivers/staging/rtl8192u/ieee80211/aes.c           |  469 --------------------
 drivers/staging/rtl8192u/ieee80211/arc4.c          |  103 -----
 drivers/staging/rtl8192u/ieee80211/autoload.c      |   40 --
 drivers/staging/rtl8192u/ieee80211/cipher.c        |  298 -------------
 drivers/staging/rtl8192u/ieee80211/compress.c      |   64 ---
 drivers/staging/rtl8192u/ieee80211/crypto_compat.h |   60 ---
 drivers/staging/rtl8192u/ieee80211/digest.c        |  108 -----
 drivers/staging/rtl8192u/ieee80211/internal.h      |   99 ----
 drivers/staging/rtl8192u/ieee80211/kmap_types.h    |   20 -
 drivers/staging/rtl8192u/ieee80211/michael_mic.c   |  194 --------
 drivers/staging/rtl8192u/ieee80211/proc.c          |  116 -----
 drivers/staging/rtl8192u/ieee80211/rtl_crypto.h    |  399 -----------------
 drivers/staging/rtl8192u/ieee80211/scatterwalk.c   |  126 ------
 drivers/staging/rtl8192u/ieee80211/scatterwalk.h   |   51 ---
 drivers/staging/rtl8192u/ieee80211_crypt.h         |   86 ----
 17 files changed, 0 insertions(+), 2455 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/EndianFree.h b/drivers/staging/rtl8192u/ieee80211/EndianFree.h
deleted file mode 100644
index dc85fb9..0000000
--- a/drivers/staging/rtl8192u/ieee80211/EndianFree.h
+++ /dev/null
 <at>  <at>  -1,194 +0,0  <at>  <at> 
(Continue reading)

Marcos Paulo de Souza | 1 Dec 2011 01:22
Picon

[PATCH 1/4] staging: vt6656: channel.c: Remove dead code

This patch remove some unneeded code. Some comments, for loop doing
nothing, debug messages and unneeded variables was removed.

Signed-off-by: Marcos Paulo de Souza <marcos.mage <at> gmail.com>
Cc: Greg Kroah-Hartman <gregkh <at> suse.de> 
Cc: Forest Bond <forest <at> alittletooquiet.net>
Cc: devel <at> driverdev.osuosl.org
---
 drivers/staging/vt6656/channel.c |   81 ++++++++------------------------------
 1 files changed, 17 insertions(+), 64 deletions(-)

diff --git a/drivers/staging/vt6656/channel.c b/drivers/staging/vt6656/channel.c
index 99e054d..172e017 100644
--- a/drivers/staging/vt6656/channel.c
+++ b/drivers/staging/vt6656/channel.c
 <at>  <at>  -39,15 +39,6  <at>  <at> 
 #include "channel.h"
 #include "rf.h"

-/*---------------------  Static Definitions -------------------------*/
-static int          msglevel                = MSG_LEVEL_INFO;
-//static int          msglevel                =MSG_LEVEL_DEBUG;
-
-/*---------------------  Static Classes  ----------------------------*/
-
-/*---------------------  Export Definitions -------------------------*/
-
-
 static SChannelTblElement sChannelTbl[CB_MAX_CHANNEL+1] =
 {
(Continue reading)

Marcos Paulo de Souza | 1 Dec 2011 01:26
Picon

[PATCH 2/4] staging: vt6656: control.c: Remove dead code

This patch removes some commented code, and a unnused variables. Remove too
a return statement at end of void function.

Signed-off-by: Marcos Paulo de Souza <marcos.mage <at> gmail.com>
Cc: Greg Kroah-Hartman <gregkh <at> suse.de>
Cc: Forest Bond <forest <at> alittletooquiet.net>
Cc: devel <at> driverdev.osuosl.org
---
 drivers/staging/vt6656/control.c |   26 ++++--------------
 drivers/staging/vt6656/usbpipe.c |   53 --------------------------------------
 2 files changed, 6 insertions(+), 73 deletions(-)

diff --git a/drivers/staging/vt6656/control.c b/drivers/staging/vt6656/control.c
index 5d8c571..74e9e7a 100644
--- a/drivers/staging/vt6656/control.c
+++ b/drivers/staging/vt6656/control.c
 <at>  <at>  -43,19 +43,6  <at>  <at> 
 #include "control.h"
 #include "rndis.h"

-/*---------------------  Static Definitions -------------------------*/
-/* static int          msglevel                =MSG_LEVEL_INFO;  */
-/* static int          msglevel                =MSG_LEVEL_DEBUG; */
-/*---------------------  Static Classes  ----------------------------*/
-
-/*---------------------  Static Variables  --------------------------*/
-
-/*---------------------  Static Functions  --------------------------*/
-
-/*---------------------  Export Variables  --------------------------*/
(Continue reading)

Marcos Paulo de Souza | 1 Dec 2011 01:31
Picon

[PATCH 3/4] staging: vt6656: datarate.c: Remove unneeded comments

This patch remove some unneeded comments and make a atribution more simple.

Signed-off-by: Marcos Paulo de Souza <marcos.mage <at> gmail.com>
Cc: Greg Kroah-Hartman <gregkh <at> suse.de>
Cc: Forest Bond <forest <at> alittletooquiet.net>
Cc: devel <at> driverdev.osuosl.org
---
 drivers/staging/vt6656/datarate.c |   40 ++++--------------------------------
 drivers/staging/vt6656/datarate.h |   14 -------------
 drivers/staging/vt6656/desc.h     |   18 ----------------
 3 files changed, 5 insertions(+), 67 deletions(-)

diff --git a/drivers/staging/vt6656/datarate.c b/drivers/staging/vt6656/datarate.c
index 5c2719f..0a78914 100644
--- a/drivers/staging/vt6656/datarate.c
+++ b/drivers/staging/vt6656/datarate.c
 <at>  <at>  -44,17 +44,6  <at>  <at> 
 #include "srom.h"
 #include "rf.h"

-/*---------------------  Static Definitions -------------------------*/
-
-
-
-
-/*---------------------  Static Classes  ----------------------------*/
-
-
-
-/*---------------------  Static Variables  --------------------------*/
(Continue reading)

Marcos Paulo de Souza | 1 Dec 2011 01:37
Picon

[PATCH 4/4] staging: vt6656: dpc.c: Remove dead code

This patch removes some dead code, unneeded comments, commented code and
some unneeded debug messages.

Signed-off-by: Marcos Paulo de Souza <marcos.mage <at> gmail.com>
Cc: Greg Kroah-Hartman <gregkh <at> suse.de>
Cc: Forest Bond <forest <at> alittletooquiet.net>
Cc: devel <at> driverdev.osuosl.org
---
 drivers/staging/vt6656/device.h |   13 ------
 drivers/staging/vt6656/dpc.c    |   92 +-------------------------------------
 2 files changed, 3 insertions(+), 102 deletions(-)

diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index f1496ec..59cf5fc 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
 <at>  <at>  -97,7 +97,6  <at>  <at> 
 #include "key.h"
 #include "card.h"

-/*---------------------  Export Definitions -------------------------*/
 #define VNT_USB_VENDOR_ID                     0x160a
 #define VNT_USB_PRODUCT_ID                    0x3184

 <at>  <at>  -106,10 +105,6  <at>  <at> 
 #define MAX_MULTICAST_ADDRESS_NUM       32
 #define MULTICAST_ADDRESS_LIST_SIZE     (MAX_MULTICAST_ADDRESS_NUM * ETH_ALEN)

-//#define OP_MODE_INFRASTRUCTURE  0
-//#define OP_MODE_ADHOC           1
(Continue reading)

Martyn Welch | 1 Dec 2011 10:19
Picon
Favicon

Re: VME and the staging tree

On 30/11/11 11:00, Greg KH wrote:
> On Thu, Nov 03, 2011 at 05:25:39AM -0700, Greg KH wrote:
>> On Thu, Nov 03, 2011 at 02:23:31PM +0300, Dan Carpenter wrote:
>>> What I mean is who else can we ask to review this?  Probably it would
>>> be the PCI people.
>>>
>>> PCI SUBSYSTEM
>>> M:      Jesse Barnes <jbarnes <at> virtuousgeek.org>
>>> L:      linux-pci <at> vger.kernel.org
>>>
>>> That's the only obvious one that I know of, but there might be other
>>> people interested as well if we can think of them.  Andrew Morton was
>>> complaining about stuff coming out of staging without him being aware
>>> but he reads lkml so I think CC'ing lkml is enough for him.
>>
>> Yes, when we submit the patches to move things, copying lkml will be a
>> good idea.
>>
>> After the 3.2 merge window closes, next week, I'll take a look at the
>> code and let you know what I think needs to be done to get this out of
>> staging.
> 
> Ok, I didn't get past vme.h, please remove all the typedefs and the
> foolish _t stuff, and we can then retry this :)
> 

I assume that the correct thing to do (given that all those typedefs currently
map to u32s) is to just use u32s?

Martyn
(Continue reading)

Martyn Welch | 1 Dec 2011 10:21
Picon
Favicon

Re: [PATCH] Staging: VME: PIO2: Correct irq reset

On 30/11/11 10:34, Greg KH wrote:
> On Tue, Nov 29, 2011 at 01:28:05PM +0000, Martyn Welch wrote:
>> From: root <root <at> ES-J7S4D2J.amer.consind.ge.com>
> 
> I think you got this wrong :)
> 

Yeah - I was building this on a embedded system with an NFS file system. Due
to write permissions to the directory, I had to run as root to send the mail
and it seems that somewhere the tools helpfully added that for me :-(

> I'll edit it and make it from you...
> 

Thanks,

Martyn

> greg k-h

--

-- 
Martyn Welch (Lead Software Engineer)  | Registered in England and Wales
GE Intelligent Platforms               | (3828642) at 100 Barbirolli Square
T +44(0)1327322748                     | Manchester, M2 3AB
E martyn.welch <at> ge.com                  | VAT:GB 927559189
Valentin Rothberg | 1 Dec 2011 10:44

[PATCH 2/2] Staging: as102_drv.h: prinkt() should include facility level

The author did not answer my request to delete the ifdefs, so I decided to simply use KERN_DEBUG.

Signed-off-by: Valentin Rothberg <valentinrothberg <at> googlemail.com>
---
 drivers/staging/media/as102/as102_drv.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/media/as102/as102_drv.h b/drivers/staging/media/as102/as102_drv.h
index ec63d97..7ddcddd 100644
--- a/drivers/staging/media/as102/as102_drv.h
+++ b/drivers/staging/media/as102/as102_drv.h
 <at>  <at>  -47,8 +47,8  <at>  <at>  extern int as102_debug;
 	} } while (0)

 #ifdef TRACE
-#define ENTER()                 printk(">> enter %s\n", __func__)
-#define LEAVE()                 printk("<< leave %s\n", __func__)
+#define ENTER()                 printk(KERN_DEBUG ">> enter %s\n", __func__)
+#define LEAVE()                 printk(KERN_DEBUG "<< leave %s\n", __func__)
 #else
 #define ENTER()
 #define LEAVE()
--

-- 
1.7.5.4
Dan Carpenter | 1 Dec 2011 16:00
Picon
Favicon

Re: [PATCH 1/4] staging: vt6656: channel.c: Remove dead code

On Thu, Dec 01, 2011 at 12:22:49AM +0000, Marcos Paulo de Souza wrote:
> This patch remove some unneeded code. Some comments, for loop doing
> nothing, debug messages and unneeded variables was removed.
> 

This rewrites some stuff, it's not just deleting stuff...  Yes,
you've rewritten it in a better way, but you should mention that in
the changelog.  Maybe break it up into smaller patches or something?

>  <at>  <at>  -463,51 +444,23  <at>  <at>  void CHvInitChannelTable(void *pDeviceHandler)
>  
>      if ((pDevice->dwDiagRefCount != 0) ||
>          (pDevice->b11hEable == TRUE)) {
> -        if (bMultiBand == TRUE) {
> -		for (ii = 0; ii < CB_MAX_CHANNEL; ii++) {
> +	if (bMultiBand == TRUE)
                                ^
Don't delete the '{' from here.  Multi-line indents get {} braces
even though it's not needed for semantic reasons.

I told you that yesterday.  :/

> +		for (ii = 0; ii < CB_MAX_CHANNEL; ii++)
>  			sChannelTbl[ii+1].bValid = TRUE;

regards,
dan carpenter

(Continue reading)


Gmane