Re: [PATCH] Staging: ks7010 - fixed style block comments

2017-03-21 Thread Tobin C. Harding 
On Wed, Mar 22, 2017 at 07:29:50AM +1300, Derek Robson wrote:
> On Tue, Mar 21, 2017 at 08:56:25AM +0100, Greg KH wrote:
> > On Sun, Mar 19, 2017 at 01:07:17PM +1300, Derek Robson wrote:
> > > Fixed style of all block comments across whole driver
> > > Found by checkpatch
> > > 
> > > Signed-off-by: Derek Robson 
> > > ---
> > >  drivers/staging/ks7010/ks7010_sdio.c |  3 ++-
> > >  drivers/staging/ks7010/ks_hostif.h   | 35 +-
> > >  drivers/staging/ks7010/ks_wlan.h |  3 ++-
> > >  drivers/staging/ks7010/ks_wlan_net.c | 41 
> > > +++-
> > >  4 files changed, 55 insertions(+), 27 deletions(-)
> > 
> > This patch doesn't apply to my tree at all :(
> >
> 
> Am I working from the right/best tree for driver/staging?
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
> 
> Thanks for helping the new guy :-)

I think you just got unlucky on this one Derek, a patch set of mine
that happened to fix this got merged the same morning you submitted
your patch set.

Good luck,
Tobin.

Re: [PATCH] Staging: ks7010 - fixed style block comments

2017-03-21 Thread Tobin C. Harding 
On Wed, Mar 22, 2017 at 07:29:50AM +1300, Derek Robson wrote:
> On Tue, Mar 21, 2017 at 08:56:25AM +0100, Greg KH wrote:
> > On Sun, Mar 19, 2017 at 01:07:17PM +1300, Derek Robson wrote:
> > > Fixed style of all block comments across whole driver
> > > Found by checkpatch
> > > 
> > > Signed-off-by: Derek Robson 
> > > ---
> > >  drivers/staging/ks7010/ks7010_sdio.c |  3 ++-
> > >  drivers/staging/ks7010/ks_hostif.h   | 35 +-
> > >  drivers/staging/ks7010/ks_wlan.h |  3 ++-
> > >  drivers/staging/ks7010/ks_wlan_net.c | 41 
> > > +++-
> > >  4 files changed, 55 insertions(+), 27 deletions(-)
> > 
> > This patch doesn't apply to my tree at all :(
> >
> 
> Am I working from the right/best tree for driver/staging?
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
> 
> Thanks for helping the new guy :-)

I think you just got unlucky on this one Derek, a patch set of mine
that happened to fix this got merged the same morning you submitted
your patch set.

Good luck,
Tobin.

Re: [PATCH] Staging: ks7010 - fixed style block comments

2017-03-21 Thread Greg KH 
On Wed, Mar 22, 2017 at 07:29:50AM +1300, Derek Robson wrote:
> On Tue, Mar 21, 2017 at 08:56:25AM +0100, Greg KH wrote:
> > On Sun, Mar 19, 2017 at 01:07:17PM +1300, Derek Robson wrote:
> > > Fixed style of all block comments across whole driver
> > > Found by checkpatch
> > > 
> > > Signed-off-by: Derek Robson 
> > > ---
> > >  drivers/staging/ks7010/ks7010_sdio.c |  3 ++-
> > >  drivers/staging/ks7010/ks_hostif.h   | 35 +-
> > >  drivers/staging/ks7010/ks_wlan.h |  3 ++-
> > >  drivers/staging/ks7010/ks_wlan_net.c | 41 
> > > +++-
> > >  4 files changed, 55 insertions(+), 27 deletions(-)
> > 
> > This patch doesn't apply to my tree at all :(
> >
> 
> Am I working from the right/best tree for driver/staging?
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

What branch did you use?  You should use staging-next, or worse case,
staging-testing.  Don't use 'master', as that tracks Linus's tree and is
usually quite old.

thanks,

greg k-h

Re: [PATCH] Staging: ks7010 - fixed style block comments

