[PATCH 1/3] Staging: wlan-ng: fix alignment not matching.

2016-05-25 Thread Kevin McKinney
This patch fixes alignment should match open parenthesis found by
checkpatch.pl tool in prism2usb.c.

Signed-off-by: Kevin McKinney <klmckinn...@gmail.com>
---
 drivers/staging/wlan-ng/prism2usb.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/wlan-ng/prism2usb.c 
b/drivers/staging/wlan-ng/prism2usb.c
index b26d09f..43123f3 100644
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -47,11 +47,11 @@ static const struct usb_device_id usb_prism_tbl[] = {
PRISM_DEV(0x0bb2, 0x0302, "Ambit Microsystems Corp."),
PRISM_DEV(0x9016, 0x182d, "Sitecom WL-022 802.11b USB Adapter"),
PRISM_DEV(0x0543, 0x0f01,
-   "ViewSonic Airsync USB Adapter 11Mbps (Prism2.5)"),
+ "ViewSonic Airsync USB Adapter 11Mbps (Prism2.5)"),
PRISM_DEV(0x067c, 0x1022,
-   "Siemens SpeedStream 1022 11Mbps WLAN USB Adapter"),
+ "Siemens SpeedStream 1022 11Mbps WLAN USB Adapter"),
PRISM_DEV(0x049f, 0x0033,
-   "Compaq/Intel W100 PRO/Wireless 11Mbps multiport WLAN Adapter"),
+ "Compaq/Intel W100 PRO/Wireless 11Mbps multiport WLAN 
Adapter"),
{ } /* terminator */
 };
 MODULE_DEVICE_TABLE(usb, usb_prism_tbl);
@@ -216,7 +216,7 @@ exit:
 
 #ifdef CONFIG_PM
 static int prism2sta_suspend(struct usb_interface *interface,
-   pm_message_t message)
+pm_message_t message)
 {
hfa384x_t *hw = NULL;
wlandevice_t *wlandev;
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 2/3] Staging: wlan-ng: fix unnecessary parentheses.

2016-05-25 Thread Kevin McKinney
This patch fixes Unnecessary parentheses around interface->dev found
by checkpatch.pl tool.

Signed-off-by: Kevin McKinney <klmckinn...@gmail.com>
---
 drivers/staging/wlan-ng/prism2usb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wlan-ng/prism2usb.c 
b/drivers/staging/wlan-ng/prism2usb.c
index 43123f3..82be343 100644
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -74,7 +74,7 @@ static int prism2sta_probe_usb(struct usb_interface 
*interface,
}
hw = wlandev->priv;
 
-   if (wlan_setup(wlandev, &(interface->dev)) != 0) {
+   if (wlan_setup(wlandev, >dev) != 0) {
dev_err(>dev, "wlan_setup() failed.\n");
result = -EIO;
goto failed;
@@ -87,7 +87,7 @@ static int prism2sta_probe_usb(struct usb_interface 
*interface,
/* Register the wlandev, this gets us a name and registers the
 * linux netdevice.
 */
-   SET_NETDEV_DEV(wlandev->netdev, &(interface->dev));
+   SET_NETDEV_DEV(wlandev->netdev, >dev);
 
/* Do a chip-level reset on the MAC */
if (prism2_doreset) {
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 0/3] fix issues in prism2usb.c.

2016-05-25 Thread Kevin McKinney
This patchset will address issues reported by checkpatch.pl tool
for file prism2usb.c.

Kevin McKinney (3):
  Staging: wlan-ng: fix alignment not matching.
  Staging: wlan-ng: fix unnecessary parentheses.
  Staging: wlan-ng: fix comparison to NULL issue.

 drivers/staging/wlan-ng/prism2usb.c | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 3/3] Staging: wlan-ng: fix comparison to NULL issue.

2016-05-25 Thread Kevin McKinney
This patch fixes comparison to NULL could be written "wlandev" found
by checkpatch.pl tool.

Signed-off-by: Kevin McKinney <klmckinn...@gmail.com>
---
 drivers/staging/wlan-ng/prism2usb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/wlan-ng/prism2usb.c 
b/drivers/staging/wlan-ng/prism2usb.c
index 82be343..0463ec1 100644
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -137,7 +137,7 @@ static void prism2sta_disconnect_usb(struct usb_interface 
*interface)
wlandevice_t *wlandev;
 
wlandev = (wlandevice_t *)usb_get_intfdata(interface);
-   if (wlandev != NULL) {
+   if (wlandev) {
LIST_HEAD(cleanlist);
hfa384x_usbctlx_t *ctlx, *temp;
unsigned long flags;
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 3/3] Staging: wlan-ng: fix comparison to NULL. This patch fixes comparison to NULL found by checkpatch.pl tool.

2016-05-25 Thread Kevin McKinney
Signed-off-by: Kevin McKinney <klmckinn...@gmail.com>
---
 drivers/staging/wlan-ng/prism2usb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/wlan-ng/prism2usb.c 
b/drivers/staging/wlan-ng/prism2usb.c
index 82be343..0463ec1 100644
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -137,7 +137,7 @@ static void prism2sta_disconnect_usb(struct usb_interface 
*interface)
wlandevice_t *wlandev;
 
wlandev = (wlandevice_t *)usb_get_intfdata(interface);
-   if (wlandev != NULL) {
+   if (wlandev) {
LIST_HEAD(cleanlist);
hfa384x_usbctlx_t *ctlx, *temp;
unsigned long flags;
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 2/3] Staging: wlan-ng: fix unnecessary parentheses around interface-dev. This is a path to fix unnecessary parentheses around interface-dev found by checkpatch.pl tool.

2016-05-25 Thread Kevin McKinney
Signed-off-by: Kevin McKinney <klmckinn...@gmail.com>
---
 drivers/staging/wlan-ng/prism2usb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wlan-ng/prism2usb.c 
b/drivers/staging/wlan-ng/prism2usb.c
index 43123f3..82be343 100644
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -74,7 +74,7 @@ static int prism2sta_probe_usb(struct usb_interface 
*interface,
}
hw = wlandev->priv;
 
-   if (wlan_setup(wlandev, &(interface->dev)) != 0) {
+   if (wlan_setup(wlandev, >dev) != 0) {
dev_err(>dev, "wlan_setup() failed.\n");
result = -EIO;
goto failed;
@@ -87,7 +87,7 @@ static int prism2sta_probe_usb(struct usb_interface 
*interface,
/* Register the wlandev, this gets us a name and registers the
 * linux netdevice.
 */
-   SET_NETDEV_DEV(wlandev->netdev, &(interface->dev));
+   SET_NETDEV_DEV(wlandev->netdev, >dev);
 
/* Do a chip-level reset on the MAC */
if (prism2_doreset) {
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 0/3] fix wlan-ng/prism2usb.c

2016-05-25 Thread Kevin McKinney
This patchset will fix the below issues reported checkpatch.pl tool.

Kevin McKinney (3):
  Staging: wlan-ng: fix Alignment should match open parenthesis.
This patch fixes alignment of parenthesis found by checkpatch.pl
tool.
  Staging: wlan-ng: fix unnecessary parentheses around interface-dev.   
 This is a path to fix unnecessary parentheses around interface-dev
found by checkpatch.pl tool.
  Staging: wlan-ng: fix comparison to NULL. This patch fixes
comparison to NULL found by checkpatch.pl tool.

 drivers/staging/wlan-ng/prism2usb.c | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 1/3] Staging: wlan-ng: fix Alignment should match open parenthesis. This patch fixes alignment of parenthesis found by checkpatch.pl tool.

2016-05-25 Thread Kevin McKinney
Signed-off-by: Kevin McKinney <klmckinn...@gmail.com>
---
 drivers/staging/wlan-ng/prism2usb.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/wlan-ng/prism2usb.c 
b/drivers/staging/wlan-ng/prism2usb.c
index b26d09f..43123f3 100644
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -47,11 +47,11 @@ static const struct usb_device_id usb_prism_tbl[] = {
PRISM_DEV(0x0bb2, 0x0302, "Ambit Microsystems Corp."),
PRISM_DEV(0x9016, 0x182d, "Sitecom WL-022 802.11b USB Adapter"),
PRISM_DEV(0x0543, 0x0f01,
-   "ViewSonic Airsync USB Adapter 11Mbps (Prism2.5)"),
+ "ViewSonic Airsync USB Adapter 11Mbps (Prism2.5)"),
PRISM_DEV(0x067c, 0x1022,
-   "Siemens SpeedStream 1022 11Mbps WLAN USB Adapter"),
+ "Siemens SpeedStream 1022 11Mbps WLAN USB Adapter"),
PRISM_DEV(0x049f, 0x0033,
-   "Compaq/Intel W100 PRO/Wireless 11Mbps multiport WLAN Adapter"),
+ "Compaq/Intel W100 PRO/Wireless 11Mbps multiport WLAN 
Adapter"),
{ } /* terminator */
 };
 MODULE_DEVICE_TABLE(usb, usb_prism_tbl);
@@ -216,7 +216,7 @@ exit:
 
 #ifdef CONFIG_PM
 static int prism2sta_suspend(struct usb_interface *interface,
-   pm_message_t message)
+pm_message_t message)
 {
hfa384x_t *hw = NULL;
wlandevice_t *wlandev;
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 0/3] fix wlan-ng/prism2usb.c

2016-05-20 Thread Kevin McKinney
This patchset will fix the below issues reported checkpatch.pl tool.

Kevin McKinney (3):
  Staging: wlan-ng: fix Alignment should match open parenthesis.
This patch fixes alignment of parenthesis found by checkpatch.pl
tool.
  Staging: wlan-ng: fix unnecessary parentheses around interface-dev.   
 This is a path to fix unnecessary parentheses around interface-dev
found by checkpatch.pl tool.
  Staging: wlan-ng: fix comparison to NULL. This patch fixes
comparison to NULL found by checkpatch.pl tool.

 drivers/staging/wlan-ng/prism2usb.c | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 2/3] Staging: wlan-ng: fix unnecessary parentheses around interface-dev. This is a path to fix unnecessary parentheses around interface-dev found by checkpatch.pl tool.

2016-05-20 Thread Kevin McKinney
Signed-off-by: Kevin McKinney <klmckinn...@gmail.com>
---
 drivers/staging/wlan-ng/prism2usb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wlan-ng/prism2usb.c 
b/drivers/staging/wlan-ng/prism2usb.c
index 43123f3..82be343 100644
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -74,7 +74,7 @@ static int prism2sta_probe_usb(struct usb_interface 
*interface,
}
hw = wlandev->priv;
 
-   if (wlan_setup(wlandev, &(interface->dev)) != 0) {
+   if (wlan_setup(wlandev, >dev) != 0) {
dev_err(>dev, "wlan_setup() failed.\n");
result = -EIO;
goto failed;
@@ -87,7 +87,7 @@ static int prism2sta_probe_usb(struct usb_interface 
*interface,
/* Register the wlandev, this gets us a name and registers the
 * linux netdevice.
 */
-   SET_NETDEV_DEV(wlandev->netdev, &(interface->dev));
+   SET_NETDEV_DEV(wlandev->netdev, >dev);
 
/* Do a chip-level reset on the MAC */
if (prism2_doreset) {
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 3/3] Staging: wlan-ng: fix comparison to NULL. This patch fixes comparison to NULL found by checkpatch.pl tool.

2016-05-20 Thread Kevin McKinney
Signed-off-by: Kevin McKinney <klmckinn...@gmail.com>
---
 drivers/staging/wlan-ng/prism2usb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/wlan-ng/prism2usb.c 
b/drivers/staging/wlan-ng/prism2usb.c
index 82be343..0463ec1 100644
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -137,7 +137,7 @@ static void prism2sta_disconnect_usb(struct usb_interface 
*interface)
wlandevice_t *wlandev;
 
wlandev = (wlandevice_t *)usb_get_intfdata(interface);
-   if (wlandev != NULL) {
+   if (wlandev) {
LIST_HEAD(cleanlist);
hfa384x_usbctlx_t *ctlx, *temp;
unsigned long flags;
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 1/3] Staging: wlan-ng: fix Alignment should match open parenthesis. This patch fixes alignment of parenthesis found by checkpatch.pl tool.

2016-05-20 Thread Kevin McKinney
Signed-off-by: Kevin McKinney <klmckinn...@gmail.com>
---
 drivers/staging/wlan-ng/prism2usb.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/wlan-ng/prism2usb.c 
b/drivers/staging/wlan-ng/prism2usb.c
index b26d09f..43123f3 100644
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -47,11 +47,11 @@ static const struct usb_device_id usb_prism_tbl[] = {
PRISM_DEV(0x0bb2, 0x0302, "Ambit Microsystems Corp."),
PRISM_DEV(0x9016, 0x182d, "Sitecom WL-022 802.11b USB Adapter"),
PRISM_DEV(0x0543, 0x0f01,
-   "ViewSonic Airsync USB Adapter 11Mbps (Prism2.5)"),
+ "ViewSonic Airsync USB Adapter 11Mbps (Prism2.5)"),
PRISM_DEV(0x067c, 0x1022,
-   "Siemens SpeedStream 1022 11Mbps WLAN USB Adapter"),
+ "Siemens SpeedStream 1022 11Mbps WLAN USB Adapter"),
PRISM_DEV(0x049f, 0x0033,
-   "Compaq/Intel W100 PRO/Wireless 11Mbps multiport WLAN Adapter"),
+ "Compaq/Intel W100 PRO/Wireless 11Mbps multiport WLAN 
Adapter"),
{ } /* terminator */
 };
 MODULE_DEVICE_TABLE(usb, usb_prism_tbl);
@@ -216,7 +216,7 @@ exit:
 
 #ifdef CONFIG_PM
 static int prism2sta_suspend(struct usb_interface *interface,
-   pm_message_t message)
+pm_message_t message)
 {
hfa384x_t *hw = NULL;
wlandevice_t *wlandev;
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: How to cleanup this functions?

2014-07-02 Thread Kevin McKinney
On Tue, Jul 01, 2014 at 11:42:27AM +0200, Matthias Beyer wrote:
 Hi Kevin,
 
 Don't know if this mail should go to the ML, too, ... if you want, you
 can forward it or add the ML as recipient for your answer!
 
 I'm currently working on some cleanup patches for the
 
 drivers/staging/bcm/IPv6Protocol.c
 
 file.
 
 I want to clean up the code for the functions [0]
 
 MatchSrcIpv6Address()
 MatchDestIpv6Address()
 
 as this code is literally the same. They differ just in what they
 print via the BCM_DEBUG_PRINT() macro.
 
 Do you have an Idea how to generalize this functions? The problem I'm
 facing is that the named macro wants some string literals, but when
 outsourcing the code, I'm not able to generalize these.

I think you can make the string literal in the BCM_DEBUG_PRINT() macro
generic.  Instead of specifying the source or destination IP Address; I would 
simply
say the IP Address. I would make the 4 messages generic and remove one of 
these functions. Thereby reducing the lines of code, like you said.
 
 I have some ideas how to solve this problem:
 
 1) Passing Function-Ptrs as debug-print callbacks to the generalized
function. Not clean at all, as for each BCM_DEBUG_PRINT() call I would
pass one function-ptr.
 
 2) A static const variable which contains the strings in a struct[],
passing the index of the appropriate struct to the generalized
function. Not very clean.
 
 3) Passing a simple flag, the generalized function decides which
string to BCM_DEBUG_PRINT(). Clean, but not very readable.
 
 If you don't know either, I would start with the 3rd approach and look
 what the maintainers say.

Let's take inventory for the maintainers and see what other ideas they have.

 Btw: This patch would result in 50 lines less in the file, which is
 desireable, I guess.
 
 [0]: 
 https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/drivers/staging/bcm/IPv6Protocol.c#n291
 
 -- 
 Mit freundlichen Grüßen,
 Kind regards,
 Matthias Beyer
 
 Proudly sent with mutt.
 Happily signed with gnupg.


___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] Staging: bcm: Add entry for bcm wimax driver support

