[PATCH] staging: wilc1000: Fix lines ending with parentheses

2017-12-15 Thread Aditya Shankar 
This patch fixes the "Lines should not end with a '('"
problem reported by checkpatch

Signed-off-by: Aditya Shankar 
---
 drivers/staging/wilc1000/linux_mon.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_mon.c 
b/drivers/staging/wilc1000/linux_mon.c
index 1c740af..a793c42 100644
--- a/drivers/staging/wilc1000/linux_mon.c
+++ b/drivers/staging/wilc1000/linux_mon.c
@@ -84,9 +84,9 @@ void WILC_WFI_monitor_rx(u8 *buff, u32 size)
cb_hdr->hdr.it_len =
cpu_to_le16(sizeof(struct wilc_wfi_radiotap_cb_hdr));
 
-   cb_hdr->hdr.it_present = cpu_to_le32(
-   (1 << IEEE80211_RADIOTAP_RATE) |
-   (1 << IEEE80211_RADIOTAP_TX_FLAGS));
+   cb_hdr->hdr.it_present =
+   cpu_to_le32((1 << IEEE80211_RADIOTAP_RATE) |
+   (1 << IEEE80211_RADIOTAP_TX_FLAGS));
 
cb_hdr->rate = 5; /* txrate->bitrate / 5; */
 