2017-03-21 Thread Greg KH 
On Wed, Mar 22, 2017 at 07:29:50AM +1300, Derek Robson wrote:
> On Tue, Mar 21, 2017 at 08:56:25AM +0100, Greg KH wrote:
> > On Sun, Mar 19, 2017 at 01:07:17PM +1300, Derek Robson wrote:
> > > Fixed style of all block comments across whole driver
> > > Found by checkpatch
> > > 
> > > Signed-off-by: Derek Robson 
> > > ---
> > >  drivers/staging/ks7010/ks7010_sdio.c |  3 ++-
> > >  drivers/staging/ks7010/ks_hostif.h   | 35 +-
> > >  drivers/staging/ks7010/ks_wlan.h |  3 ++-
> > >  drivers/staging/ks7010/ks_wlan_net.c | 41 
> > > +++-
> > >  4 files changed, 55 insertions(+), 27 deletions(-)
> > 
> > This patch doesn't apply to my tree at all :(
> >
> 
> Am I working from the right/best tree for driver/staging?
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

What branch did you use?  You should use staging-next, or worse case,
staging-testing.  Don't use 'master', as that tracks Linus's tree and is
usually quite old.

thanks,

greg k-h

Re: [PATCH] Staging: ks7010 - fixed style block comments

2017-03-21 Thread Derek Robson 
On Tue, Mar 21, 2017 at 08:56:25AM +0100, Greg KH wrote:
> On Sun, Mar 19, 2017 at 01:07:17PM +1300, Derek Robson wrote:
> > Fixed style of all block comments across whole driver
> > Found by checkpatch
> > 
> > Signed-off-by: Derek Robson 
> > ---
> >  drivers/staging/ks7010/ks7010_sdio.c |  3 ++-
> >  drivers/staging/ks7010/ks_hostif.h   | 35 +-
> >  drivers/staging/ks7010/ks_wlan.h |  3 ++-
> >  drivers/staging/ks7010/ks_wlan_net.c | 41 
> > +++-
> >  4 files changed, 55 insertions(+), 27 deletions(-)
> 
> This patch doesn't apply to my tree at all :(
>

Am I working from the right/best tree for driver/staging?

https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

Thanks for helping the new guy :-)

Re: [PATCH] Staging: ks7010 - fixed style block comments

2017-03-21 Thread Derek Robson 
On Tue, Mar 21, 2017 at 08:56:25AM +0100, Greg KH wrote:
> On Sun, Mar 19, 2017 at 01:07:17PM +1300, Derek Robson wrote:
> > Fixed style of all block comments across whole driver
> > Found by checkpatch
> > 
> > Signed-off-by: Derek Robson 
> > ---
> >  drivers/staging/ks7010/ks7010_sdio.c |  3 ++-
> >  drivers/staging/ks7010/ks_hostif.h   | 35 +-
> >  drivers/staging/ks7010/ks_wlan.h |  3 ++-
> >  drivers/staging/ks7010/ks_wlan_net.c | 41 
> > +++-
> >  4 files changed, 55 insertions(+), 27 deletions(-)
> 
> This patch doesn't apply to my tree at all :(
>

Am I working from the right/best tree for driver/staging?

https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

Thanks for helping the new guy :-)

Re: [PATCH] Staging: ks7010 - fixed style block comments

2017-03-21 Thread Greg KH 
On Sun, Mar 19, 2017 at 01:07:17PM +1300, Derek Robson wrote:
> Fixed style of all block comments across whole driver
> Found by checkpatch
> 
> Signed-off-by: Derek Robson 
> ---
>  drivers/staging/ks7010/ks7010_sdio.c |  3 ++-
>  drivers/staging/ks7010/ks_hostif.h   | 35 +-
>  drivers/staging/ks7010/ks_wlan.h |  3 ++-
>  drivers/staging/ks7010/ks_wlan_net.c | 41 
> +++-
>  4 files changed, 55 insertions(+), 27 deletions(-)