2014-07-02 Thread Kevin McKinney
Add myself and Matthias Beyer as maintainers for
the bcm wimax driver.

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 MAINTAINERS |7 +++
 1 file changed, 7 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index e2207f7..0853c33 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1777,6 +1777,13 @@ W:   http://bcache.evilpiepirate.org
 S: Maintained:
 F: drivers/md/bcache/
 
+BECEEM BCS200/BCS220-3/BCSM250 WIMAX SUPPORT
+M: Kevin McKinney klmckinn...@gmail.com
+M: Matthias Beyer m...@beyermatthias.de
+L: de...@driverdev.osuosl.org
+S: Maintained
+F: drivers/staging/bcm*
+
 BEFS FILE SYSTEM
 S: Orphan
 F: Documentation/filesystems/befs.txt
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] Add MAINTAINERS

2014-07-02 Thread Kevin McKinney
Add new entry for bcm wimax

Kevin McKinney (1):
  Staging: bcm: Add entry for bcm wimax driver support

 MAINTAINERS |7 +++
 1 file changed, 7 insertions(+)

-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] Edit TODO file

2014-06-30 Thread Kevin McKinney
Add maintainers to the TODO file.

Kevin McKinney (1):
  Staging: bcm: Change TODO to include maintainers.

 drivers/staging/bcm/TODO |4 
 1 file changed, 4 insertions(+)

-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: [PATCH 0/4] drivers/staging/bcm/InterfaceRx.c cleanup patches

2014-06-30 Thread Kevin McKinney
On Mon, Jun 30, 2014 at 10:10:00AM +0200, Matthias Beyer wrote:
 Hi,
 
 these are my cleanup patches for the
 
 drivers/staging/bcm/InterfaceRx.c
 
 file. They contain:
 
 * Line shortenings (as usual)
 * Outsourcing code chunks from long functions
 
 Please note: As I do not have the appropriate hardware, I am not able to test
 these changes. I compiled them at least.
 
 Kind regards,
 Matthias Beyer
 
 Matthias Beyer (4):
   Staging: bcm: InterfaceRx.c: Lines shortened
   Staging: bcm: InterfaceRx.c: Outsourced control packet handling
   Staging: bcm: InterfaceRx.c: Outsourced code chunk
   Staging: bcm: InterfaceRx.c: Removed unused variable
 
  drivers/staging/bcm/InterfaceRx.c | 206 
 --
  1 file changed, 131 insertions(+), 75 deletions(-)

This patchset looks good to me.

 -- 
 2.0.1
 
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: [PATCH 0/3] drivers/staging/bcm/InterfaceTx.c cleanup patches

2014-06-30 Thread Kevin McKinney
On Mon, Jun 30, 2014 at 10:20:21AM +0200, Matthias Beyer wrote:
 Hi,
 
 these are my patches for the
 
 drivers/staging/bcm/InterfaceTx.c
 
 file. They contain:
 
 * Line length and whitespace cleanup
 * Outsourcing a chunk of code from a long function
 
 Please note: As I do not have the appropriate hardware, I'm not able to test
 these patches. I compiled them at least.
 
 Kind regards,
 Matthias Beyer
 
 Matthias Beyer (3):
   Staging: bcm: InterfaceTx.c: Shortened lines + Whitespace cleanup
   Staging: bcm: InterfaceTx.c: Outsourced code chunk
   Staging: bcm: InterfaceTx.c: checkpath fix: Blank line after
 declarations
 
  drivers/staging/bcm/InterfaceTx.c | 185 
 +++---
  1 file changed, 112 insertions(+), 73 deletions(-)

This patchset looks good to me.
 
 -- 
 2.0.1
 
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: [PATCH 0/5] drivers/staging/bcm/LeakyBucket.c cleanup patches

2014-06-30 Thread Kevin McKinney
On Mon, Jun 30, 2014 at 10:25:16AM +0200, Matthias Beyer wrote:
 Hi,
 
 these are my cleanup patches for the
 
 drivers/staging/bcm/LeakyBucket.c
 
 file. They contain:
 
 * Replacing member accessing by variables, for simplifying code
 * Line lengths shortened
 * Outsourcing code chunks from long functions
 
 Please note: As I do not have the appropriate hardware, I'm not able to test
 these patches. I compiled them at least.
 
 Kind regards,
 Matthias Beyer
 
 Matthias Beyer (5):
   Staging: bcm: LeakyBucket.c: Replaced member accessing by variable
   Staging: bcm: LeakyBucket.c: Shortened lines
   Staging: bcm: LeakyBucket.c: Outsourced code chunk into function
   Staging: bcm: LeakyBucket.c: Outsourced ctrl packet sending
   Staging: bcm: LeakyBucket.c: Removed unneccessary return; statement
 
  drivers/staging/bcm/LeakyBucket.c | 312 
 +++---
  1 file changed, 187 insertions(+), 125 deletions(-)

This patchset looks good to me.
 
 -- 
 2.0.1
 
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: [PATCH] Staging: bcm: Change TODO to include maintainers.

2014-06-30 Thread Kevin McKinney
On Mon, Jun 30, 2014 at 05:01:49PM -0700, Greg KH wrote:
 On Mon, Jun 30, 2014 at 04:30:26PM -0400, Kevin McKinney wrote:
  Add myself and Matthias Beyer
  to the TODO file as the list of maintainers.
  
  Signed-off-by: Kevin McKinney klmckinn...@gmail.com
  ---
   drivers/staging/bcm/TODO |4 
   1 file changed, 4 insertions(+)
  
  diff --git a/drivers/staging/bcm/TODO b/drivers/staging/bcm/TODO
  index cd3e9f2..8467f45 100644
  --- a/drivers/staging/bcm/TODO
  +++ b/drivers/staging/bcm/TODO
  @@ -1,5 +1,9 @@
   This driver is barely functional in its current state.
   
  +Kevin McKinney(klmckinn...@gmail.com) and Matthias 
  Beyer(m...@beyermatthias.de)
  +are currently maintaining/cleaning up this driver.  Please copy us on all
  +patches.  More maintainers are aways welcomed.
  +
 
 Care to also ad a MAINTAINERS entry so that tools like
 scripts/get_maintainer.pl work properly with your email addresses?