@@ -216,9 +216,9 @@ static netdev_tx_t WILC_WFI_mon_xmit(struct sk_buff *skb,
cb_hdr->hdr.it_len =
cpu_to_le16(sizeof(struct wilc_wfi_radiotap_cb_hdr));
 
-   cb_hdr->hdr.it_present = cpu_to_le32(
-   (1 << IEEE80211_RADIOTAP_RATE) |
-   (1 << IEEE80211_RADIOTAP_TX_FLAGS));
+   cb_hdr->hdr.it_present =
+   cpu_to_le32((1 << IEEE80211_RADIOTAP_RATE) |
+   (1 << IEEE80211_RADIOTAP_TX_FLAGS));
 
cb_hdr->rate = 5; /* txrate->bitrate / 5; */
cb_hdr->tx_flags = 0x0004;
-- 
2.7.4


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

[PATCH v2] staging: wilc1000: Fix problems reported by checkpatch

2017-12-15 Thread Aditya Shankar 
This commit fixes below style problems in multiple lines
Fix checkpatch WARNING: line over 80 characters

Signed-off-by: Aditya Shankar 
---
 drivers/staging/wilc1000/linux_mon.c | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_mon.c 
b/drivers/staging/wilc1000/linux_mon.c
index 91d49c4..1c740af 100644
--- a/drivers/staging/wilc1000/linux_mon.c
+++ b/drivers/staging/wilc1000/linux_mon.c
@@ -69,7 +69,8 @@ void WILC_WFI_monitor_rx(u8 *buff, u32 size)
if (pkt_offset & IS_MANAGMEMENT_CALLBACK) {
/* hostapd callback mgmt frame */
 
-   skb = dev_alloc_skb(size + sizeof(struct 
wilc_wfi_radiotap_cb_hdr));
+   skb = dev_alloc_skb(size +
+   sizeof(struct wilc_wfi_radiotap_cb_hdr));
if (!skb)
return;
 
@@ -80,7 +81,8 @@ void WILC_WFI_monitor_rx(u8 *buff, u32 size)
 
cb_hdr->hdr.it_version = 0; /* PKTHDR_RADIOTAP_VERSION; */
 
-   cb_hdr->hdr.it_len = cpu_to_le16(sizeof(struct 
wilc_wfi_radiotap_cb_hdr));
+   cb_hdr->hdr.it_len =
+   cpu_to_le16(sizeof(struct wilc_wfi_radiotap_cb_hdr));
 
cb_hdr->hdr.it_present = cpu_to_le32(
(1 << IEEE80211_RADIOTAP_RATE) |
@@ -96,7 +98,8 @@ void WILC_WFI_monitor_rx(u8 *buff, u32 size)
}
 
} else {
-   skb = dev_alloc_skb(size + sizeof(struct 
wilc_wfi_radiotap_hdr));
+   skb = dev_alloc_skb(size +
+   sizeof(struct wilc_wfi_radiotap_hdr));
 
if (!skb)
return;
@@ -105,7 +108,8 @@ void WILC_WFI_monitor_rx(u8 *buff, u32 size)
hdr = skb_push(skb, sizeof(*hdr));
memset(hdr, 0, sizeof(struct wilc_wfi_radiotap_hdr));
hdr->hdr.it_version = 0; /* PKTHDR_RADIOTAP_VERSION; */
-   hdr->hdr.it_len = cpu_to_le16(sizeof(struct 
wilc_wfi_radiotap_hdr));
+   hdr->hdr.it_len =
+   cpu_to_le16(sizeof(struct wilc_wfi_radiotap_hdr));
hdr->hdr.it_present = cpu_to_le32
(1 << IEEE80211_RADIOTAP_RATE); /* | */
hdr->rate = 5; /* txrate->bitrate / 5; */
@@ -197,7 +201,8 @@ static netdev_tx_t WILC_WFI_mon_xmit(struct sk_buff *skb,
skb_pull(skb, rtap_len);
 
if (skb->data[0] == 0xc0 && (!(memcmp(broadcast, &skb->data[4], 6 {
-   skb2 = dev_alloc_skb(skb->len + sizeof(struct 
wilc_wfi_radiotap_cb_hdr));
+   skb2 = dev_alloc_skb(skb->len +
+sizeof(struct wilc_wfi_radiotap_cb_hdr));
if (!skb2)
return -ENOMEM;
 
@@ -208,7 +213,8 @@ static netdev_tx_t WILC_WFI_mon_xmit(struct sk_buff *skb,
 
cb_hdr->hdr.it_version = 0; /* PKTHDR_RADIOTAP_VERSION; */
 
-   cb_hdr->hdr.it_len = cpu_to_le16(sizeof(struct 
wilc_wfi_radiotap_cb_hdr));
+   cb_hdr->hdr.it_len =
+   cpu_to_le16(sizeof(struct wilc_wfi_radiotap_cb_hdr));
 
cb_hdr->hdr.it_present = cpu_to_le32(
(1 << IEEE80211_RADIOTAP_RATE) |
-- 
2.7.4


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

[PATCH] Staging: ccree: Add blank line after declarations

2017-12-15 Thread Kamal Heib 
This patch adds a blank line after declarations to
improve code readability.

Issue find by checkpatch.pl script.
WARNING: Missing a blank line after declarations

Signed-off-by: Kamal Heib 
---
 drivers/staging/ccree/ssi_cipher.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/ccree/ssi_cipher.c 
b/drivers/staging/ccree/ssi_cipher.c
index 791fe75b1d78..270d0a43c516 100644
--- a/drivers/staging/ccree/ssi_cipher.c
+++ b/drivers/staging/ccree/ssi_cipher.c
@@ -373,6 +373,7 @@ static int cc_cipher_setkey(struct crypto_ablkcipher *atfm, 
const u8 *key,
/* sha256 for key2 - use sw implementation */
int key_len = keylen >> 1;
int err;
+
SHASH_DESC_ON_STACK(desc, ctx_p->shash_tfm);
 
desc->tfm = ctx_p->shash_tfm;
-- 
2.14.3

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

Re: [GIT PULL] Staging driver fixes for 4.15-rc4

2017-12-15 Thread Greg KH 
On Fri, Dec 15, 2017 at 01:03:03PM -0800, Linus Torvalds wrote:
> On Fri, Dec 15, 2017 at 11:00 AM, Greg KH  wrote:
> >
> > While there are 4 patches in here, there's really only 2, as one ion
> > patch got reverted due to build errors reported by 0-day.
> 
> Since the revert was for the previous commit and the two were the top
> two commits, I just pulled the two actual fixes instead.

Ah, great, that works.  I'll rebase my public branch, but linux-next
should be able to handle that :)

thanks,

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

[PATCH] staging: android: ion: Fix dma direction for dma_sync_sg_for_cpu/device

2017-12-15 Thread Sushmita Susheelendra 
Use the direction argument passed into begin_cpu_access
and end_cpu_access when calling the dma_sync_sg_for_cpu/device.
The actual cache primitive called depends on the direction
passed in.

Signed-off-by: Sushmita Susheelendra 
---
 drivers/staging/android/ion/ion.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/android/ion/ion.c 
b/drivers/staging/android/ion/ion.c
index a7d9b0e..f480885 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -346,7 +346,7 @@ static int ion_dma_buf_begin_cpu_access(struct dma_buf 
*dmabuf,
mutex_lock(&buffer->lock);
list_for_each_entry(a, &buffer->attachments, list) {
dma_sync_sg_for_cpu(a->dev, a->table->sgl, a->table->nents,
-   DMA_BIDIRECTIONAL);
+   direction);
}
mutex_unlock(&buffer->lock);
 
@@ -368,7 +368,7 @@ static int ion_dma_buf_end_cpu_access(struct dma_buf 
*dmabuf,
mutex_lock(&buffer->lock);
list_for_each_entry(a, &buffer->attachments, list) {
dma_sync_sg_for_device(a->dev, a->table->sgl, a->table->nents,
-  DMA_BIDIRECTIONAL);
+  direction);
}
mutex_unlock(&buffer->lock);
 
-- 
1.9.1

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

Re: [GIT PULL] Staging driver fixes for 4.15-rc4

2017-12-15 Thread Linus Torvalds 
On Fri, Dec 15, 2017 at 11:00 AM, Greg KH  wrote:
>
> While there are 4 patches in here, there's really only 2, as one ion
> patch got reverted due to build errors reported by 0-day.

Since the revert was for the previous commit and the two were the top
two commits, I just pulled the two actual fixes instead.

That lost me the signed tag in the end result, but I verified it separately.

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

Re: [PATCH 1/2] kconfig: use bool instead of boolean for type definition attributes, again

2017-12-15 Thread Greg Kroah-Hartman 
On Sat, Dec 16, 2017 at 12:38:01AM +0900, Masahiro Yamada wrote:
> Commit 6341e62b212a ("kconfig: use bool instead of boolean for type
> definition attributes") did treewide replacement of 'boolean', and
> also mentioned the keyword 'boolean' would be dropped later on.
> 
> Some years have passed, but it has not happened yet.  Meanwhile, some
> new instances have come up.
> 
> I am really going to drop this keyword.  I need to do the replacement
> once again.
> 
> Signed-off-by: Masahiro Yamada 
> ---
> 
>  drivers/firmware/efi/Kconfig| 2 +-
>  drivers/staging/rtlwifi/Kconfig | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Acked-by: Greg Kroah-Hartman 
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[GIT PULL] Staging driver fixes for 4.15-rc4

2017-12-15 Thread Greg KH 
The following changes since commit 73996933b53ff396d63a7fccd8e824758634dc19:

  Merge tag 'staging-4.15-rc3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging (2017-12-05 
09:57:34 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/ 
tags/staging-4.15-rc4

for you to fetch changes up to 3d2a0c5ff02d57ab7b4f16a6782a66765d930b7d:

  Revert "staging: ion: Fix ion_cma_heap allocations" (2017-12-15 19:36:24 
+0100)


Staging fixes for 4.15-rc4

Here are some small staging driver fixes for 4.15-rc4.

While there are 4 patches in here, there's really only 2, as one ion
patch got reverted due to build errors reported by 0-day.

The two patches that are the end-result is one for the ccree driver to
prevent an unitialized value from being returned to a caller, and the
other fixes a logic error in the pi433 driver.

All, except for the revert patch, have been in linux-next with no
reported issues.  I just made the revert, as linux-next did report
problems with the ion patch :)

Signed-off-by: Greg Kroah-Hartman 


Dan Carpenter (1):
  staging: ccree: Uninitialized return in ssi_ahash_import()

Greg Kroah-Hartman (1):
  Revert "staging: ion: Fix ion_cma_heap allocations"

John Stultz (1):
  staging: ion: Fix ion_cma_heap allocations

Marcus Wolf (1):
  staging: pi433: Fixes issue with bit shift in rf69_get_modulation

 drivers/staging/ccree/ssi_hash.c | 2 +-
 drivers/staging/pi433/rf69.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [staging:staging-linus 3/3] drivers/staging//android/ion/ion_cma_heap.c:47:14: error: 'CONFIG_CMA_ALIGNMENT' undeclared; did you mean 'CONFIG_CMA_AREAS'?

2017-12-15 Thread Greg Kroah-Hartman 
On Wed, Dec 13, 2017 at 12:04:55PM -0800, John Stultz wrote:
> On Tue, Dec 12, 2017 at 10:25 PM, kbuild test robot
>  wrote:
> > tree:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git 
> > staging-linus
> > head:   d98e6dbf42f73101128885a1e0ae672cd92b2e1a
> > commit: d98e6dbf42f73101128885a1e0ae672cd92b2e1a [3/3] staging: ion: Fix 
> > ion_cma_heap allocations
> > config: i386-randconfig-x019-12132053 (attached as .config)
> > compiler: gcc-7 (Debian 7.2.0-12) 7.2.1 20171025
> > reproduce:
> > git checkout d98e6dbf42f73101128885a1e0ae672cd92b2e1a
> > # save the attached .config to linux build tree
> > make ARCH=i386
> >
> > All errors (new ones prefixed by >>):
> >
> >drivers/staging//android/ion/ion_cma_heap.c: In function 
> > 'ion_cma_allocate':
> >>> drivers/staging//android/ion/ion_cma_heap.c:47:14: error: 
> >>> 'CONFIG_CMA_ALIGNMENT' undeclared (first use in this function); did you 
> >>> mean 'CONFIG_CMA_AREAS'?
> >  if (align > CONFIG_CMA_ALIGNMENT)
> >  ^~~~
> >  CONFIG_CMA_AREAS
> >drivers/staging//android/ion/ion_cma_heap.c:47:14: note: each undeclared 
> > identifier is reported only once for each function it appears in
> >
> > vim +47 drivers/staging//android/ion/ion_cma_heap.c
> 
> Sorry about this, I guess CONFIG_CMA_ALIGNMENT isn't generically
> available. I'll rework the patch to figure out how to properly
> conditionalize this and resubmit.

I've just reverted this patch from my tree now, I'll wait for a working
one to apply it, no need for an incremental one now.

thanks,

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

[PATCH 1/2] kconfig: use bool instead of boolean for type definition attributes, again

2017-12-15 Thread Masahiro Yamada 
Commit 6341e62b212a ("kconfig: use bool instead of boolean for type
definition attributes") did treewide replacement of 'boolean', and
also mentioned the keyword 'boolean' would be dropped later on.

Some years have passed, but it has not happened yet.  Meanwhile, some
new instances have come up.

I am really going to drop this keyword.  I need to do the replacement
once again.

Signed-off-by: Masahiro Yamada 
---

 drivers/firmware/efi/Kconfig| 2 +-
 drivers/staging/rtlwifi/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index 2b4c39f..3abdda1 100644
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -113,7 +113,7 @@ config EFI_CAPSULE_LOADER
  Most users should say N.
 
 config EFI_CAPSULE_QUIRK_QUARK_CSH
-   boolean "Add support for Quark capsules with non-standard headers"
+   bool "Add support for Quark capsules with non-standard headers"
depends on X86 && !64BIT
select EFI_CAPSULE_LOADER
default y
diff --git a/drivers/staging/rtlwifi/Kconfig b/drivers/staging/rtlwifi/Kconfig
index cb3a29a..12cf467 100644
--- a/drivers/staging/rtlwifi/Kconfig
+++ b/drivers/staging/rtlwifi/Kconfig
@@ -17,6 +17,6 @@ config RTLPHYDM_ST
default m
 
 config RTLWIFI_DEBUG_ST
-   boolean
+   bool
depends on R8822BE
default y
-- 
2.7.4

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

Re: [PATCH v2 0/7] x86/kvm/hyperv: stable clocksorce for L2 guests when running nested KVM on Hyper-V

2017-12-15 Thread Vitaly Kuznetsov 
Paolo Bonzini  writes:

> On 13/12/2017 16:09, Vitaly Kuznetsov wrote:
>> Currently, KVM passes PVCLOCK_TSC_STABLE_BIT to its guests when running in
>> so called 'masterclock' mode and this is only possible when the clocksource
>> on the host is TSC. When running nested on Hyper-V we're using a different
>> clocksource in L1 (Hyper-V TSC Page) which can actually be used for
>> masterclock. This series brings the required support.
>> 
>> Making KVM work with TSC page clocksource is relatively easy, it is done in
>> PATCH 5 of the series. All the rest is required to support L1 migration
>   ^^^
>
> Patch 6. :)
>

Off-by-one :-)

>> when TSC frequency changes, we use a special feature from Hyper-V to do
>> the job.
>
> Patches 5-7 are
>
> Acked-by: Paolo Bonzini 
>

Thanks!

> I would appreciate if the Hyper-V folks can provide a topic branch to be
> merged in both HV and KVM trees.
>

There's no such thing as Hyper-V tree, patches are usually getting
merged through 'tip' tree when the majority of changes go to arch/x86 or
Greg's char-misc tree when changes are drivers/hv heavy (+ net, scsi,
pci, hid, ... trees for individual drivers).

In this particular case the series is x86-heavy and I believe it should
go through x86 'tip' tree.

Thomas, Ingo, Peter, could you please take a look? Thanks!

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

Re: [PATCH v2 0/7] x86/kvm/hyperv: stable clocksorce for L2 guests when running nested KVM on Hyper-V

2017-12-15 Thread Paolo Bonzini 
On 13/12/2017 16:09, Vitaly Kuznetsov wrote:
> Currently, KVM passes PVCLOCK_TSC_STABLE_BIT to its guests when running in
> so called 'masterclock' mode and this is only possible when the clocksource
> on the host is TSC. When running nested on Hyper-V we're using a different
> clocksource in L1 (Hyper-V TSC Page) which can actually be used for
> masterclock. This series brings the required support.
> 
> Making KVM work with TSC page clocksource is relatively easy, it is done in
> PATCH 5 of the series. All the rest is required to support L1 migration
  ^^^

Patch 6. :)

> when TSC frequency changes, we use a special feature from Hyper-V to do
> the job.

Patches 5-7 are

Acked-by: Paolo Bonzini 

I would appreciate if the Hyper-V folks can provide a topic branch to be
merged in both HV and KVM trees.

Thanks,

Paolo

> Vitaly Kuznetsov (7):
>   x86/hyper-v: check for required priviliges in hyperv_init()
>   x86/hyper-v: add a function to read both TSC and TSC page value
> simulateneously
>   x86/hyper-v: reenlightenment notifications support
>   x86/hyper-v: redirect reenlightment notifications on CPU offlining
>   x86/irq: Count Hyper-V reenlightenment interrupts
>   x86/kvm: pass stable clocksource to guests when running nested on
> Hyper-V
>   x86/kvm: support Hyper-V reenlightenment
> 
>  arch/x86/entry/entry_32.S  |   3 +
>  arch/x86/entry/entry_64.S  |   3 +
>  arch/x86/hyperv/hv_init.c  | 133 ++-
>  arch/x86/include/asm/hardirq.h |   3 +
>  arch/x86/include/asm/irq_vectors.h |   7 +-
>  arch/x86/include/asm/mshyperv.h|  32 +++--
>  arch/x86/include/uapi/asm/hyperv.h |  27 
>  arch/x86/kernel/cpu/mshyperv.c |   6 ++
>  arch/x86/kernel/irq.c  |   9 +++
>  arch/x86/kvm/x86.c | 138 
> ++---
>  10 files changed, 329 insertions(+), 32 deletions(-)
> 

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