This patch doesn't apply to my tree at all :(

sorry,

greg k-h

Re: [PATCH] Staging: ks7010 - fixed style block comments

2017-03-21 Thread Greg KH 
On Sun, Mar 19, 2017 at 01:07:17PM +1300, Derek Robson wrote:
> Fixed style of all block comments across whole driver
> Found by checkpatch
> 
> Signed-off-by: Derek Robson 
> ---
>  drivers/staging/ks7010/ks7010_sdio.c |  3 ++-
>  drivers/staging/ks7010/ks_hostif.h   | 35 +-
>  drivers/staging/ks7010/ks_wlan.h |  3 ++-
>  drivers/staging/ks7010/ks_wlan_net.c | 41 
> +++-
>  4 files changed, 55 insertions(+), 27 deletions(-)

This patch doesn't apply to my tree at all :(

sorry,

greg k-h

[PATCH] Staging: ks7010 - fixed style block comments

2017-03-18 Thread Derek Robson 
Fixed style of all block comments across whole driver
Found by checkpatch

Signed-off-by: Derek Robson 
---
 drivers/staging/ks7010/ks7010_sdio.c |  3 ++-
 drivers/staging/ks7010/ks_hostif.h   | 35 +-
 drivers/staging/ks7010/ks_wlan.h |  3 ++-
 drivers/staging/ks7010/ks_wlan_net.c | 41 +++-
 4 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/drivers/staging/ks7010/ks7010_sdio.c 