Sure, I will resubmit this patch.
 
 thanks,
 
 greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: Question about patches for bcm

2014-06-26 Thread Kevin McKinney
On Thu, Jun 26, 2014 at 11:14 AM, Matthias Beyer m...@beyermatthias.de wrote:
 Hi,

 your email client sends HTML-Emails. Can you switch this off? Maybe
 that's also the reason why your emails don't show up in the
 archives[0]!

Yeh, sorry about that. During the day I use gmail instead of mutt and
I forget to turn off HTML emails.

 I will send my patches tomorrow, no time now.

No problem, I typically work in the evenings EST.

 Regards,
 Matthias

 [0]: 
 http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2014-June/thread.html

 On 26-06-2014 11:11:40, Kevin McKinney wrote:
On Thu, Jun 26, 2014 at 11:02 AM, Matthias Beyer m...@beyermatthias.de
wrote:

  On 26-06-2014 10:58:20, Kevin McKinney wrote:
   A  A On Thu, Jun 26, 2014 at 10:42 AM, Matthias Beyer
  m...@beyermatthias.de
   A  A wrote:
  
   A  A  A Hi,
  
   A  A  A I have a question related to some patches I send in.
  
   A  A  A (I send them to de...@driverdev.osuosl.org, but they show up
  in the
   A  A  A archives of this list... so I'm asking here)
  
   A  A  A I send 6 patch sets since the beginning of the month. Some of
  them
   A  A  A where reviewed, some not. None of them is upstream by now. Did
   A  A  A something got stuck?
  
   A  A  A I did some research and found a message in the archives[0]
  related to
   A  A  A the bcm driver. It seems that there is still work in progress
  on this
   A  A  A driver, so I guess my patches are not obsolete, right?
  
   A  A  A I have more cleanup patchsets for this driver lying around
  (about 70
   A  A  A patches overall, ca 1/4 already submitted but not yet
  applied).
   A  A  A I don't want to send all of them at once, as this just leads
  to
   A  A  A confusion (as they are split up into 13 branches/patchsets).
  
   A  A  A I almost patched all files in the driver. My second iteration
  would
   A  A  A contain some refactoring of the type / member names, moving
  headers
   A  A  A around, maybe splitting files, etc. Is this okay for you?
  
   A  A  A Is there someone out there who actively works on the driver?
  Maybe I
   A  A  A could send my patches to this person instead to the ML, so we
  can
   A  A  A sync up our workflow to get this stuff done faster?
  
   A  A Hi Matthias,
   A  A I have been working on this driver for a while now. I am
  currently fixing
   A  A a 64 bit casting bug; and I think I have a fix but I trying to
  get the
   A  A hardware so I can test. A I believe it has to do with the ntohl
  function
   A  A only accepting 32 bit values, and not 64 bit. But I need the
  hardware in
   A  A order to test this theory. A We can work together to get this
  driver
   A  A completed faster if you like. A I can review your patches? Can
  you resend
   A  A your last iteration of patches? A I hope to have the hardware
  soon, and we
   A  A can really get some good testing going on.
   A  A A

  Hi Kevin,

  I can send the patches, sure. Shall I send them directly to you or
  with this ML in CC? Should I send the 6 already submitted patchsets or
  should I submit all patches I have done so far?

Yes, please send to ML and CC me.
A

  I guess you do just reviewing, greg k-h still applies them, right?

Yes, Greg always reviews and applies patches. A There are also other
reviewers with a lot more experience than me :)
A

  I do not have the hardware, I do my patches, compile them and run them
  through checkpatch.pl, but I have no hardware to test. All my patches
  are just cleanup patches (line shortening, code simplifications,
  oursourcing of code chunks into functions and the like), I just got
  into kernel stuff (and I love doing it :-) ).

That's okay about not having the hardware.
A

  --
  Mit freundlichen GrA 1/4A*en,
  Kind regards,
  Matthias Beyer

  Proudly sent with mutt.
  Happily signed with gnupg.

 --
 Mit freundlichen Grüßen,
 Kind regards,
 Matthias Beyer

 Proudly sent with mutt.
 Happily signed with gnupg.
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: Anybody working on bcm?

2014-06-20 Thread Kevin McKinney
On Fri, Jun 20, 2014 at 11:46:06AM -0700, Greg KH wrote:
 On Fri, Jun 20, 2014 at 02:07:32PM -0400, Kevin McKinney wrote:
  On Fri, Jun 20, 2014 at 1:13 PM, Stephen Hemminger 
  step...@networkplumber.org
  wrote:
  
  On Fri, 20 Jun 2014 19:49:33 +0300
  Kristina Martšenko kristina.martse...@gmail.com wrote:
  
   Hi Stephen,
  
   I'm helping Greg do a bit of cleanup in the staging tree. I noticed 
  that
   nobody seems to have worked towards moving bcm out of staging in over 
  a
   year. Are there any plans to clean it up and move it out soon? Because
   otherwise we're going to have to delete the driver, as we don't want
   staging to become a permanent place for unfinished code.
  
   Thanks,
   Kristina
  
  
   
  Hi Kristina,
  I will continue working on this driver. Please leave this driver in staging 
  if
  possible.
 
 Do you have the hardware for this to test with?

I currently do not have the hardware, but I will be moving to an area with 
WiMax Coverage soon. I will then fix a nasty 64 bit bug that I have been 
working on
for a while now.  I understand you need delete this unfinished driver; however 
if you could leave it in staging that would be great.

Thanks,
Kevin

 thanks,
 
 greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: Anybody working on bcm?

2014-06-20 Thread Kevin McKinney
On Fri, Jun 20, 2014 at 12:40:40PM -0700, Greg KH wrote:
 On Fri, Jun 20, 2014 at 03:02:11PM -0400, Kevin McKinney wrote:
  On Fri, Jun 20, 2014 at 11:46:06AM -0700, Greg KH wrote:
   On Fri, Jun 20, 2014 at 02:07:32PM -0400, Kevin McKinney wrote:
On Fri, Jun 20, 2014 at 1:13 PM, Stephen Hemminger 
step...@networkplumber.org
wrote:

On Fri, 20 Jun 2014 19:49:33 +0300
Kristina Martšenko kristina.martse...@gmail.com wrote:

 Hi Stephen,

 I'm helping Greg do a bit of cleanup in the staging tree. I 
noticed that
 nobody seems to have worked towards moving bcm out of staging in 
over a
 year. Are there any plans to clean it up and move it out soon? 
Because
 otherwise we're going to have to delete the driver, as we don't 
want
 staging to become a permanent place for unfinished code.

 Thanks,
 Kristina


 
Hi Kristina,
I will continue working on this driver. Please leave this driver in 
staging if
possible.
   
   Do you have the hardware for this to test with?
  
  I currently do not have the hardware, but I will be moving to an area
  with WiMax Coverage soon.
 
 Even in those areas, do they still use this specific type of hardware?
 I thought it was long obsolete.

Sprint will offer WiMax coverage through 2015.  In addition, there are other 
ISP's that offer this particulare hardware.
Either way, we have until the end of 2015 to get this driver out of staging :). 

  I will then fix a nasty 64 bit bug that I have been working on for a
  while now.  I understand you need delete this unfinished driver;
  however if you could leave it in staging that would be great.
 
 If you want to maintain and work to clean it up and out of staging,
 that's great, care to send a patch adding your name to the TODO file?

Sure, I will submit a patch adding my name to the TODO file.

 thanks,
 
 greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: [PATCH v2 0/8] staging: bcm: Clean up user defined data types

2013-10-30 Thread Kevin McKinney
On Wed, Oct 30, 2013 at 02:46:27AM -0700, Lisa Nguyen wrote:
 On Wed, Oct 30, 2013 at 1:55 AM, Dan Carpenter dan.carpen...@oracle.com 
 wrote:
  You and Kevin are treading on each other's patches.  CC each other for
  bcm work.
 
  regards,
  dan carpenter
 
 
 Ah, I wasn't aware of this. Huge part of the problem would probably be
 is that I'm not currently subscribed to the devel@driverdev mailing
 list, so I'm not as mindful about other people's patch submissions.
 Whoops. I will take care of this when I get back later this week.
 
 Oh and hi Kevin!
Hi Lisa, nice to meet you!!

I apologize for all of this confusion.  I will make sure to apply all of your 
patches before changing
any bcm code.  I will also copy you on any patches I submit.  Hopefully we can 
get this driver cleaned up and fully functional!

Are you able to test this driver? I am still trying, I have been for a while 
now.  The problem is, I use to live in an area where
WiMax was not supported, but now I think I can finally get WiMax.  Anyway, I 
hope to have the hardware functioning soon.

Thanks,
Kevin

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: [PATCH v2 0/8] staging: bcm: Clean up user defined data types

2013-10-30 Thread Kevin McKinney
On Wed, Oct 30, 2013 at 09:40:10AM -0700, Greg KH wrote:
 Lisa and Kevin, you both keep stomping on each others patches, making my
 merges a pain :(

Sorry about this. I will make sure this does not happen again.
 
 My tree is now closed for 3.13 stuff like this, so I recommend doing
 something else for a few weeks until 3.13-rc1 is out, as I can't take
 any more patches for this type of cleanups until that is released by
 Linus.
Okay, sounds good.

 thanks,
 
 greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 08/12 V3] Staging: bcm: Replace B_UINT8 with u8 in Adapter.h

2013-10-29 Thread Kevin McKinney
This patch replaces B_UINT8 with u8
in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index ff36739..ad7b814 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -65,7 +65,7 @@ struct bcm_classifier_rule {
u16 uiClassifierRuleIndex;
boolbUsed;
unsigned short  usVCID_Value;
-   B_UINT8 u8ClassifierRulePriority; /* This field detemines the 
Classifier Priority */
+   u8  u8ClassifierRulePriority; /* This field detemines the 
Classifier Priority */
union bcm_ip_address stSrcIpAddress;
u8  ucIPSourceAddressLength; /* Ip Source Address Length */
 
@@ -126,13 +126,13 @@ struct bcm_packet_info {
unsigned short  usVCID_Value;
UINTuiThreshold;
/* This field determines the priority of the SF Queues */
-   B_UINT8 u8TrafficPriority;
+   u8  u8TrafficPriority;
 
boolbValid;
boolbActive;
boolbActivateRequestSent;
 
-   B_UINT8 u8QueueType; /* BE or rtPS */
+   u8  u8QueueType; /* BE or rtPS */
 
UINTuiMaxBucketSize; /* maximum size of the bucket for the 
queue */
UINTuiCurrentQueueDepthOnTarget;
@@ -296,7 +296,7 @@ struct bcm_mini_adapter {
int DDRSetting;
unsigned long   ulPowerSaveMode;
spinlock_t  txtransmitlock;
-   B_UINT8 txtransmit_running;
+   u8  txtransmit_running;
/* Thread for control packet handling */
struct task_struct  *control_packet_handler;
/* thread for transmitting packets. */
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 03/12 V3] Staging: bcm: Replace USHORT with unsigned short in Adapter.h

2013-10-29 Thread Kevin McKinney
This patch replaces USHORT with unsigned
short in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 33b5063..08bd9fc 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -8,8 +8,8 @@
 #include Debug.h
 
 struct bcm_leader {
-   USHORT  Vcid;
-   USHORT  PLength;
+   unsigned short Vcid;
+   unsigned short PLength;
UCHAR   Status;
UCHAR   Unused[3];
 } __packed;
@@ -64,7 +64,7 @@ struct bcm_classifier_rule {
UCHAR   ucReserved[2];
B_UINT16uiClassifierRuleIndex;
boolbUsed;
-   USHORT  usVCID_Value;
+   unsigned short  usVCID_Value;
B_UINT8 u8ClassifierRulePriority; /* This field detemines the 
Classifier Priority */
union bcm_ip_address stSrcIpAddress;
UCHAR   ucIPSourceAddressLength; /* Ip Source Address Length */
@@ -78,12 +78,12 @@ struct bcm_classifier_rule {
 
UCHAR   ucProtocolLength; /* protocol Length */
UCHAR   ucProtocol[MAX_PROTOCOL_LENGTH]; /* protocol Length */
-   USHORT  usSrcPortRangeLo[MAX_PORT_RANGE];
-   USHORT  usSrcPortRangeHi[MAX_PORT_RANGE];
+   unsigned short  usSrcPortRangeLo[MAX_PORT_RANGE];
+   unsigned short  usSrcPortRangeHi[MAX_PORT_RANGE];
UCHAR   ucSrcPortRangeLength;
 
-   USHORT  usDestPortRangeLo[MAX_PORT_RANGE];
-   USHORT  usDestPortRangeHi[MAX_PORT_RANGE];
+   unsigned short  usDestPortRangeLo[MAX_PORT_RANGE];
+   unsigned short  usDestPortRangeHi[MAX_PORT_RANGE];
UCHAR   ucDestPortRangeLength;
 
boolbProtocolValid;
@@ -108,14 +108,14 @@ struct bcm_classifier_rule {
UCHAR   ucEtherTypeLen;
UCHAR   au8EthCSEtherType[NUM_ETHERTYPE_BYTES];
UCHAR   usUserPriority[2];
-   USHORT  usVLANID;
-   USHORT  usValidityBitMap;
+   unsigned short  usVLANID;
+   unsigned short  usValidityBitMap;
 };
 
 struct bcm_fragmented_packet_info {
boolbUsed;
ULONG   ulSrcIpAddress;
-   USHORT  usIpIdentification;
+   unsigned short  usIpIdentification;
struct bcm_classifier_rule *pstMatchedClassifierEntry;
boolbOutOfOrderFragment;
 };
@@ -123,7 +123,7 @@ struct bcm_fragmented_packet_info {
 struct bcm_packet_info {
/* classification extension Rule */
ULONG   ulSFID;
-   USHORT  usVCID_Value;
+   unsigned short  usVCID_Value;
UINTuiThreshold;
/* This field determines the priority of the SF Queues */
B_UINT8 u8TrafficPriority;
@@ -150,7 +150,7 @@ struct bcm_packet_info {
UINTuiMaxAllowedRate;
UINTNumOfPacketsSent;
UCHAR   ucDirection;
-   USHORT  usCID;
+   unsigned short  usCID;
struct bcm_mibs_parameters stMibsExtServiceFlowTable;
UINTuiCurrentRxRate;
UINTuiThisPeriodRxBytes;
@@ -244,8 +244,8 @@ struct bcm_mini_adapter {
/* this to keep track of the Tx and Rx MailBox Registers. */
atomic_tCurrNumFreeTxDesc;
/* to keep track the no of byte received */
-   USHORT  PrevNumRecvDescs;
-   USHORT  CurrNumRecvDescs;
+   unsigned short  PrevNumRecvDescs;
+   unsigned short  CurrNumRecvDescs;
UINTu32TotalDSD;
struct bcm_packet_info  PackInfo[NO_OF_QUEUES];
struct bcm_classifier_rule astClassifierTable[MAX_CLASSIFIERS];
@@ -284,7 +284,7 @@ struct bcm_mini_adapter {
boolbBinDownloaded;
boolbCfgDownloaded;
boolbSyncUpRequestSent;
-   USHORT  usBestEffortQueueIndex;
+   unsigned short  usBestEffortQueueIndex;
wait_queue_head_t   ioctl_fw_dnld_wait_queue;
boolwaiting_to_fw_download_done;
pid_t   fw_download_process_pid;
@@ -400,7 +400,7 @@ struct bcm_mini_adapter {
 struct bcm_eth_header {
UCHAR   au8DestinationAddress[6];
UCHAR   au8SourceAddress[6];
-   USHORT  u16Etype;
+   unsigned short u16Etype;
 } __packed;
 
 struct bcm_firmware_info {
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 01/12 V3] Staging: bcm: Fix WARNING: space prohibited before semicolon.

2013-10-29 Thread Kevin McKinney
This patch removes a space before semicolon as
specified by checkpatch.pl.

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index d6c9630..11fd7f1 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -267,7 +267,7 @@ struct bcm_mini_adapter {
boolfw_download_done;
 
char*txctlpacket[MAX_CNTRL_PKTS];
-   atomic_tcntrlpktCnt ;
+   atomic_tcntrlpktCnt;
atomic_tindex_app_read_cntrlpkt;
atomic_tindex_wr_txcntrlpkt;
atomic_tindex_rd_txcntrlpkt;
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 09/12 V3] Staging: bcm: Replace UINT32 with u32 in Adapter.h

2013-10-29 Thread Kevin McKinney
This patch replaces UINT32 with u32
in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index ad7b814..e4aee04 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -94,7 +94,7 @@ struct bcm_classifier_rule {
/* For IPv6 Addressing */
u8  ucDirection;
boolbIpv6Protocol;
-   UINT32  u32PHSRuleID;
+   u32 u32PHSRuleID;
struct bcm_phs_rule sPhsRule;
u8  u8AssociatedPHSI;
 
@@ -340,11 +340,11 @@ struct bcm_mini_adapter {
boolAutoFirmDld;
boolbMipsConfig;
boolbDPLLConfig;
-   UINT32  aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
-   UINT32  aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
+   u32 aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
+   u32 aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
struct bcm_fragmented_packet_info 
astFragmentedPktClassifierTable[MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES];
atomic_tuiMBupdate;
-   UINT32  PmuMode;
+   u32 PmuMode;
enum bcm_nvm_type   eNVMType;
UINTuiSectorSize;
UINTuiSectorSizeInCFG;
@@ -388,7 +388,7 @@ struct bcm_mini_adapter {
boolbDoSuspend;
UINTsyscfgBefFwDld;
boolStopAllXaction;
-   UINT32  liTimeSinceLastNetEntry; /* Used to Support 
extended CAPI requirements from */
+   u32 liTimeSinceLastNetEntry; /* Used to Support 
extended CAPI requirements from */
struct semaphoreLowPowerModeSync;
unsigned long   liDrainCalculated;
UINTgpioBitMap;
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 11/11 V2] Staging: bcm: Replace LARGE_INTEGER with u64 in Adapter.h

2013-10-28 Thread Kevin McKinney
This patch replaces LARGE_INTEGER with u64
in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 7055b83..c373bc0 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -144,9 +144,9 @@ struct bcm_packet_info {
unsigned intuiSentPackets;
unsigned intuiCurrentDrainRate;
unsigned intuiThisPeriodSentBytes;
-   LARGE_INTEGER   liDrainCalculated;
+   u64 liDrainCalculated;
unsigned intuiCurrentTokenCount;
-   LARGE_INTEGER   liLastUpdateTokenAt;
+   u64 liLastUpdateTokenAt;
unsigned intuiMaxAllowedRate;
unsigned intNumOfPacketsSent;
u8  ucDirection;
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 06/11 V2] Staging: bcm: Replace B_UINT16 with u16 in Adapter.h

2013-10-28 Thread Kevin McKinney
This patch replaces B_UINT16 with u16
in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index a5dab86..01788d3 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -62,7 +62,7 @@ struct bcm_hdr_suppression_contextinfo {
 struct bcm_classifier_rule {
unsigned long ulSFID;
u8  ucReserved[2];
-   B_UINT16uiClassifierRuleIndex;
+   u16 uiClassifierRuleIndex;
boolbUsed;
unsigned short  usVCID_Value;
B_UINT8 u8ClassifierRulePriority; /* This field detemines the 
Classifier Priority */
@@ -204,7 +204,7 @@ struct bcm_tarang_data {
 
 struct bcm_targetdsx_buffer {
unsigned long   ulTargetDsxBuffer;
-   B_UINT16tid;
+   u16 tid;
boolvalid;
 };
 
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 08/11 V2] Staging: bcm: Replace UINT32 with u32 in Adapter.h

2013-10-28 Thread Kevin McKinney
This patch replaces UINT32 with u32
in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index f7620ab..35f480a 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -94,7 +94,7 @@ struct bcm_classifier_rule {
/* For IPv6 Addressing */
u8  ucDirection;
boolbIpv6Protocol;
-   UINT32  u32PHSRuleID;
+   u32 u32PHSRuleID;
struct bcm_phs_rule sPhsRule;
u8  u8AssociatedPHSI;
 
@@ -340,11 +340,11 @@ struct bcm_mini_adapter {
boolAutoFirmDld;
boolbMipsConfig;
boolbDPLLConfig;
-   UINT32  aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
-   UINT32  aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
+   u32 aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
+   u32 aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
struct bcm_fragmented_packet_info 
astFragmentedPktClassifierTable[MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES];
atomic_tuiMBupdate;
-   UINT32  PmuMode;
+   u32 PmuMode;
enum bcm_nvm_type   eNVMType;
UINTuiSectorSize;
UINTuiSectorSizeInCFG;
@@ -388,7 +388,7 @@ struct bcm_mini_adapter {
boolbDoSuspend;
UINTsyscfgBefFwDld;
boolStopAllXaction;
-   UINT32  liTimeSinceLastNetEntry; /* Used to Support 
extended CAPI requirements from */
+   u32 liTimeSinceLastNetEntry; /* Used to Support 
extended CAPI requirements from */
struct semaphoreLowPowerModeSync;
unsigned long   liDrainCalculated;
UINTgpioBitMap;
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 10/11 V2] Staging: bcm: Replace PVOID with void * in Adapter.h

2013-10-28 Thread Kevin McKinney
This patch replaces PVOID with void *
in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 32343e3..7055b83 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -20,7 +20,7 @@ struct bcm_packettosend {
 } __packed;
 
 struct bcm_control_packet {
-   PVOID   ControlBuff;
+   void *ControlBuff;
unsigned int ControlBuffLen;
struct bcm_control_packet *next;
 } __packed;
@@ -208,9 +208,9 @@ struct bcm_targetdsx_buffer {
boolvalid;
 };
 
-typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, unsigned int, PVOID);
+typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, unsigned int, void *);
 
-typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, unsigned int, 
PVOID);
+typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, unsigned int, 
void *);
 
 /*
  * Driver adapter data structure
@@ -308,22 +308,22 @@ struct bcm_mini_adapter {
/* Driver State for LED Blinking */
enum bcm_led_events DriverState;
/* Interface Specific */
-   PVOID   pvInterfaceAdapter;
-   int (*bcm_file_download)(PVOID,
+   void *pvInterfaceAdapter;
+   int (*bcm_file_download)(void *,
struct file *,
unsigned int);
-   int (*bcm_file_readback_from_chip)(PVOID,
+   int (*bcm_file_readback_from_chip)(void *,
struct file *,
unsigned int);
-   int (*interface_rdm)(PVOID,
+   int (*interface_rdm)(void *,
unsigned int,
-   PVOID,
+   void *,
int);
-   int (*interface_wrm)(PVOID,
+   int (*interface_wrm)(void *,
unsigned int,
-   PVOID,
+   void *,
int);
-   int (*interface_transmit)(PVOID, PVOID , unsigned int);
+   int (*interface_transmit)(void *, void *, unsigned int);
boolIdleMode;
boolbDregRequestSentInIdleMode;
boolbTriedToWakeUpFromlowPowerMode;
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 01/11 V2] Staging: bcm: Fix WARNING: space prohibited before semicolon.

2013-10-28 Thread Kevin McKinney
This patch removes a space before semicolon as
specified by checkpatch.pl.

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index d6c9630..11fd7f1 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -267,7 +267,7 @@ struct bcm_mini_adapter {
boolfw_download_done;
 
char*txctlpacket[MAX_CNTRL_PKTS];
-   atomic_tcntrlpktCnt ;
+   atomic_tcntrlpktCnt;
atomic_tindex_app_read_cntrlpkt;
atomic_tindex_wr_txcntrlpkt;
atomic_tindex_rd_txcntrlpkt;
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 04/11 V2] Staging: bcm: Replaces UCHAR with u8 in Adapter.h

2013-10-28 Thread Kevin McKinney
This patch replace UCHAR with u8
in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |   82 -
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 08bd9fc..26850bf 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -10,13 +10,13 @@
 struct bcm_leader {
unsigned short Vcid;
unsigned short PLength;
-   UCHAR   Status;
-   UCHAR   Unused[3];
+   u8  Status;
+   u8  Unused[3];
 } __packed;
 
 struct bcm_packettosend {
struct bcm_leader Leader;
-   UCHAR   ucPayload;
+   u8  ucPayload;
 } __packed;
 
 struct bcm_control_packet {
@@ -27,7 +27,7 @@ struct bcm_control_packet {
 
 struct bcm_link_request {
struct bcm_leader Leader;
-   UCHAR   szData[4];
+   u8  szData[4];
 } __packed;
 
 #define MAX_IP_RANGE_LENGTH 4
@@ -45,46 +45,46 @@ union bcm_ip_address {
ULONG ulIpv6Mask[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip Mask 
Address Range */
};
struct {
-   UCHAR ucIpv4Address[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
-   UCHAR ucIpv4Mask[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
+   u8 ucIpv4Address[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
+   u8 ucIpv4Mask[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
};
struct {
-   UCHAR ucIpv6Address[MAX_IP_RANGE_LENGTH * 
IPV6_ADDRESS_SIZEINBYTES];
-   UCHAR ucIpv6Mask[MAX_IP_RANGE_LENGTH * 
IPV6_ADDRESS_SIZEINBYTES];
+   u8 ucIpv6Address[MAX_IP_RANGE_LENGTH * 
IPV6_ADDRESS_SIZEINBYTES];
+   u8 ucIpv6Mask[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];
};
 };
 
 struct bcm_hdr_suppression_contextinfo {
-   UCHAR ucaHdrSuppressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate buffer 
to accumulate pkt Header for PHS */
-   UCHAR ucaHdrSuppressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; /* 
Intermediate buffer containing pkt Header after PHS */
+   u8 ucaHdrSuppressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate buffer to 
accumulate pkt Header for PHS */
+   u8 ucaHdrSuppressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; /* Intermediate 
buffer containing pkt Header after PHS */
 };
 
 struct bcm_classifier_rule {
ULONG   ulSFID;
-   UCHAR   ucReserved[2];
+   u8  ucReserved[2];
B_UINT16uiClassifierRuleIndex;
boolbUsed;
unsigned short  usVCID_Value;
B_UINT8 u8ClassifierRulePriority; /* This field detemines the 
Classifier Priority */
union bcm_ip_address stSrcIpAddress;
-   UCHAR   ucIPSourceAddressLength; /* Ip Source Address Length */
+   u8  ucIPSourceAddressLength; /* Ip Source Address Length */
 
union bcm_ip_address stDestIpAddress;
-   UCHAR   ucIPDestinationAddressLength; /* Ip Destination Address 
Length */
-   UCHAR   ucIPTypeOfServiceLength; /* Type of service Length */
-   UCHAR   ucTosLow; /* Tos Low */
-   UCHAR   ucTosHigh; /* Tos High */
-   UCHAR   ucTosMask; /* Tos Mask */
-
-   UCHAR   ucProtocolLength; /* protocol Length */
-   UCHAR   ucProtocol[MAX_PROTOCOL_LENGTH]; /* protocol Length */
+   u8  ucIPDestinationAddressLength; /* Ip Destination Address Length 
*/
+   u8  ucIPTypeOfServiceLength; /* Type of service Length */
+   u8  ucTosLow; /* Tos Low */
+   u8  ucTosHigh; /* Tos High */
+   u8  ucTosMask; /* Tos Mask */
+
+   u8  ucProtocolLength; /* protocol Length */
+   u8  ucProtocol[MAX_PROTOCOL_LENGTH]; /* protocol Length */
unsigned short  usSrcPortRangeLo[MAX_PORT_RANGE];
unsigned short  usSrcPortRangeHi[MAX_PORT_RANGE];
-   UCHAR   ucSrcPortRangeLength;
+   u8  ucSrcPortRangeLength;
 
unsigned short  usDestPortRangeLo[MAX_PORT_RANGE];
unsigned short  usDestPortRangeHi[MAX_PORT_RANGE];
-   UCHAR   ucDestPortRangeLength;
+   u8  ucDestPortRangeLength;
 
boolbProtocolValid;
boolbTOSValid;
@@ -92,22 +92,22 @@ struct bcm_classifier_rule {
boolbSrcIpValid;
 
/* For IPv6 Addressing */
-   UCHAR   ucDirection;
+   u8  ucDirection;
boolbIpv6Protocol;
UINT32  u32PHSRuleID;
struct bcm_phs_rule sPhsRule;
-   UCHAR   u8AssociatedPHSI;
+   u8  u8AssociatedPHSI;
 
/* Classification fields for ETH CS */
-   UCHAR   ucEthCSSrcMACLen;
-   UCHAR   au8EThCSSrcMAC[MAC_ADDRESS_SIZE];
-   UCHAR   au8EThCSSrcMACMask[MAC_ADDRESS_SIZE];
-   UCHAR   ucEthCSDestMACLen;
-   UCHAR   au8EThCSDestMAC

[PATCH 02/11 V2] Staging: bcm: Remove typedef for _U_IP_ADDRESS and call directly.

2013-10-28 Thread Kevin McKinney
This patch removes typedef for _U_IP_ADDRESS, and
changes the name of the struct to bcm_ip_address. In
addition, any calls to struct U_IP_ADDRESS are
changed to call directly.

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 11fd7f1..33b5063 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -35,7 +35,7 @@ struct bcm_link_request {
 #define MAX_PROTOCOL_LENGTH   32
 #define IPV6_ADDRESS_SIZEINBYTES 0x10
 
-typedef union _U_IP_ADDRESS {
+union bcm_ip_address {
struct {
ULONG ulIpv4Addr[MAX_IP_RANGE_LENGTH]; /* Source Ip Address 
Range */
ULONG ulIpv4Mask[MAX_IP_RANGE_LENGTH]; /* Source Ip Mask 
Address Range */
@@ -52,7 +52,7 @@ typedef union _U_IP_ADDRESS {
UCHAR ucIpv6Address[MAX_IP_RANGE_LENGTH * 
IPV6_ADDRESS_SIZEINBYTES];
UCHAR ucIpv6Mask[MAX_IP_RANGE_LENGTH * 
IPV6_ADDRESS_SIZEINBYTES];
};
-} U_IP_ADDRESS;
+};
 
 struct bcm_hdr_suppression_contextinfo {
UCHAR ucaHdrSuppressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate buffer 
to accumulate pkt Header for PHS */
@@ -66,10 +66,10 @@ struct bcm_classifier_rule {
boolbUsed;
USHORT  usVCID_Value;
B_UINT8 u8ClassifierRulePriority; /* This field detemines the 
Classifier Priority */
-   U_IP_ADDRESSstSrcIpAddress;
+   union bcm_ip_address stSrcIpAddress;
UCHAR   ucIPSourceAddressLength; /* Ip Source Address Length */
 
-   U_IP_ADDRESSstDestIpAddress;
+   union bcm_ip_address stDestIpAddress;
UCHAR   ucIPDestinationAddressLength; /* Ip Destination Address 
Length */
UCHAR   ucIPTypeOfServiceLength; /* Type of service Length */
UCHAR   ucTosLow; /* Tos Low */
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 00/11 V2] Staging: bcm: Cleanup Adapter.h

2013-10-28 Thread Kevin McKinney
These patches fix several issues in Adapter.h

Kevin McKinney (11):
  Staging: bcm: Fix WARNING: space prohibited before semicolon.
  Staging: bcm: Remove typedef for _U_IP_ADDRESS and call directly.
  Staging: bcm: Replace USHORT with unsigned short in Adapter.h
  Staging: bcm: Replaces UCHAR with u8 in Adapter.h
  Staging: bcm: Replace ULONG with unsigned long or u32 in Adapter.h
  Staging: bcm: Replace B_UINT16 with u16 in Adapter.h
  Staging: bcm: Replace B_UINT8 with u8 in Adapter.h
  Staging: bcm: Replace UINT32 with u32 in Adapter.h
  Staging: bcm: Replace UINT with unsigned int in Adapter.h
  Staging: bcm: Replace PVOID with void * in Adapter.h
  Staging: bcm: Replace LARGE_INTEGER with u64 in Adapter.h

 drivers/staging/bcm/Adapter.h |  298 -
 drivers/staging/bcm/Bcmchar.c |2 +-
 drivers/staging/bcm/CmHost.c  |8 +-
 drivers/staging/bcm/Misc.c|8 +-
 4 files changed, 158 insertions(+), 158 deletions(-)

-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 09/11 V2] Staging: bcm: Replace UINT with unsigned int in Adapter.h

2013-10-28 Thread Kevin McKinney
This patch replaces UINT with unsigned
int in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |   84 -
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 35f480a..32343e3 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -21,7 +21,7 @@ struct bcm_packettosend {
 
 struct bcm_control_packet {
PVOID   ControlBuff;
-   UINTControlBuffLen;
+   unsigned int ControlBuffLen;
struct bcm_control_packet *next;
 } __packed;
 
@@ -124,7 +124,7 @@ struct bcm_packet_info {
/* classification extension Rule */
unsigned long   ulSFID;
unsigned short  usVCID_Value;
-   UINTuiThreshold;
+   unsigned intuiThreshold;
/* This field determines the priority of the SF Queues */
u8  u8TrafficPriority;
 
@@ -134,29 +134,29 @@ struct bcm_packet_info {
 
u8  u8QueueType; /* BE or rtPS */
 
-   UINTuiMaxBucketSize; /* maximum size of the bucket for the 
queue */
-   UINTuiCurrentQueueDepthOnTarget;
-   UINTuiCurrentBytesOnHost;
-   UINTuiCurrentPacketsOnHost;
-   UINTuiDroppedCountBytes;
-   UINTuiDroppedCountPackets;
-   UINTuiSentBytes;
-   UINTuiSentPackets;
-   UINTuiCurrentDrainRate;
-   UINTuiThisPeriodSentBytes;
+   unsigned intuiMaxBucketSize; /* maximum size of the bucket for the 
queue */
+   unsigned intuiCurrentQueueDepthOnTarget;
+   unsigned intuiCurrentBytesOnHost;
+   unsigned intuiCurrentPacketsOnHost;
+   unsigned intuiDroppedCountBytes;
+   unsigned intuiDroppedCountPackets;
+   unsigned intuiSentBytes;
+   unsigned intuiSentPackets;
+   unsigned intuiCurrentDrainRate;
+   unsigned intuiThisPeriodSentBytes;
LARGE_INTEGER   liDrainCalculated;
-   UINTuiCurrentTokenCount;
+   unsigned intuiCurrentTokenCount;
LARGE_INTEGER   liLastUpdateTokenAt;
-   UINTuiMaxAllowedRate;
-   UINTNumOfPacketsSent;
+   unsigned intuiMaxAllowedRate;
+   unsigned intNumOfPacketsSent;
u8  ucDirection;
unsigned short  usCID;
struct bcm_mibs_parameters stMibsExtServiceFlowTable;
-   UINTuiCurrentRxRate;
-   UINTuiThisPeriodRxBytes;
-   UINTuiTotalRxBytes;
-   UINTuiTotalTxBytes;
-   UINTuiPendedLast;
+   unsigned intuiCurrentRxRate;
+   unsigned intuiThisPeriodRxBytes;
+   unsigned intuiTotalRxBytes;
+   unsigned intuiTotalTxBytes;
+   unsigned intuiPendedLast;
u8  ucIpVersion;
 
union {
@@ -185,7 +185,7 @@ struct bcm_packet_info {
void*pstSFIndication;
struct timeval  stLastUpdateTokenAt;
atomic_tuiPerSFTxResourceCount;
-   UINTuiMaxLatency;
+   unsigned intuiMaxLatency;
u8  bIPCSSupport;
u8  bEthCSSupport;
 };
@@ -208,9 +208,9 @@ struct bcm_targetdsx_buffer {
boolvalid;
 };
 
-typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, UINT, PVOID);
+typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, unsigned int, PVOID);
 
-typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, UINT, PVOID);
+typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, unsigned int, 
PVOID);
 
 /*
  * Driver adapter data structure
@@ -246,7 +246,7 @@ struct bcm_mini_adapter {
/* to keep track the no of byte received */
unsigned short  PrevNumRecvDescs;
unsigned short  CurrNumRecvDescs;
-   UINTu32TotalDSD;
+   unsigned intu32TotalDSD;
struct bcm_packet_info  PackInfo[NO_OF_QUEUES];
struct bcm_classifier_rule astClassifierTable[MAX_CLASSIFIERS];
boolTransferMode;
@@ -271,7 +271,7 @@ struct bcm_mini_adapter {
atomic_tindex_app_read_cntrlpkt;
atomic_tindex_wr_txcntrlpkt;
atomic_tindex_rd_txcntrlpkt;
-   UINTindex_datpkt;
+   unsigned intindex_datpkt;
struct semaphorerdmwrmsync;
 
struct bcm_targetdsx_buffer 
astTargetDsxBuffer[MAX_TARGET_DSX_BUFFERS];
@@ -316,14 +316,14 @@ struct bcm_mini_adapter {
struct file *,
unsigned int);
int (*interface_rdm)(PVOID,
-   UINT,
+   unsigned int,
PVOID,
int

[PATCH 10/11] Staging: bcm: Replace PVOID with void * in Adapter.h

2013-10-26 Thread Kevin McKinney
This patch replaces PVOID with void *
in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 2074c18..c5891dd 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -20,7 +20,7 @@ struct bcm_packettosend {
 } __packed;
 
 struct bcm_control_packet {
-   PVOID   ControlBuff;
+   void *ControlBuff;
unsigned int ControlBuffLen;
struct bcm_control_packet *next;
 } __packed;
@@ -208,9 +208,9 @@ struct bcm_targetdsx_buffer {
BOOLEAN valid;
 };
 
-typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, unsigned int, PVOID);
+typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, unsigned int, void *);
 
-typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, unsigned int, 
PVOID);
+typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, unsigned int, 
void *);
 
 /*
  * Driver adapter data structure
@@ -308,22 +308,22 @@ struct bcm_mini_adapter {
/* Driver State for LED Blinking */
enum bcm_led_events DriverState;
/* Interface Specific */
-   PVOID   pvInterfaceAdapter;
-   int (*bcm_file_download)(PVOID,
+   void *pvInterfaceAdapter;
+   int (*bcm_file_download)(void *,
struct file *,
unsigned int);
-   int (*bcm_file_readback_from_chip)(PVOID,
+   int (*bcm_file_readback_from_chip)(void *,
struct file *,
unsigned int);
-   int (*interface_rdm)(PVOID,
+   int (*interface_rdm)(void *,
unsigned int,
-   PVOID,
+   void *,
int);
-   int (*interface_wrm)(PVOID,
+   int (*interface_wrm)(void *,
unsigned int,
-   PVOID,
+   void *,
int);
-   int (*interface_transmit)(PVOID, PVOID , unsigned int);
+   int (*interface_transmit)(void *, void *, unsigned int);
BOOLEAN IdleMode;
BOOLEAN bDregRequestSentInIdleMode;
BOOLEAN bTriedToWakeUpFromlowPowerMode;
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 05/11] Staging: bcm: Replace ULONG with unsigned long in Adapter.h

2013-10-26 Thread Kevin McKinney
This patch replace ULONG with unsigned
long in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |   42 -
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index eaf9532..4c9662b 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -37,12 +37,12 @@ struct bcm_link_request {
 
 union bcm_ip_address {
struct {
-   ULONG ulIpv4Addr[MAX_IP_RANGE_LENGTH]; /* Source Ip Address 
Range */
-   ULONG ulIpv4Mask[MAX_IP_RANGE_LENGTH]; /* Source Ip Mask 
Address Range */
+   unsigned long ulIpv4Addr[MAX_IP_RANGE_LENGTH]; /* Source Ip 
Address Range */
+   unsigned long ulIpv4Mask[MAX_IP_RANGE_LENGTH]; /* Source Ip 
Mask Address Range */
};
struct {
-   ULONG ulIpv6Addr[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip Address 
Range */
-   ULONG ulIpv6Mask[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip Mask 
Address Range */
+   unsigned long ulIpv6Addr[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip 
Address Range */
+   unsigned long ulIpv6Mask[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip 
Mask Address Range */
};
struct {
unsigned char ucIpv4Address[MAX_IP_RANGE_LENGTH * 
IP_LENGTH_OF_ADDRESS];
@@ -60,7 +60,7 @@ struct bcm_hdr_suppression_contextinfo {
 };
 
 struct bcm_classifier_rule {
-   ULONG   ulSFID;
+   unsigned long   ulSFID;
unsigned char   ucReserved[2];
B_UINT16uiClassifierRuleIndex;
BOOLEAN bUsed;
@@ -114,7 +114,7 @@ struct bcm_classifier_rule {
 
 struct bcm_fragmented_packet_info {
BOOLEAN bUsed;
-   ULONG   ulSrcIpAddress;
+   unsigned long   ulSrcIpAddress;
unsigned short usIpIdentification;
struct bcm_classifier_rule *pstMatchedClassifierEntry;
BOOLEAN bOutOfOrderFragment;
@@ -122,7 +122,7 @@ struct bcm_fragmented_packet_info {
 
 struct bcm_packet_info {
/* classification extension Rule */
-   ULONG   ulSFID;
+   unsigned long   ulSFID;
unsigned short  usVCID_Value;
UINTuiThreshold;
/* This field determines the priority of the SF Queues */
@@ -199,11 +199,11 @@ struct bcm_tarang_data {
BOOLEAN MacTracingEnabled;
BOOLEAN bApplicationToExit;
struct bcm_mibs_dropped_cntrl_msg stDroppedAppCntrlMsgs;
-   ULONG   RxCntrlMsgBitMask;
+   unsigned long   RxCntrlMsgBitMask;
 };
 
 struct bcm_targetdsx_buffer {
-   ULONG   ulTargetDsxBuffer;
+   unsigned long   ulTargetDsxBuffer;
B_UINT16tid;
BOOLEAN valid;
 };
@@ -253,8 +253,8 @@ struct bcm_mini_adapter {
 
/*** qos **/
BOOLEAN bETHCSEnabled;
-   ULONG   BEBucketSize;
-   ULONG   rtPSBucketSize;
+   unsigned long   BEBucketSize;
+   unsigned long   rtPSBucketSize;
unsigned char   LinkStatus;
BOOLEAN AutoLinkUp;
BOOLEAN AutoSyncup;
@@ -275,9 +275,9 @@ struct bcm_mini_adapter {
struct semaphorerdmwrmsync;
 
struct bcm_targetdsx_buffer 
astTargetDsxBuffer[MAX_TARGET_DSX_BUFFERS];
-   ULONG   ulFreeTargetBufferCnt;
-   ULONG   ulCurrentTargetBuffer;
-   ULONG   ulTotalTargetBuffersAvailable;
+   unsigned long   ulFreeTargetBufferCnt;
+   unsigned long   ulCurrentTargetBuffer;
+   unsigned long   ulTotalTargetBuffersAvailable;
unsigned long   chip_id;
wait_queue_head_t   lowpower_mode_wait_queue;
BOOLEAN bFlashBoot;
@@ -294,7 +294,7 @@ struct bcm_mini_adapter {
BOOLEAN bIsAutoCorrectEnabled;
BOOLEAN bDDRInitDone;
int DDRSetting;
-   ULONG   ulPowerSaveMode;
+   unsigned long   ulPowerSaveMode;
spinlock_t  txtransmitlock;
B_UINT8 txtransmit_running;
/* Thread for control packet handling */
@@ -356,9 +356,9 @@ struct bcm_mini_adapter {
 * Generally it is Active DSD but in case of NVM RD/WR it might be 
different.
 */
UINTulFlashCalStart;
-   ULONG   ulFlashControlSectionStart;
-   ULONG   ulFlashWriteSize;
-   ULONG   ulFlashID;
+   unsigned long   ulFlashControlSectionStart;
+   unsigned long   ulFlashWriteSize;
+   unsigned long   ulFlashID

[PATCH 08/11] Staging: bcm: Replace UINT32 with u32 in Adapter.h

2013-10-26 Thread Kevin McKinney
This patch replaces UINT32 with u32
in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 27b5011..a34 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -94,7 +94,7 @@ struct bcm_classifier_rule {
/* For IPv6 Addressing */
unsigned char   ucDirection;
BOOLEAN bIpv6Protocol;
-   UINT32  u32PHSRuleID;
+   u32 u32PHSRuleID;
struct bcm_phs_rule sPhsRule;
unsigned char   u8AssociatedPHSI;
 
@@ -340,11 +340,11 @@ struct bcm_mini_adapter {
BOOLEAN AutoFirmDld;
BOOLEAN bMipsConfig;
BOOLEAN bDPLLConfig;
-   UINT32  aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
-   UINT32  aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
+   u32 aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
+   u32 aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
struct bcm_fragmented_packet_info 
astFragmentedPktClassifierTable[MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES];
atomic_tuiMBupdate;
-   UINT32  PmuMode;
+   u32 PmuMode;
enum bcm_nvm_type   eNVMType;
UINTuiSectorSize;
UINTuiSectorSizeInCFG;
@@ -388,7 +388,7 @@ struct bcm_mini_adapter {
BOOLEAN bDoSuspend;
UINTsyscfgBefFwDld;
BOOLEAN StopAllXaction;
-   UINT32  liTimeSinceLastNetEntry; /* Used to Support 
extended CAPI requirements from */
+   u32 liTimeSinceLastNetEntry; /* Used to Support 
extended CAPI requirements from */
struct semaphoreLowPowerModeSync;
unsigned long   liDrainCalculated;
UINTgpioBitMap;
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 09/11] Staging: bcm: Replace UINT with unsigned int in Adapter.h

2013-10-26 Thread Kevin McKinney
This patch replaces UINT with unsigned
int in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |   84 -
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index a34..2074c18 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -21,7 +21,7 @@ struct bcm_packettosend {
 
 struct bcm_control_packet {
PVOID   ControlBuff;
-   UINTControlBuffLen;
+   unsigned int ControlBuffLen;
struct bcm_control_packet *next;
 } __packed;
 
@@ -124,7 +124,7 @@ struct bcm_packet_info {
/* classification extension Rule */
unsigned long   ulSFID;
unsigned short  usVCID_Value;
-   UINTuiThreshold;
+   unsigned intuiThreshold;
/* This field determines the priority of the SF Queues */
u8  u8TrafficPriority;
 
@@ -134,29 +134,29 @@ struct bcm_packet_info {
 
u8  u8QueueType; /* BE or rtPS */
 
-   UINTuiMaxBucketSize; /* maximum size of the bucket for the 
queue */
-   UINTuiCurrentQueueDepthOnTarget;
-   UINTuiCurrentBytesOnHost;
-   UINTuiCurrentPacketsOnHost;
-   UINTuiDroppedCountBytes;
-   UINTuiDroppedCountPackets;
-   UINTuiSentBytes;
-   UINTuiSentPackets;
-   UINTuiCurrentDrainRate;
-   UINTuiThisPeriodSentBytes;
+   unsigned intuiMaxBucketSize; /* maximum size of the bucket for the 
queue */
+   unsigned intuiCurrentQueueDepthOnTarget;
+   unsigned intuiCurrentBytesOnHost;
+   unsigned intuiCurrentPacketsOnHost;
+   unsigned intuiDroppedCountBytes;
+   unsigned intuiDroppedCountPackets;
+   unsigned intuiSentBytes;
+   unsigned intuiSentPackets;
+   unsigned intuiCurrentDrainRate;
+   unsigned intuiThisPeriodSentBytes;
LARGE_INTEGER   liDrainCalculated;
-   UINTuiCurrentTokenCount;
+   unsigned intuiCurrentTokenCount;
LARGE_INTEGER   liLastUpdateTokenAt;
-   UINTuiMaxAllowedRate;
-   UINTNumOfPacketsSent;
+   unsigned intuiMaxAllowedRate;
+   unsigned intNumOfPacketsSent;
unsigned char   ucDirection;
unsigned short  usCID;
struct bcm_mibs_parameters stMibsExtServiceFlowTable;
-   UINTuiCurrentRxRate;
-   UINTuiThisPeriodRxBytes;
-   UINTuiTotalRxBytes;
-   UINTuiTotalTxBytes;
-   UINTuiPendedLast;
+   unsigned intuiCurrentRxRate;
+   unsigned intuiThisPeriodRxBytes;
+   unsigned intuiTotalRxBytes;
+   unsigned intuiTotalTxBytes;
+   unsigned intuiPendedLast;
unsigned char   ucIpVersion;
 
union {
@@ -185,7 +185,7 @@ struct bcm_packet_info {
void*pstSFIndication;
struct timeval  stLastUpdateTokenAt;
atomic_tuiPerSFTxResourceCount;
-   UINTuiMaxLatency;
+   unsigned intuiMaxLatency;
unsigned char   bIPCSSupport;
unsigned char   bEthCSSupport;
 };
@@ -208,9 +208,9 @@ struct bcm_targetdsx_buffer {
BOOLEAN valid;
 };
 
-typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, UINT, PVOID);
+typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, unsigned int, PVOID);
 
-typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, UINT, PVOID);
+typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, unsigned int, 
PVOID);
 
 /*
  * Driver adapter data structure
@@ -246,7 +246,7 @@ struct bcm_mini_adapter {
/* to keep track the no of byte received */
unsigned short  PrevNumRecvDescs;
unsigned short  CurrNumRecvDescs;
-   UINTu32TotalDSD;
+   unsigned intu32TotalDSD;
struct bcm_packet_info  PackInfo[NO_OF_QUEUES];
struct bcm_classifier_rule astClassifierTable[MAX_CLASSIFIERS];
BOOLEAN TransferMode;
@@ -271,7 +271,7 @@ struct bcm_mini_adapter {
atomic_tindex_app_read_cntrlpkt;
atomic_tindex_wr_txcntrlpkt;
atomic_tindex_rd_txcntrlpkt;
-   UINTindex_datpkt;
+   unsigned intindex_datpkt;
struct semaphorerdmwrmsync;
 
struct bcm_targetdsx_buffer 
astTargetDsxBuffer[MAX_TARGET_DSX_BUFFERS];
@@ -316,14 +316,14 @@ struct bcm_mini_adapter {
struct file *,
unsigned int);
int (*interface_rdm)(PVOID,
-   UINT,
+   unsigned int

[PATCH 01/11] Staging: bcm: Fix WARNING: space prohibited before semicolon.

2013-10-26 Thread Kevin McKinney
This patch removes a space before semicolon as
specified by checkpatch.pl.

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 1d8bf08..c2c0e6c 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -267,7 +267,7 @@ struct bcm_mini_adapter {
BOOLEAN fw_download_done;
 
char*txctlpacket[MAX_CNTRL_PKTS];
-   atomic_tcntrlpktCnt ;
+   atomic_tcntrlpktCnt;
atomic_tindex_app_read_cntrlpkt;
atomic_tindex_wr_txcntrlpkt;
atomic_tindex_rd_txcntrlpkt;
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 04/11] Staging: bcm: Replace UCHAR with unsigned char in Adapter.h

2013-10-26 Thread Kevin McKinney
This patch replace UCHAR with unsigned
char in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |   82 -
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 8f0033a..eaf9532 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -10,13 +10,13 @@
 struct bcm_leader {
unsigned short Vcid;
unsigned short PLength;
-   UCHAR   Status;
-   UCHAR   Unused[3];
+   unsigned char  Status;
+   unsigned char  Unused[3];
 } __packed;
 
 struct bcm_packettosend {
struct bcm_leader Leader;
-   UCHAR   ucPayload;
+   unsigned char ucPayload;
 } __packed;
 
 struct bcm_control_packet {
@@ -27,7 +27,7 @@ struct bcm_control_packet {
 
 struct bcm_link_request {
struct bcm_leader Leader;
-   UCHAR   szData[4];
+   unsigned char szData[4];
 } __packed;
 
 #define MAX_IP_RANGE_LENGTH 4
@@ -45,46 +45,46 @@ union bcm_ip_address {
ULONG ulIpv6Mask[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip Mask 
Address Range */
};
struct {
-   UCHAR ucIpv4Address[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
-   UCHAR ucIpv4Mask[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
+   unsigned char ucIpv4Address[MAX_IP_RANGE_LENGTH * 
IP_LENGTH_OF_ADDRESS];
+   unsigned char ucIpv4Mask[MAX_IP_RANGE_LENGTH * 
IP_LENGTH_OF_ADDRESS];
};
struct {
-   UCHAR ucIpv6Address[MAX_IP_RANGE_LENGTH * 
IPV6_ADDRESS_SIZEINBYTES];
-   UCHAR ucIpv6Mask[MAX_IP_RANGE_LENGTH * 
IPV6_ADDRESS_SIZEINBYTES];
+   unsigned char ucIpv6Address[MAX_IP_RANGE_LENGTH * 
IPV6_ADDRESS_SIZEINBYTES];
+   unsigned char ucIpv6Mask[MAX_IP_RANGE_LENGTH * 
IPV6_ADDRESS_SIZEINBYTES];
};
 };
 
 struct bcm_hdr_suppression_contextinfo {
-   UCHAR ucaHdrSuppressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate buffer 
to accumulate pkt Header for PHS */
-   UCHAR ucaHdrSuppressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; /* 
Intermediate buffer containing pkt Header after PHS */
+   unsigned char ucaHdrSuppressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate 
buffer to accumulate pkt Header for PHS */
+   unsigned char ucaHdrSuppressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; /* 
Intermediate buffer containing pkt Header after PHS */
 };
 
 struct bcm_classifier_rule {
ULONG   ulSFID;
-   UCHAR   ucReserved[2];
+   unsigned char   ucReserved[2];
B_UINT16uiClassifierRuleIndex;
BOOLEAN bUsed;
unsigned short  usVCID_Value;
B_UINT8 u8ClassifierRulePriority; /* This field detemines the 
Classifier Priority */
union bcm_ip_address stSrcIpAddress;
-   UCHAR   ucIPSourceAddressLength; /* Ip Source Address Length */
+   unsigned char   ucIPSourceAddressLength; /* Ip Source Address Length */
 
union bcm_ip_address stDestIpAddress;
-   UCHAR   ucIPDestinationAddressLength; /* Ip Destination Address 
Length */
-   UCHAR   ucIPTypeOfServiceLength; /* Type of service Length */
-   UCHAR   ucTosLow; /* Tos Low */
-   UCHAR   ucTosHigh; /* Tos High */
-   UCHAR   ucTosMask; /* Tos Mask */
-
-   UCHAR   ucProtocolLength; /* protocol Length */
-   UCHAR   ucProtocol[MAX_PROTOCOL_LENGTH]; /* protocol Length */
+   unsigned char   ucIPDestinationAddressLength; /* Ip Destination Address 
Length */
+   unsigned char   ucIPTypeOfServiceLength; /* Type of service Length */
+   unsigned char   ucTosLow; /* Tos Low */
+   unsigned char   ucTosHigh; /* Tos High */
+   unsigned char   ucTosMask; /* Tos Mask */
+
+   unsigned char   ucProtocolLength; /* protocol Length */
+   unsigned char   ucProtocol[MAX_PROTOCOL_LENGTH]; /* protocol Length */
unsigned short  usSrcPortRangeLo[MAX_PORT_RANGE];
unsigned short  usSrcPortRangeHi[MAX_PORT_RANGE];
-   UCHAR   ucSrcPortRangeLength;
+   unsigned char   ucSrcPortRangeLength;
 
unsigned short  usDestPortRangeLo[MAX_PORT_RANGE];
unsigned short  usDestPortRangeHi[MAX_PORT_RANGE];
-   UCHAR   ucDestPortRangeLength;
+   unsigned char   ucDestPortRangeLength;
 
BOOLEAN bProtocolValid;
BOOLEAN bTOSValid;
@@ -92,22 +92,22 @@ struct bcm_classifier_rule {
BOOLEAN bSrcIpValid;
 
/* For IPv6 Addressing */
-   UCHAR   ucDirection;
+   unsigned char   ucDirection;
BOOLEAN bIpv6Protocol;
UINT32  u32PHSRuleID;
struct bcm_phs_rule sPhsRule;
-   UCHAR   u8AssociatedPHSI;
+   unsigned char   u8AssociatedPHSI;
 
/* Classification fields for ETH CS */
-   UCHAR

[PATCH 02/11] Staging: bcm: Remove typedef for _U_IP_ADDRESS and call directly.

2013-10-26 Thread Kevin McKinney
This patch removes typedef for _U_IP_ADDRESS, and
changes the name of the struct to bcm_ip_address. In
addition, any calls to struct U_IP_ADDRESS are
changed to call directly.

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index c2c0e6c..cd224f2 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -35,7 +35,7 @@ struct bcm_link_request {
 #define MAX_PROTOCOL_LENGTH   32
 #define IPV6_ADDRESS_SIZEINBYTES 0x10
 
-typedef union _U_IP_ADDRESS {
+union bcm_ip_address {
struct {
ULONG ulIpv4Addr[MAX_IP_RANGE_LENGTH]; /* Source Ip Address 
Range */
ULONG ulIpv4Mask[MAX_IP_RANGE_LENGTH]; /* Source Ip Mask 
Address Range */
@@ -52,7 +52,7 @@ typedef union _U_IP_ADDRESS {
UCHAR ucIpv6Address[MAX_IP_RANGE_LENGTH * 
IPV6_ADDRESS_SIZEINBYTES];
UCHAR ucIpv6Mask[MAX_IP_RANGE_LENGTH * 
IPV6_ADDRESS_SIZEINBYTES];
};
-} U_IP_ADDRESS;
+};
 
 struct bcm_hdr_suppression_contextinfo {
UCHAR ucaHdrSuppressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate buffer 
to accumulate pkt Header for PHS */
@@ -66,10 +66,10 @@ struct bcm_classifier_rule {
BOOLEAN bUsed;
USHORT  usVCID_Value;
B_UINT8 u8ClassifierRulePriority; /* This field detemines the 
Classifier Priority */
-   U_IP_ADDRESSstSrcIpAddress;
+   union bcm_ip_address stSrcIpAddress;
UCHAR   ucIPSourceAddressLength; /* Ip Source Address Length */
 
-   U_IP_ADDRESSstDestIpAddress;
+   union bcm_ip_address stDestIpAddress;
UCHAR   ucIPDestinationAddressLength; /* Ip Destination Address 
Length */
UCHAR   ucIPTypeOfServiceLength; /* Type of service Length */
UCHAR   ucTosLow; /* Tos Low */
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 06/11] Staging: bcm: Replace B_UINT16 with u16 in Adapter.h

2013-10-26 Thread Kevin McKinney
This patch replace B_UINT16 with u16
in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 4c9662b..fbd06a1 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -62,7 +62,7 @@ struct bcm_hdr_suppression_contextinfo {
 struct bcm_classifier_rule {
unsigned long   ulSFID;
unsigned char   ucReserved[2];
-   B_UINT16uiClassifierRuleIndex;
+   u16 uiClassifierRuleIndex;
BOOLEAN bUsed;
unsigned short  usVCID_Value;
B_UINT8 u8ClassifierRulePriority; /* This field detemines the 
Classifier Priority */
@@ -204,7 +204,7 @@ struct bcm_tarang_data {
 
 struct bcm_targetdsx_buffer {
unsigned long   ulTargetDsxBuffer;
-   B_UINT16tid;
+   u16 tid;
BOOLEAN valid;
 };
 
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 11/11] Staging: bcm: Replace BOOLEAN with bool in Adapter.h

2013-10-26 Thread Kevin McKinney
This patch replaces BOOLEAN with bool
in Adapter.h

Signed-off-by: Kevin McKinney klmckinn...@gmail.com
---
 drivers/staging/bcm/Adapter.h |  122 -
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index c5891dd..ac81954 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -63,7 +63,7 @@ struct bcm_classifier_rule {
unsigned long   ulSFID;
unsigned char   ucReserved[2];
u16 uiClassifierRuleIndex;
-   BOOLEAN bUsed;
+   boolbUsed;
unsigned short  usVCID_Value;
u8  u8ClassifierRulePriority; /* This field detemines the 
Classifier Priority */
union bcm_ip_address stSrcIpAddress;
@@ -86,14 +86,14 @@ struct bcm_classifier_rule {
unsigned short  usDestPortRangeHi[MAX_PORT_RANGE];
unsigned char   ucDestPortRangeLength;
 
-   BOOLEAN bProtocolValid;
-   BOOLEAN bTOSValid;
-   BOOLEAN bDestIpValid;
-   BOOLEAN bSrcIpValid;
+   boolbProtocolValid;
+   boolbTOSValid;
+   boolbDestIpValid;
+   boolbSrcIpValid;
 
/* For IPv6 Addressing */
unsigned char   ucDirection;
-   BOOLEAN bIpv6Protocol;
+   boolbIpv6Protocol;
u32 u32PHSRuleID;
struct bcm_phs_rule sPhsRule;
unsigned char   u8AssociatedPHSI;
@@ -113,11 +113,11 @@ struct bcm_classifier_rule {
 };
 
 struct bcm_fragmented_packet_info {
-   BOOLEAN bUsed;
+   boolbUsed;
unsigned long   ulSrcIpAddress;
unsigned short usIpIdentification;
struct bcm_classifier_rule *pstMatchedClassifierEntry;
-   BOOLEAN bOutOfOrderFragment;
+   boolbOutOfOrderFragment;
 };
 
 struct bcm_packet_info {
@@ -128,9 +128,9 @@ struct bcm_packet_info {
/* This field determines the priority of the SF Queues */
u8  u8TrafficPriority;
 
-   BOOLEAN bValid;
-   BOOLEAN bActive;
-   BOOLEAN bActivateRequestSent;
+   boolbValid;
+   boolbActive;
+   boolbActivateRequestSent;
 
u8  u8QueueType; /* BE or rtPS */
 
@@ -170,17 +170,17 @@ struct bcm_packet_info {
};
};
 
-   BOOLEAN bProtocolValid;
-   BOOLEAN bTOSValid;
-   BOOLEAN bDestIpValid;
-   BOOLEAN bSrcIpValid;
+   boolbProtocolValid;
+   boolbTOSValid;
+   boolbDestIpValid;
+   boolbSrcIpValid;
 
-   BOOLEAN bActiveSet;
-   BOOLEAN bAdmittedSet;
-   BOOLEAN bAuthorizedSet;
-   BOOLEAN bClassifierPriority;
+   boolbActiveSet;
+   boolbAdmittedSet;
+   boolbAuthorizedSet;
+   boolbClassifierPriority;
unsigned char   ucServiceClassName[MAX_CLASS_NAME_LENGTH];
-   BOOLEAN bHeaderSuppressionEnabled;
+   boolbHeaderSuppressionEnabled;
spinlock_t  SFQueueLock;
void*pstSFIndication;
struct timeval  stLastUpdateTokenAt;
@@ -196,8 +196,8 @@ struct bcm_tarang_data {
struct sk_buff  *RxAppControlHead;
struct sk_buff  *RxAppControlTail;
int AppCtrlQueueLen;
-   BOOLEAN MacTracingEnabled;
-   BOOLEAN bApplicationToExit;
+   boolMacTracingEnabled;
+   boolbApplicationToExit;
struct bcm_mibs_dropped_cntrl_msg stDroppedAppCntrlMsgs;
unsigned long   RxCntrlMsgBitMask;
 };
@@ -205,7 +205,7 @@ struct bcm_tarang_data {
 struct bcm_targetdsx_buffer {
unsigned long   ulTargetDsxBuffer;
u16 tid;
-   BOOLEAN valid;
+   boolvalid;
 };
 
 typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, unsigned int, void *);
@@ -221,11 +221,11 @@ struct bcm_mini_adapter {
u32 msg_enable;
CHAR*caDsxReqResp;
atomic_tApplicationRunning;
-   BOOLEAN AppCtrlQueueOverFlow;
+   boolAppCtrlQueueOverFlow;
atomic_tCurrentApplicationCount;
atomic_tRegisteredApplicationCount;
-   BOOLEAN LinkUpStatus;
-   BOOLEAN TimerActive;
+   boolLinkUpStatus;
+   boolTimerActive;
u32 StatisticsPointer;
struct sk_buff  *RxControlHead;
struct sk_buff  *RxControlTail