b/drivers/staging/ks7010/ks7010_sdio.c
index 6f9f746a3a61..1311e83b99d8 100644
--- a/drivers/staging/ks7010/ks7010_sdio.c
+++ b/drivers/staging/ks7010/ks7010_sdio.c
@@ -496,7 +496,8 @@ static void ks7010_rw_function(struct work_struct *work)
while (time_after(priv->last_wakeup + ((30 * HZ) / 1000), jiffies)) {
DPRINTK(4, "wait after WAKEUP\n");
 /* 
queue_delayed_work(priv->ks_wlan_hw.ks7010sdio_wq,>ks_wlan_hw.rw_wq,
-   (priv->last_wakeup + ((30*HZ)/1000) - jiffies));*/
+ * (priv->last_wakeup + ((30*HZ)/1000) - jiffies));
+ */
dev_info(>ks_wlan_hw.sdio_card->func->dev,
 "wake: %lu %lu\n",
 priv->last_wakeup + (30 * HZ) / 1000,
diff --git a/drivers/staging/ks7010/ks_hostif.h 
b/drivers/staging/ks7010/ks_hostif.h
index 30c49b699d62..c7636e829c40 100644
--- a/drivers/staging/ks7010/ks_hostif.h
+++ b/drivers/staging/ks7010/ks_hostif.h
@@ -360,8 +360,11 @@ struct hostif_ps_adhoc_set_request_t {
 #define CTS_MODE_TRUE  1
uint16_t channel;
struct rate_set16_t rate_set;
-   uint16_t capability;/* bit5:preamble bit6:pbcc pbcc not supported 
always 0 
-* bit10:ShortSlotTime bit13:DSSS-OFDM 
DSSS-OFDM not supported always 0 */
+   uint16_t capability;/* bit5:preamble
+* bit6:pbcc pbcc not supported always 0
+* bit10:ShortSlotTime
+* bit13:DSSS-OFDM DSSS-OFDM not supported 
always 0
+*/
uint16_t scan_type;
 } __packed;
 
@@ -376,8 +379,11 @@ struct hostif_infrastructure_set_request_t {
uint16_t cts_mode;
struct rate_set16_t rate_set;
struct ssid_t ssid;
-   uint16_t capability;/* bit5:preamble bit6:pbcc pbcc not supported 
always 0 
-* bit10:ShortSlotTime bit13:DSSS-OFDM 
DSSS-OFDM not supported always 0 */
+   uint16_t capability;/* bit5:preamble
+* bit6:pbcc pbcc not supported always 0
+* bit10:ShortSlotTime
+* bit13:DSSS-OFDM DSSS-OFDM not supported 
always 0
+*/
uint16_t beacon_lost_count;
uint16_t auth_type;
 #define AUTH_TYPE_OPEN_SYSTEM 0
@@ -392,8 +398,11 @@ struct hostif_infrastructure_set2_request_t {
uint16_t cts_mode;
struct rate_set16_t rate_set;
struct ssid_t ssid;
-   uint16_t capability;/* bit5:preamble bit6:pbcc pbcc not supported 
always 0 
-* bit10:ShortSlotTime bit13:DSSS-OFDM 
DSSS-OFDM not supported always 0 */
+   uint16_t capability;/* bit5:preamble
+* bit6:pbcc pbcc not supported always 0
+* bit10:ShortSlotTime
+* bit13:DSSS-OFDM DSSS-OFDM not supported 
always 0
+*/
uint16_t beacon_lost_count;
uint16_t auth_type;
 #define AUTH_TYPE_OPEN_SYSTEM 0
@@ -415,8 +424,11 @@ struct hostif_adhoc_set_request_t {
uint16_t channel;
struct rate_set16_t rate_set;
struct ssid_t ssid;
-   uint16_t capability;/* bit5:preamble bit6:pbcc pbcc not supported 
always 0 
-* bit10:ShortSlotTime bit13:DSSS-OFDM 
DSSS-OFDM not supported always 0 */
+   uint16_t capability;/* bit5:preamble
+* bit6:pbcc pbcc not supported always 0
+* bit10:ShortSlotTime
+* bit13:DSSS-OFDM DSSS-OFDM not supported 
always 0
+*/
uint16_t scan_type;
 } __packed;
 
@@ -427,8 +439,11 @@ struct hostif_adhoc_set2_request_t {
uint16_t reserved;
struct rate_set16_t rate_set;
struct ssid_t ssid;
-   uint16_t capability;/* bit5:preamble bit6:pbcc pbcc not supported 
always 0 
-* bit10:ShortSlotTime bit13:DSSS-OFDM 
DSSS-OFDM not supported always 0 */
+   uint16_t capability;/* bit5:preamble
+* bit6:pbcc pbcc not supported always 0
+* bit10:ShortSlotTime
+* bit13:DSSS-OFDM DSSS-OFDM not supported 
always 0
+*/
uint16_t

[PATCH] Staging: ks7010 - fixed style block comments

2017-03-18 Thread Derek Robson 
Fixed style of all block comments across whole driver
Found by checkpatch

Signed-off-by: Derek Robson 
---
 drivers/staging/ks7010/ks7010_sdio.c |  3 ++-
 drivers/staging/ks7010/ks_hostif.h   | 35 +-
 drivers/staging/ks7010/ks_wlan.h |  3 ++-
 drivers/staging/ks7010/ks_wlan_net.c | 41 +++-
 4 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/drivers/staging/ks7010/ks7010_sdio.c 
b/drivers/staging/ks7010/ks7010_sdio.c
index 6f9f746a3a61..1311e83b99d8 100644
--- a/drivers/staging/ks7010/ks7010_sdio.c
+++ b/drivers/staging/ks7010/ks7010_sdio.c
@@ -496,7 +496,8 @@ static void ks7010_rw_function(struct work_struct *work)
while (time_after(priv->last_wakeup + ((30 * HZ) / 1000), jiffies)) {
DPRINTK(4, "wait after WAKEUP\n");
 /* 
queue_delayed_work(priv->ks_wlan_hw.ks7010sdio_wq,>ks_wlan_hw.rw_wq,
-   (priv->last_wakeup + ((30*HZ)/1000) - jiffies));*/
+ * (priv->last_wakeup + ((30*HZ)/1000) - jiffies));
+ */
dev_info(>ks_wlan_hw.sdio_card->func->dev,
 "wake: %lu %lu\n",
 priv->last_wakeup + (30 * HZ) / 1000,
diff --git a/drivers/staging/ks7010/ks_hostif.h 
b/drivers/staging/ks7010/ks_hostif.h
index 30c49b699d62..c7636e829c40 100644
--- a/drivers/staging/ks7010/ks_hostif.h
+++ b/drivers/staging/ks7010/ks_hostif.h
@@ -360,8 +360,11 @@ struct hostif_ps_adhoc_set_request_t {
 #define CTS_MODE_TRUE  1
uint16_t channel;
struct rate_set16_t rate_set;
-   uint16_t capability;/* bit5:preamble bit6:pbcc pbcc not supported 
always 0 
-* bit10:ShortSlotTime bit13:DSSS-OFDM 
DSSS-OFDM not supported always 0 */
+   uint16_t capability;/* bit5:preamble
+* bit6:pbcc pbcc not supported always 0
+* bit10:ShortSlotTime
+* bit13:DSSS-OFDM DSSS-OFDM not supported 
always 0
+*/
uint16_t scan_type;
 } __packed;
 
@@ -376,8 +379,11 @@ struct hostif_infrastructure_set_request_t {
uint16_t cts_mode;
struct rate_set16_t rate_set;
struct ssid_t ssid;
-   uint16_t capability;/* bit5:preamble bit6:pbcc pbcc not supported 
always 0 
-* bit10:ShortSlotTime bit13:DSSS-OFDM 
DSSS-OFDM not supported always 0 */
+   uint16_t capability;/* bit5:preamble
+* bit6:pbcc pbcc not supported always 0
+* bit10:ShortSlotTime
+* bit13:DSSS-OFDM DSSS-OFDM not supported 
always 0
+*/
uint16_t beacon_lost_count;
uint16_t auth_type;
 #define AUTH_TYPE_OPEN_SYSTEM 0
@@ -392,8 +398,11 @@ struct hostif_infrastructure_set2_request_t {
uint16_t cts_mode;
struct rate_set16_t rate_set;
struct ssid_t ssid;
-   uint16_t capability;/* bit5:preamble bit6:pbcc pbcc not supported 
always 0 
-* bit10:ShortSlotTime bit13:DSSS-OFDM 
DSSS-OFDM not supported always 0 */
+   uint16_t capability;/* bit5:preamble
+* bit6:pbcc pbcc not supported always 0
+* bit10:ShortSlotTime
+* bit13:DSSS-OFDM DSSS-OFDM not supported 
always 0
+*/
uint16_t beacon_lost_count;
uint16_t auth_type;
 #define AUTH_TYPE_OPEN_SYSTEM 0
@@ -415,8 +424,11 @@ struct hostif_adhoc_set_request_t {
uint16_t channel;
struct rate_set16_t rate_set;
struct ssid_t ssid;
-   uint16_t capability;/* bit5:preamble bit6:pbcc pbcc not supported 
always 0 
-* bit10:ShortSlotTime bit13:DSSS-OFDM 
DSSS-OFDM not supported always 0 */
+   uint16_t capability;/* bit5:preamble
+* bit6:pbcc pbcc not supported always 0
+* bit10:ShortSlotTime
+* bit13:DSSS-OFDM DSSS-OFDM not supported 
always 0
+*/
uint16_t scan_type;
 } __packed;
 
@@ -427,8 +439,11 @@ struct hostif_adhoc_set2_request_t {
uint16_t reserved;
struct rate_set16_t rate_set;
struct ssid_t ssid;
-   uint16_t capability;/* bit5:preamble bit6:pbcc pbcc not supported 
always 0 
-* bit10:ShortSlotTime bit13:DSSS-OFDM 
DSSS-OFDM not supported always 0 */
+   uint16_t capability;/* bit5:preamble
+* bit6:pbcc pbcc not supported always 0
+* bit10:ShortSlotTime
+* bit13:DSSS-OFDM DSSS-OFDM not supported 
always 0
+*/
uint16_t scan_type;
struct