Re: [PATCH 10/11] staging: most: add SPDX identifiers to all unisys driver files

[Greg Kroah-Hartman]

On Tue, Nov 07, 2017 at 09:09:35PM +, Kershner, David A wrote:
> > -Original Message-
> > From: devel [mailto:driverdev-devel-boun...@linuxdriverproject.org] On
> > Behalf Of Greg Kroah-Hartman
> > Sent: Tuesday, November 7, 2017 8:59 AM
> > To: de...@driverdev.osuosl.org
> > Cc: Kate Stewart ; Greg Kroah-Hartman
> > ; Michael Fabry
> > ; Philippe Ombredanne
> > ; Christian Gromm
> > ; Thomas Gleixner 
> > Subject: [PATCH 10/11] staging: most: add SPDX identifiers to all unisys
> driver
> > files
> > 
> 
> The headline says "unisys driver files", but the patch is for the most
> driver.

Ugh, my fault, too many patches written all at once, I'll fix this up
when I commit it :(

thanks,

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

Re: [PATCH 06/11] staging: lustre: add SPDX identifiers to all lustre files

[Greg Kroah-Hartman]

On Wed, Nov 08, 2017 at 12:35:43AM +, Dilger, Andreas wrote:
> On Nov 7, 2017, at 06:58, Greg Kroah-Hartman  
> wrote:
> > 
> > It's good to have SPDX identifiers in all files to make it easier to
> > audit the kernel tree for correct licenses.
> > 
> > Update the drivers/staging/lustre files files with the correct SPDX
> > license identifier based on the license text in the file itself.  The
> > SPDX identifier is a legally binding shorthand, which can be used
> > instead of the full boiler plate text.
> > 
> > This work is based on a script and data from Thomas Gleixner, Philippe
> > Ombredanne, and Kate Stewart.
> > 
> > diff --git a/drivers/staging/lustre/include/linux/libcfs/curproc.h 
> > b/drivers/staging/lustre/include/linux/libcfs/curproc.h
> > index 1ea27c9e3708..3cb3f086148e 100644
> > --- a/drivers/staging/lustre/include/linux/libcfs/curproc.h
> > +++ b/drivers/staging/lustre/include/linux/libcfs/curproc.h
> > @@ -1,3 +1,4 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > /*
> >  * GPL HEADER START
> >  *
> 
> I'm not against this, per-se, but I thought that C++ style "//" comments
> were frowned-upon in the kernel code?  Should this rather be:
> 
> /* SPDX-License-Identifier: GPL-2.0 */
> 
> as I'd prefer not to have a dozen follow-on patches because checkpatch.pl
> complains about C++ comments.

Nope, for the SPDX identifier, Linus wanted them to be // so they will
"stand out".  Look at the identifiers in his tree already as an example
of this.

thanks,

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

Re: [PATCH 02/11] staging: greybus: Remove redundant license text

[Vaibhav Agarwal]

On Tue, Nov 7, 2017 at 7:28 PM, Greg Kroah-Hartman
 wrote:
> Now that the SPDX tag is in all greybus files, that identifies the
> license in a specific and legally-defined manner.  So the extra GPL text
> wording can be removed as it is no longer needed at all.
>
> This is done on a quest to remove the 700+ different ways that files in
> the kernel describe the GPL license text.  And there's unneeded stuff
> like the address (sometimes incorrect) for the FSF which is never
> needed.
>
> No copyright headers or other non-license-description text was removed.
>
> Cc: Vaibhav Hiremath 
> Cc: Johan Hovold 
> Cc: Alex Elder 
> Cc: Greg Kroah-Hartman 
> Cc: Vaibhav Agarwal 
> Cc: Mark Greer 
> Cc: Viresh Kumar 
> Cc: Rui Miguel Silva 
> Cc: David Lin 
> Cc: "Bryan O'Donoghue" 
> Signed-off-by: Greg Kroah-Hartman 
> ---

Acked-by: Vaibhav Agarwal 

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

Re: [PATCH 01/11] staging: greybus: add SPDX identifiers to all greybus driver files

[Vaibhav Agarwal]

On Tue, Nov 7, 2017 at 7:28 PM, Greg Kroah-Hartman
 wrote:
> It's good to have SPDX identifiers in all files to make it easier to
> audit the kernel tree for correct licenses.
>
> Update the drivers/staging/greybus files files with the correct SPDX
> license identifier based on the license text in the file itself.  The
> SPDX identifier is a legally binding shorthand, which can be used
> instead of the full boiler plate text.
>
> This work is based on a script and data from Thomas Gleixner, Philippe
> Ombredanne, and Kate Stewart.
>
> Cc: Johan Hovold 
> Cc: Alex Elder 
> Cc: Greg Kroah-Hartman 
> Cc: Vaibhav Hiremath 
> Cc: Vaibhav Agarwal 
> Cc: Mark Greer 
> Cc: Viresh Kumar 
> Cc: Rui Miguel Silva 
> Cc: David Lin 
> Cc: "Bryan O'Donoghue" 
> Cc: Thomas Gleixner 
> Cc: Kate Stewart 
> Cc: Philippe Ombredanne 
> Signed-off-by: Greg Kroah-Hartman 
> ---

Acked-by: Vaibhav Agarwal 

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

Re: [PATCH 01/11] staging: greybus: add SPDX identifiers to all greybus driver files

[David Lin]

On Tue, Nov 7, 2017 at 5:58 AM, Greg Kroah-Hartman
 wrote:
> It's good to have SPDX identifiers in all files to make it easier to
> audit the kernel tree for correct licenses.
>
> Update the drivers/staging/greybus files files with the correct SPDX
> license identifier based on the license text in the file itself.  The
> SPDX identifier is a legally binding shorthand, which can be used
> instead of the full boiler plate text.
>
> This work is based on a script and data from Thomas Gleixner, Philippe
> Ombredanne, and Kate Stewart.
>
> Cc: Johan Hovold 
> Cc: Alex Elder 
> Cc: Greg Kroah-Hartman 
> Cc: Vaibhav Hiremath 
> Cc: Vaibhav Agarwal 
> Cc: Mark Greer 
> Cc: Viresh Kumar 
> Cc: Rui Miguel Silva 
> Cc: David Lin 
> Cc: "Bryan O'Donoghue" 
> Cc: Thomas Gleixner 
> Cc: Kate Stewart 
> Cc: Philippe Ombredanne 
> Signed-off-by: Greg Kroah-Hartman 

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

Re: [PATCH 02/11] staging: greybus: Remove redundant license text

[David Lin]

On Tue, Nov 7, 2017 at 5:58 AM, Greg Kroah-Hartman
 wrote:
> Now that the SPDX tag is in all greybus files, that identifies the
> license in a specific and legally-defined manner.  So the extra GPL text
> wording can be removed as it is no longer needed at all.
>
> This is done on a quest to remove the 700+ different ways that files in
> the kernel describe the GPL license text.  And there's unneeded stuff
> like the address (sometimes incorrect) for the FSF which is never
> needed.
>
> No copyright headers or other non-license-description text was removed.
>
> Cc: Vaibhav Hiremath 
> Cc: Johan Hovold 
> Cc: Alex Elder 
> Cc: Greg Kroah-Hartman 
> Cc: Vaibhav Agarwal 
> Cc: Mark Greer 
> Cc: Viresh Kumar 
> Cc: Rui Miguel Silva 
> Cc: David Lin 
> Cc: "Bryan O'Donoghue" 
> Signed-off-by: Greg Kroah-Hartman 

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

Re: [PATCH 01/11] staging: greybus: add SPDX identifiers to all greybus driver files

[Viresh Kumar]

On 07-11-17, 14:58, Greg Kroah-Hartman wrote:
> It's good to have SPDX identifiers in all files to make it easier to
> audit the kernel tree for correct licenses.
> 
> Update the drivers/staging/greybus files files with the correct SPDX
> license identifier based on the license text in the file itself.  The
> SPDX identifier is a legally binding shorthand, which can be used
> instead of the full boiler plate text.
> 
> This work is based on a script and data from Thomas Gleixner, Philippe
> Ombredanne, and Kate Stewart.
> 
> Cc: Johan Hovold 
> Cc: Alex Elder 
> Cc: Greg Kroah-Hartman 
> Cc: Vaibhav Hiremath 
> Cc: Vaibhav Agarwal 
> Cc: Mark Greer 
> Cc: Viresh Kumar 
> Cc: Rui Miguel Silva 
> Cc: David Lin 
> Cc: "Bryan O'Donoghue" 
> Cc: Thomas Gleixner 
> Cc: Kate Stewart 
> Cc: Philippe Ombredanne 
> Signed-off-by: Greg Kroah-Hartman 

Acked-by: Viresh Kumar 

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

Re: [PATCH 02/11] staging: greybus: Remove redundant license text

[Viresh Kumar]

On 07-11-17, 14:58, Greg Kroah-Hartman wrote:
> Now that the SPDX tag is in all greybus files, that identifies the
> license in a specific and legally-defined manner.  So the extra GPL text
> wording can be removed as it is no longer needed at all.
> 
> This is done on a quest to remove the 700+ different ways that files in
> the kernel describe the GPL license text.  And there's unneeded stuff
> like the address (sometimes incorrect) for the FSF which is never
> needed.
> 
> No copyright headers or other non-license-description text was removed.
> 
> Cc: Vaibhav Hiremath 
> Cc: Johan Hovold 
> Cc: Alex Elder 
> Cc: Greg Kroah-Hartman 
> Cc: Vaibhav Agarwal 
> Cc: Mark Greer 
> Cc: Viresh Kumar 
> Cc: Rui Miguel Silva 
> Cc: David Lin 
> Cc: "Bryan O'Donoghue" 
> Signed-off-by: Greg Kroah-Hartman 

Acked-by: Viresh Kumar 

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

Re: [PATCH] PCI: hv: use effective affinity mask

[Bjorn Helgaas]

On Wed, Nov 08, 2017 at 01:27:02AM +, Dexuan Cui wrote:
> > From: Bjorn Helgaas [mailto:helg...@kernel.org]
> > Sent: Tuesday, November 7, 2017 5:08 PM
> > On Wed, Nov 01, 2017 at 08:30:53PM +, Dexuan Cui wrote:
> > >
> > > Please consider this for v4.14, if it's not too late.
> > 
> > What would be the rationale for putting it in v4.14?  After the merge
> > window, I usually only merge fixes for problems introduced during the
> > merge window, or for serious regressions.  I can't tell if this fits
> > into that or not.
> 
> The patch was sent last Wednesday and I hoped it could catch the 
> merge window to be in v4.14 so we won't have to request a backport
> for the v4.14 stable kernel in future. And I was not exactly sure when
> the merge window was. Sorry :-)
> 
> The patch is not fixing a serious regression. It just fixes a long standing
> issue from the beginning of the Hyper-V vPCI driver: 1 of 7 Mellanox 
> VFs of a 32-vCPU VM running on Hyper-V may not receive interrupts.

No problem.  I added a stable tag so the backport should happen
automatically and put it on my pci/host-hv branch for v4.15, with Jake's
Reviewed-by.  Thanks!

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

Re: [PATCH net-next v2 0/2] hv_netvsc: fix a hang on channel/mtu changes

[David Miller]

From: Vitaly Kuznetsov 
Date: Thu,  2 Nov 2017 11:35:29 +0100

> It was found that netvsc driver doesn't survive e.g.
> 
> # while true; do ethtool -L eth0 combined 4; ethtool -L eth0 combined 8; done"
> 
> test. I was able to identify a hang in guest/host communication, it is
> fixed by PATCH1 of this series. PATCH2 is a cosmetic change masking
> unneeded messages.
> 
> Changes since v1:
> - Throw away patches 2 and 3 of the original series as one is unneeded and
>   the other is not justified [Eric Dumazet, Stephen Hemminger] so I'm only
>   fixing the hang now, the crash doesn't reproduce. Will keep an eye on it.

Series applied to net-next, thank you.
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

RE: [PATCH] PCI: hv: use effective affinity mask

[Dexuan Cui]

> From: Bjorn Helgaas [mailto:helg...@kernel.org]
> Sent: Tuesday, November 7, 2017 5:08 PM
> On Wed, Nov 01, 2017 at 08:30:53PM +, Dexuan Cui wrote:
> >
> > Please consider this for v4.14, if it's not too late.
> 
> What would be the rationale for putting it in v4.14?  After the merge
> window, I usually only merge fixes for problems introduced during the
> merge window, or for serious regressions.  I can't tell if this fits
> into that or not.

The patch was sent last Wednesday and I hoped it could catch the 
merge window to be in v4.14 so we won't have to request a backport
for the v4.14 stable kernel in future. And I was not exactly sure when
the merge window was. Sorry :-)

The patch is not fixing a serious regression. It just fixes a long standing
issue from the beginning of the Hyper-V vPCI driver: 1 of 7 Mellanox 
VFs of a 32-vCPU VM running on Hyper-V may not receive interrupts.

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

Re: [PATCH] PCI: hv: use effective affinity mask

[Bjorn Helgaas]

On Wed, Nov 01, 2017 at 08:30:53PM +, Dexuan Cui wrote:
> 
> The effective_affinity_mask is always set when an interrupt is assigned in
> __assign_irq_vector() -> apic->cpu_mask_to_apicid(), e.g. for struct apic
> apic_physflat: -> default_cpu_mask_to_apicid() ->
> irq_data_update_effective_affinity(), but it looks d->common->affinity
> remains all-1's before the user space or the kernel changes it later.
> 
> In the early allocation/initialization phase of an irq, we should use the
> effective_affinity_mask, otherwise Hyper-V may not deliver the interrupt
> to the expected cpu. Without the patch, if we assign 7 Mellanox ConnectX-3
> VFs to a 32-vCPU VM, one of the VFs may fail to receive interrupts.
> 
> Signed-off-by: Dexuan Cui 
> Cc: Jake Oshins 
> Cc: Jork Loeser 
> Cc: Stephen Hemminger 
> Cc: K. Y. Srinivasan 
> ---
> 
> Please consider this for v4.14, if it's not too late.

What would be the rationale for putting it in v4.14?  After the merge
window, I usually only merge fixes for problems introduced during the
merge window, or for serious regressions.  I can't tell if this fits
into that or not.

>  drivers/pci/host/pci-hyperv.c | 8 +---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c
> index 5ccb47d..8b5f66d 100644
> --- a/drivers/pci/host/pci-hyperv.c
> +++ b/drivers/pci/host/pci-hyperv.c
> @@ -879,7 +879,7 @@ static void hv_irq_unmask(struct irq_data *data)
>   int cpu;
>   u64 res;
>  
> - dest = irq_data_get_affinity_mask(data);
> + dest = irq_data_get_effective_affinity_mask(data);
>   pdev = msi_desc_to_pci_dev(msi_desc);
>   pbus = pdev->bus;
>   hbus = container_of(pbus->sysdata, struct hv_pcibus_device, sysdata);
> @@ -1042,6 +1042,7 @@ static void hv_compose_msi_msg(struct irq_data *data, 
> struct msi_msg *msg)
>   struct hv_pci_dev *hpdev;
>   struct pci_bus *pbus;
>   struct pci_dev *pdev;
> + struct cpumask *dest;
>   struct compose_comp_ctxt comp;
>   struct tran_int_desc *int_desc;
>   struct {
> @@ -1056,6 +1057,7 @@ static void hv_compose_msi_msg(struct irq_data *data, 
> struct msi_msg *msg)
>   int ret;
>  
>   pdev = msi_desc_to_pci_dev(irq_data_get_msi_desc(data));
> + dest = irq_data_get_effective_affinity_mask(data);
>   pbus = pdev->bus;
>   hbus = container_of(pbus->sysdata, struct hv_pcibus_device, sysdata);
>   hpdev = get_pcichild_wslot(hbus, devfn_to_wslot(pdev->devfn));
> @@ -1081,14 +1083,14 @@ static void hv_compose_msi_msg(struct irq_data *data, 
> struct msi_msg *msg)
>   switch (pci_protocol_version) {
>   case PCI_PROTOCOL_VERSION_1_1:
>   size = hv_compose_msi_req_v1(_pkts.v1,
> - irq_data_get_affinity_mask(data),
> + dest,
>   hpdev->desc.win_slot.slot,
>   cfg->vector);
>   break;
>  
>   case PCI_PROTOCOL_VERSION_1_2:
>   size = hv_compose_msi_req_v2(_pkts.v2,
> - irq_data_get_affinity_mask(data),
> + dest,
>   hpdev->desc.win_slot.slot,
>   cfg->vector);
>   break;
> -- 
> 2.7.4
> 
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

RE: [PATCH] PCI: hv: use effective affinity mask

[Jake Oshins]

> -Original Message-
> From: Bjorn Helgaas [mailto:helg...@kernel.org]
> Sent: Tuesday, November 7, 2017 4:15 PM
> To: Jake Oshins 
> Cc: Dexuan Cui ; Bjorn Helgaas
> ; linux-...@vger.kernel.org; KY Srinivasan
> ; Stephen Hemminger ;
> de...@linuxdriverproject.org; linux-ker...@vger.kernel.org; Haiyang Zhang
> ; Jork Loeser ;
> Chris Valean (Cloudbase Solutions SRL) ; Adrian
> Suhov (Cloudbase Solutions SRL) ; Simon Xiao
> ; 'Eyal Mizrachi' ; Jack
> Morgenstein ; Armen Guezalian
> ; Firas Mahameed ;
> Tziporet Koren ; Daniel Jurgens
> 
> Subject: Re: [PATCH] PCI: hv: use effective affinity mask
> 
> On Wed, Nov 01, 2017 at 08:52:56PM +, Jake Oshins wrote:
> > > -Original Message-
> > > From: Dexuan Cui
> > > Sent: Wednesday, November 1, 2017 1:31 PM
> > > To: Bjorn Helgaas ; linux-...@vger.kernel.org;
> > > Jake Oshins ; KY Srinivasan
> > > ; Stephen Hemminger
> 
> > > Cc: de...@linuxdriverproject.org; linux-ker...@vger.kernel.org;
> > > Haiyang Zhang ; Jork Loeser
> > > ; Chris Valean (Cloudbase Solutions SRL)
> > > ; Adrian Suhov (Cloudbase Solutions SRL)
> > > ; Simon Xiao ; 'Eyal
> > > Mizrachi' ; Jack Morgenstein
> > > ; Armen Guezalian ;
> Firas
> > > Mahameed ; Tziporet Koren
> > > ; Daniel Jurgens 
> > > Subject: [PATCH] PCI: hv: use effective affinity mask
> > >
> > >
> > > The effective_affinity_mask is always set when an interrupt is
> > > assigned in
> > > __assign_irq_vector() -> apic->cpu_mask_to_apicid(), e.g. for struct
> > > apic
> > > apic_physflat: -> default_cpu_mask_to_apicid() ->
> > > irq_data_update_effective_affinity(), but it looks
> > > d->common->affinity remains all-1's before the user space or the kernel
> changes it later.
> > >
> > > In the early allocation/initialization phase of an irq, we should
> > > use the effective_affinity_mask, otherwise Hyper-V may not deliver
> > > the interrupt to the expected cpu. Without the patch, if we assign 7
> > > Mellanox ConnectX-3 VFs to a 32-vCPU VM, one of the VFs may fail to
> receive interrupts.
> > >
> > > Signed-off-by: Dexuan Cui 
> > > Cc: Jake Oshins 
> > > Cc: Jork Loeser 
> > > Cc: Stephen Hemminger 
> > > Cc: K. Y. Srinivasan 
> > > ---
> > >
> > > Please consider this for v4.14, if it's not too late.
> > >
> > >  drivers/pci/host/pci-hyperv.c | 8 +---
> > >  1 file changed, 5 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/pci/host/pci-hyperv.c
> > > b/drivers/pci/host/pci-hyperv.c index 5ccb47d..8b5f66d 100644
> > > --- a/drivers/pci/host/pci-hyperv.c
> > > +++ b/drivers/pci/host/pci-hyperv.c
> > > @@ -879,7 +879,7 @@ static void hv_irq_unmask(struct irq_data *data)
> > >   int cpu;
> > >   u64 res;
> > >
> > > - dest = irq_data_get_affinity_mask(data);
> > > + dest = irq_data_get_effective_affinity_mask(data);
> > >   pdev = msi_desc_to_pci_dev(msi_desc);
> > >   pbus = pdev->bus;
> > >   hbus = container_of(pbus->sysdata, struct hv_pcibus_device,
> > > sysdata); @@ -1042,6 +1042,7 @@ static void
> > > hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
> > >   struct hv_pci_dev *hpdev;
> > >   struct pci_bus *pbus;
> > >   struct pci_dev *pdev;
> > > + struct cpumask *dest;
> > >   struct compose_comp_ctxt comp;
> > >   struct tran_int_desc *int_desc;
> > >   struct {
> > > @@ -1056,6 +1057,7 @@ static void hv_compose_msi_msg(struct
> irq_data
> > > *data, struct msi_msg *msg)
> > >   int ret;
> > >
> > >   pdev = msi_desc_to_pci_dev(irq_data_get_msi_desc(data));
> > > + dest = irq_data_get_effective_affinity_mask(data);
> > >   pbus = pdev->bus;
> > >   hbus = container_of(pbus->sysdata, struct hv_pcibus_device,
> > > sysdata);
> > >   hpdev = get_pcichild_wslot(hbus, devfn_to_wslot(pdev->devfn));
> @@
> > > -1081,14 +1083,14 @@ static void hv_compose_msi_msg(struct irq_data
> > > *data, struct msi_msg *msg)
> > >   switch (pci_protocol_version) {
> > >   case PCI_PROTOCOL_VERSION_1_1:
> > >   size = hv_compose_msi_req_v1(_pkts.v1,
> > > - irq_data_get_affinity_mask(data),
> > > + dest,
> > >   hpdev->desc.win_slot.slot,
> > >   cfg->vector);
> > >   break;
> > >
> > >   case 

[PATCH] staging: fsl-dpaa2: Fix multiple assignments should be avoided

[Joshua Abraham]

This patch fixes the checkpatch.pl warning:
"CHECK: multiple assignments should be avoided"

Signed-off-by: Joshua Abraham 
---
 drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c 
b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
index 0d8ed002adcb..384218946108 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
@@ -1661,7 +1661,8 @@ static void set_fq_affinity(struct dpaa2_eth_priv *priv)
 * This may well change at runtime, either through irqbalance or
 * through direct user intervention.
 */
-   rx_cpu = txc_cpu = cpumask_first(>dpio_cpumask);
+   rx_cpu = cpumask_first(>dpio_cpumask);
+   txc_cpu = rx_cpu;
 
for (i = 0; i < priv->num_fqs; i++) {
fq = >fq[i];
-- 
2.15.0

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

Re: [PATCH 06/11] staging: lustre: add SPDX identifiers to all lustre files

[Dilger, Andreas]

On Nov 7, 2017, at 06:58, Greg Kroah-Hartman  wrote:
> 
> It's good to have SPDX identifiers in all files to make it easier to
> audit the kernel tree for correct licenses.
> 
> Update the drivers/staging/lustre files files with the correct SPDX
> license identifier based on the license text in the file itself.  The
> SPDX identifier is a legally binding shorthand, which can be used
> instead of the full boiler plate text.
> 
> This work is based on a script and data from Thomas Gleixner, Philippe
> Ombredanne, and Kate Stewart.
> 
> diff --git a/drivers/staging/lustre/include/linux/libcfs/curproc.h 
> b/drivers/staging/lustre/include/linux/libcfs/curproc.h
> index 1ea27c9e3708..3cb3f086148e 100644
> --- a/drivers/staging/lustre/include/linux/libcfs/curproc.h
> +++ b/drivers/staging/lustre/include/linux/libcfs/curproc.h
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
>  * GPL HEADER START
>  *

I'm not against this, per-se, but I thought that C++ style "//" comments
were frowned-upon in the kernel code?  Should this rather be:

/* SPDX-License-Identifier: GPL-2.0 */

as I'd prefer not to have a dozen follow-on patches because checkpatch.pl
complains about C++ comments.

Cheers, Andreas
--
Andreas Dilger
Lustre Principal Architect
Intel Corporation







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

Re: [PATCH] PCI: hv: use effective affinity mask

[Bjorn Helgaas]

On Wed, Nov 01, 2017 at 08:52:56PM +, Jake Oshins wrote:
> > -Original Message-
> > From: Dexuan Cui
> > Sent: Wednesday, November 1, 2017 1:31 PM
> > To: Bjorn Helgaas ; linux-...@vger.kernel.org; Jake
> > Oshins ; KY Srinivasan ;
> > Stephen Hemminger 
> > Cc: de...@linuxdriverproject.org; linux-ker...@vger.kernel.org; Haiyang
> > Zhang ; Jork Loeser
> > ; Chris Valean (Cloudbase Solutions SRL)  > chv...@microsoft.com>; Adrian Suhov (Cloudbase Solutions SRL)  > ads...@microsoft.com>; Simon Xiao ; 'Eyal
> > Mizrachi' ; Jack Morgenstein
> > ; Armen Guezalian ; Firas
> > Mahameed ; Tziporet Koren
> > ; Daniel Jurgens 
> > Subject: [PATCH] PCI: hv: use effective affinity mask
> > 
> > 
> > The effective_affinity_mask is always set when an interrupt is assigned in
> > __assign_irq_vector() -> apic->cpu_mask_to_apicid(), e.g. for struct apic
> > apic_physflat: -> default_cpu_mask_to_apicid() ->
> > irq_data_update_effective_affinity(), but it looks d->common->affinity
> > remains all-1's before the user space or the kernel changes it later.
> > 
> > In the early allocation/initialization phase of an irq, we should use the
> > effective_affinity_mask, otherwise Hyper-V may not deliver the interrupt to
> > the expected cpu. Without the patch, if we assign 7 Mellanox ConnectX-3
> > VFs to a 32-vCPU VM, one of the VFs may fail to receive interrupts.
> > 
> > Signed-off-by: Dexuan Cui 
> > Cc: Jake Oshins 
> > Cc: Jork Loeser 
> > Cc: Stephen Hemminger 
> > Cc: K. Y. Srinivasan 
> > ---
> > 
> > Please consider this for v4.14, if it's not too late.
> > 
> >  drivers/pci/host/pci-hyperv.c | 8 +---
> >  1 file changed, 5 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c
> > index 5ccb47d..8b5f66d 100644
> > --- a/drivers/pci/host/pci-hyperv.c
> > +++ b/drivers/pci/host/pci-hyperv.c
> > @@ -879,7 +879,7 @@ static void hv_irq_unmask(struct irq_data *data)
> > int cpu;
> > u64 res;
> > 
> > -   dest = irq_data_get_affinity_mask(data);
> > +   dest = irq_data_get_effective_affinity_mask(data);
> > pdev = msi_desc_to_pci_dev(msi_desc);
> > pbus = pdev->bus;
> > hbus = container_of(pbus->sysdata, struct hv_pcibus_device,
> > sysdata); @@ -1042,6 +1042,7 @@ static void hv_compose_msi_msg(struct
> > irq_data *data, struct msi_msg *msg)
> > struct hv_pci_dev *hpdev;
> > struct pci_bus *pbus;
> > struct pci_dev *pdev;
> > +   struct cpumask *dest;
> > struct compose_comp_ctxt comp;
> > struct tran_int_desc *int_desc;
> > struct {
> > @@ -1056,6 +1057,7 @@ static void hv_compose_msi_msg(struct irq_data
> > *data, struct msi_msg *msg)
> > int ret;
> > 
> > pdev = msi_desc_to_pci_dev(irq_data_get_msi_desc(data));
> > +   dest = irq_data_get_effective_affinity_mask(data);
> > pbus = pdev->bus;
> > hbus = container_of(pbus->sysdata, struct hv_pcibus_device,
> > sysdata);
> > hpdev = get_pcichild_wslot(hbus, devfn_to_wslot(pdev->devfn));
> > @@ -1081,14 +1083,14 @@ static void hv_compose_msi_msg(struct irq_data
> > *data, struct msi_msg *msg)
> > switch (pci_protocol_version) {
> > case PCI_PROTOCOL_VERSION_1_1:
> > size = hv_compose_msi_req_v1(_pkts.v1,
> > -   irq_data_get_affinity_mask(data),
> > +   dest,
> > hpdev->desc.win_slot.slot,
> > cfg->vector);
> > break;
> > 
> > case PCI_PROTOCOL_VERSION_1_2:
> > size = hv_compose_msi_req_v2(_pkts.v2,
> > -   irq_data_get_affinity_mask(data),
> > +   dest,
> > hpdev->desc.win_slot.slot,
> > cfg->vector);
> > break;
> > --
> > 2.7.4
> 
> Signed-off-by: Jake Oshins 

I'm not sure what this means.

Per Documentation/process/submitting-patches.rst, "Signed-off-by"
means you were "involved in the development of the patch, or that
he/she was in the patch's delivery path."  You weren't in the delivery
path (I got it from Dexuan), and if you were involved in development,
your Signed-off-by would normally appear in the original posting.

Should this be a Reviewed-by tag?
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH 02/11] staging: greybus: Remove redundant license text

[Mark Greer]

On Tue, Nov 07, 2017 at 02:58:42PM +0100, Greg Kroah-Hartman wrote:
> Now that the SPDX tag is in all greybus files, that identifies the
> license in a specific and legally-defined manner.  So the extra GPL text
> wording can be removed as it is no longer needed at all.
> 
> This is done on a quest to remove the 700+ different ways that files in
> the kernel describe the GPL license text.  And there's unneeded stuff
> like the address (sometimes incorrect) for the FSF which is never
> needed.
> 
> No copyright headers or other non-license-description text was removed.
> 
> Cc: Vaibhav Hiremath 
> Cc: Johan Hovold 
> Cc: Alex Elder 
> Cc: Greg Kroah-Hartman 
> Cc: Vaibhav Agarwal 
> Cc: Mark Greer 
> Cc: Viresh Kumar 
> Cc: Rui Miguel Silva 
> Cc: David Lin 
> Cc: "Bryan O'Donoghue" 
> Signed-off-by: Greg Kroah-Hartman 
> ---

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

Re: [PATCH 01/11] staging: greybus: add SPDX identifiers to all greybus driver files

[Mark Greer]

On Tue, Nov 07, 2017 at 02:58:41PM +0100, Greg Kroah-Hartman wrote:
> It's good to have SPDX identifiers in all files to make it easier to
> audit the kernel tree for correct licenses.
> 
> Update the drivers/staging/greybus files files with the correct SPDX
> license identifier based on the license text in the file itself.  The
> SPDX identifier is a legally binding shorthand, which can be used
> instead of the full boiler plate text.
> 
> This work is based on a script and data from Thomas Gleixner, Philippe
> Ombredanne, and Kate Stewart.
> 
> Cc: Johan Hovold 
> Cc: Alex Elder 
> Cc: Greg Kroah-Hartman 
> Cc: Vaibhav Hiremath 
> Cc: Vaibhav Agarwal 
> Cc: Mark Greer 
> Cc: Viresh Kumar 
> Cc: Rui Miguel Silva 
> Cc: David Lin 
> Cc: "Bryan O'Donoghue" 
> Cc: Thomas Gleixner 
> Cc: Kate Stewart 
> Cc: Philippe Ombredanne 
> Signed-off-by: Greg Kroah-Hartman 

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

RE: [PATCH 10/11] staging: most: add SPDX identifiers to all unisys driver files

[Kershner, David A]

> -Original Message-
> From: devel [mailto:driverdev-devel-boun...@linuxdriverproject.org] On
> Behalf Of Greg Kroah-Hartman
> Sent: Tuesday, November 7, 2017 8:59 AM
> To: de...@driverdev.osuosl.org
> Cc: Kate Stewart ; Greg Kroah-Hartman
> ; Michael Fabry
> ; Philippe Ombredanne
> ; Christian Gromm
> ; Thomas Gleixner 
> Subject: [PATCH 10/11] staging: most: add SPDX identifiers to all unisys
driver
> files
> 

The headline says "unisys driver files", but the patch is for the most
driver.

David Kershner

> It's good to have SPDX identifiers in all files to make it easier to
> audit the kernel tree for correct licenses.
> 
> Update the drivers/staging/most files files with the correct SPDX
> license identifier based on the license text in the file itself.  The
> SPDX identifier is a legally binding shorthand, which can be used
> instead of the full boiler plate text.
> 
> This work is based on a script and data from Thomas Gleixner, Philippe
> Ombredanne, and Kate Stewart.
> 
> Cc: Michael Fabry 
> Cc: Christian Gromm 
> Cc: Thomas Gleixner 
> Cc: Kate Stewart 
> Cc: Philippe Ombredanne 
> Signed-off-by: Greg Kroah-Hartman 
> ---
>  drivers/staging/most/aim-cdev/cdev.c  | 1 +
>  drivers/staging/most/aim-network/networking.c | 1 +
>  drivers/staging/most/aim-sound/sound.c| 1 +
>  drivers/staging/most/aim-v4l2/video.c | 1 +
>  drivers/staging/most/hdm-dim2/dim2_errors.h   | 1 +
>  drivers/staging/most/hdm-dim2/dim2_hal.c  | 1 +
>  drivers/staging/most/hdm-dim2/dim2_hal.h  | 1 +
>  drivers/staging/most/hdm-dim2/dim2_hdm.c  | 1 +
>  drivers/staging/most/hdm-dim2/dim2_hdm.h  | 1 +
>  drivers/staging/most/hdm-dim2/dim2_reg.h  | 1 +
>  drivers/staging/most/hdm-dim2/dim2_sysfs.c| 1 +
>  drivers/staging/most/hdm-dim2/dim2_sysfs.h| 1 +
>  drivers/staging/most/hdm-i2c/hdm_i2c.c| 1 +
>  drivers/staging/most/hdm-usb/hdm_usb.c| 1 +
>  drivers/staging/most/mostcore/core.c  | 1 +
>  drivers/staging/most/mostcore/mostcore.h  | 1 +
>  16 files changed, 16 insertions(+)
> 
> diff --git a/drivers/staging/most/aim-cdev/cdev.c
> b/drivers/staging/most/aim-cdev/cdev.c
> index 1e5cbc893496..d6e7e85d9ece 100644
> --- a/drivers/staging/most/aim-cdev/cdev.c
> +++ b/drivers/staging/most/aim-cdev/cdev.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * cdev.c - Application interfacing module for character devices
>   *
> diff --git a/drivers/staging/most/aim-network/networking.c
> b/drivers/staging/most/aim-network/networking.c
> index 936f013c350e..e2dff6d5cf30 100644
> --- a/drivers/staging/most/aim-network/networking.c
> +++ b/drivers/staging/most/aim-network/networking.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * Networking AIM - Networking Application Interface Module for MostCore
>   *
> diff --git a/drivers/staging/most/aim-sound/sound.c
> b/drivers/staging/most/aim-sound/sound.c
> index ea1366a44008..0f596ca532d8 100644
> --- a/drivers/staging/most/aim-sound/sound.c
> +++ b/drivers/staging/most/aim-sound/sound.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * sound.c - Audio Application Interface Module for Mostcore
>   *
> diff --git a/drivers/staging/most/aim-v4l2/video.c
> b/drivers/staging/most/aim-v4l2/video.c
> index e0748416aee5..e089d139b943 100644
> --- a/drivers/staging/most/aim-v4l2/video.c
> +++ b/drivers/staging/most/aim-v4l2/video.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * V4L2 AIM - V4L2 Application Interface Module for MostCore
>   *
> diff --git a/drivers/staging/most/hdm-dim2/dim2_errors.h
> b/drivers/staging/most/hdm-dim2/dim2_errors.h
> index 66343ba426c1..073d93cf4927 100644
> --- a/drivers/staging/most/hdm-dim2/dim2_errors.h
> +++ b/drivers/staging/most/hdm-dim2/dim2_errors.h
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * dim2_errors.h - Definitions of errors for DIM2 HAL API
>   * (MediaLB, Device Interface Macro IP, OS62420)
> diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.c
> b/drivers/staging/most/hdm-dim2/dim2_hal.c
> index 91484643d289..f0a45863c8cb 100644
> --- a/drivers/staging/most/hdm-dim2/dim2_hal.c
> +++ b/drivers/staging/most/hdm-dim2/dim2_hal.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * dim2_hal.c - DIM2 HAL implementation
>   * (MediaLB, Device Interface Macro IP, OS62420)
> diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.h
> b/drivers/staging/most/hdm-dim2/dim2_hal.h
> index 6df6ea5f7da4..df678124117c 100644
> --- a/drivers/staging/most/hdm-dim2/dim2_hal.h
> +++ b/drivers/staging/most/hdm-dim2/dim2_hal.h
> @@ -1,3 +1,4 @@
> +// 

[PATCH 9/9] staging: android: Remove redundant license text

[Greg Kroah-Hartman]

Now that the SPDX tag is in all android files, that identifies the
license in a specific and legally-defined manner.  So the extra GPL text
wording can be removed as it is no longer needed at all.

This is done on a quest to remove the 700+ different ways that files in
the kernel describe the GPL license text.  And there's unneeded stuff
like the address (sometimes incorrect) for the FSF which is never
needed.

No copyright headers or other non-license-description text was removed.

Cc: "Arve Hjønnevåg" 
Cc: Riley Andrews 
Cc: Laura Abbott 
Cc: Sumit Semwal 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/android/ashmem.c|  9 -
 drivers/staging/android/ion/ion-ioctl.c | 11 ---
 drivers/staging/android/ion/ion.c   | 11 ---
 drivers/staging/android/ion/ion.h   | 10 --
 drivers/staging/android/ion/ion_carveout_heap.c | 10 --
 drivers/staging/android/ion/ion_chunk_heap.c| 10 --
 drivers/staging/android/ion/ion_cma_heap.c  | 10 --
 drivers/staging/android/ion/ion_heap.c  | 10 --
 drivers/staging/android/ion/ion_page_pool.c | 10 --
 drivers/staging/android/ion/ion_system_heap.c   | 10 --
 drivers/staging/android/uapi/ion.h  | 10 --
 11 files changed, 111 deletions(-)

diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index 24298077a3ba..4e8947923904 100644
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -6,15 +6,6 @@
  * Copyright (C) 2008 Google, Inc.
  *
  * Robert Love 
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 #define pr_fmt(fmt) "ashmem: " fmt
diff --git a/drivers/staging/android/ion/ion-ioctl.c 
b/drivers/staging/android/ion/ion-ioctl.c
index 4eda17713d82..6ed2cc15c8c0 100644
--- a/drivers/staging/android/ion/ion-ioctl.c
+++ b/drivers/staging/android/ion/ion-ioctl.c
@@ -1,17 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- *
  * Copyright (C) 2011 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  */
 
 #include 
diff --git a/drivers/staging/android/ion/ion.c 
b/drivers/staging/android/ion/ion.c
index eac43db27b60..7630432a7de8 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -1,19 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- *
  * drivers/staging/android/ion/ion.c
  *
  * Copyright (C) 2011 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  */
 
 #include 
diff --git a/drivers/staging/android/ion/ion.h 
b/drivers/staging/android/ion/ion.h
index 3e9327625426..7409437ffdd8 100644
--- a/drivers/staging/android/ion/ion.h
+++ b/drivers/staging/android/ion/ion.h
@@ -3,16 +3,6 @@
  * drivers/staging/android/ion/ion.h
  *
  * Copyright (C) 2011 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  */
 
 #ifndef _ION_H
diff --git a/drivers/staging/android/ion/ion_carveout_heap.c 
b/drivers/staging/android/ion/ion_carveout_heap.c
index ff1345d81564..e129237a0417 100644
--- a/drivers/staging/android/ion/ion_carveout_heap.c
+++ b/drivers/staging/android/ion/ion_carveout_heap.c
@@ -3,16 +3,6 @@
  * 

[PATCH 8/9] staging vt6655: Remove redundant license text

[Greg Kroah-Hartman]

Now that the SPDX tag is in all vt6655 files, that identifies the
license in a specific and legally-defined manner.  So the extra GPL text
wording can be removed as it is no longer needed at all.

This is done on a quest to remove the 700+ different ways that files in
the kernel describe the GPL license text.  And there's unneeded stuff
like the address (sometimes incorrect) for the FSF which is never
needed.

No copyright headers or other non-license-description text was removed.

Cc: Forest Bond 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/vt6655/baseband.c| 10 --
 drivers/staging/vt6655/baseband.h| 10 --
 drivers/staging/vt6655/card.c| 10 --
 drivers/staging/vt6655/card.h| 10 --
 drivers/staging/vt6655/channel.c | 10 --
 drivers/staging/vt6655/channel.h | 11 ---
 drivers/staging/vt6655/desc.h| 10 --
 drivers/staging/vt6655/device.h  | 10 --
 drivers/staging/vt6655/device_cfg.h  | 10 --
 drivers/staging/vt6655/device_main.c | 10 --
 drivers/staging/vt6655/dpc.c | 10 --
 drivers/staging/vt6655/dpc.h | 10 --
 drivers/staging/vt6655/key.c | 10 --
 drivers/staging/vt6655/key.h | 10 --
 drivers/staging/vt6655/mac.c | 10 --
 drivers/staging/vt6655/mac.h | 10 --
 drivers/staging/vt6655/power.c   | 10 --
 drivers/staging/vt6655/power.h   | 10 --
 drivers/staging/vt6655/rf.c  | 10 --
 drivers/staging/vt6655/rf.h  | 10 --
 drivers/staging/vt6655/rxtx.c| 10 --
 drivers/staging/vt6655/rxtx.h| 10 --
 drivers/staging/vt6655/srom.c| 10 --
 drivers/staging/vt6655/srom.h| 10 --
 drivers/staging/vt6655/tmacro.h  | 10 --
 drivers/staging/vt6655/upc.h | 10 --
 26 files changed, 261 deletions(-)

diff --git a/drivers/staging/vt6655/baseband.c 
b/drivers/staging/vt6655/baseband.c
index fa7ab1969fd5..f0b163473426 100644
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@@ -3,16 +3,6 @@
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  * File: baseband.c
  *
  * Purpose: Implement functions to access baseband
diff --git a/drivers/staging/vt6655/baseband.h 
b/drivers/staging/vt6655/baseband.h
index 1416c6d726d6..b8ee33dcb352 100644
--- a/drivers/staging/vt6655/baseband.h
+++ b/drivers/staging/vt6655/baseband.h
@@ -3,16 +3,6 @@
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  * File: baseband.h
  *
  * Purpose: Implement functions to access baseband
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index a83218fa5aae..ea0a4b57852c 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -3,16 +3,6 @@
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  * File: card.c
  * Purpose: Provide functions to setup NIC operation mode
  * Functions:
diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h
index 8bdf8ddf7486..487039a64587 100644
--- a/drivers/staging/vt6655/card.h
+++ b/drivers/staging/vt6655/card.h
@@ -3,16 +3,6 @@
  * Copyright (c) 1996, 2003 VIA Networking 

[PATCH 7/9] staging: vt6656: Remove redundant license text

[Greg Kroah-Hartman]

Now that the SPDX tag is in all vt6656 files, that identifies the
license in a specific and legally-defined manner.  So the extra GPL text
wording can be removed as it is no longer needed at all.

This is done on a quest to remove the 700+ different ways that files in
the kernel describe the GPL license text.  And there's unneeded stuff
like the address (sometimes incorrect) for the FSF which is never
needed.

No copyright headers or other non-license-description text was removed.

Cc: Forest Bond 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/vt6656/baseband.c | 11 ---
 drivers/staging/vt6656/baseband.h | 11 ---
 drivers/staging/vt6656/card.c | 11 ---
 drivers/staging/vt6656/card.h | 11 ---
 drivers/staging/vt6656/channel.c  | 11 ---
 drivers/staging/vt6656/channel.h  | 11 ---
 drivers/staging/vt6656/desc.h | 11 ---
 drivers/staging/vt6656/device.h   | 11 ---
 drivers/staging/vt6656/dpc.c  | 11 ---
 drivers/staging/vt6656/dpc.h  | 11 ---
 drivers/staging/vt6656/firmware.c | 11 ---
 drivers/staging/vt6656/firmware.h | 11 ---
 drivers/staging/vt6656/int.c  | 11 ---
 drivers/staging/vt6656/int.h  | 11 ---
 drivers/staging/vt6656/key.c  | 11 ---
 drivers/staging/vt6656/key.h  | 11 ---
 drivers/staging/vt6656/mac.c  | 11 ---
 drivers/staging/vt6656/mac.h  | 11 ---
 drivers/staging/vt6656/main_usb.c | 11 ---
 drivers/staging/vt6656/power.c| 11 ---
 drivers/staging/vt6656/power.h| 11 ---
 drivers/staging/vt6656/rf.c   | 11 ---
 drivers/staging/vt6656/rf.h   | 11 ---
 drivers/staging/vt6656/rxtx.c | 11 ---
 drivers/staging/vt6656/rxtx.h | 11 ---
 drivers/staging/vt6656/usbpipe.c  | 11 ---
 drivers/staging/vt6656/usbpipe.h  | 11 ---
 drivers/staging/vt6656/wcmd.c | 11 ---
 drivers/staging/vt6656/wcmd.h | 11 ---
 29 files changed, 319 deletions(-)

diff --git a/drivers/staging/vt6656/baseband.c 
b/drivers/staging/vt6656/baseband.c
index eefe4ed5d026..b29ba237fa29 100644
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -3,17 +3,6 @@
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- *
  * File: baseband.c
  *
  * Purpose: Implement functions to access baseband
diff --git a/drivers/staging/vt6656/baseband.h 
b/drivers/staging/vt6656/baseband.h
index 3ec69050b9a1..a907e3026012 100644
--- a/drivers/staging/vt6656/baseband.h
+++ b/drivers/staging/vt6656/baseband.h
@@ -3,17 +3,6 @@
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- *
  * File: baseband.h
  *
  * Purpose: Implement functions to access baseband
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index fe12c9505eb1..501f482b41c4 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -3,17 +3,6 @@
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- *
  * File: card.c
  * Purpose: Provide functions to setup NIC operation mode
  * Functions:
diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index fa65db740e80..0a91d9ba4688 100644
--- 

[PATCH 4/9] staging: vt6656: add SPDX identifiers to all vt6656 driver files

[Greg Kroah-Hartman]

It's good to have SPDX identifiers in all files to make it easier to
audit the kernel tree for correct licenses.

Update the vt6656 driver files with the correct SPDX license identifier
based on the license text in the file itself.  The SPDX identifier is a
legally binding shorthand, which can be used instead of the full boiler
plate text.

This work is based on a script and data from Thomas Gleixner, Philippe
Ombredanne, and Kate Stewart.

Cc: Forest Bond 
Cc: Thomas Gleixner 
Cc: Kate Stewart 
Cc: Philippe Ombredanne 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/vt6656/baseband.c | 1 +
 drivers/staging/vt6656/baseband.h | 1 +
 drivers/staging/vt6656/card.c | 1 +
 drivers/staging/vt6656/card.h | 1 +
 drivers/staging/vt6656/channel.c  | 1 +
 drivers/staging/vt6656/channel.h  | 1 +
 drivers/staging/vt6656/desc.h | 1 +
 drivers/staging/vt6656/device.h   | 1 +
 drivers/staging/vt6656/dpc.c  | 1 +
 drivers/staging/vt6656/dpc.h  | 1 +
 drivers/staging/vt6656/firmware.c | 1 +
 drivers/staging/vt6656/firmware.h | 1 +
 drivers/staging/vt6656/int.c  | 1 +
 drivers/staging/vt6656/int.h  | 1 +
 drivers/staging/vt6656/key.c  | 1 +
 drivers/staging/vt6656/key.h  | 1 +
 drivers/staging/vt6656/mac.c  | 1 +
 drivers/staging/vt6656/mac.h  | 1 +
 drivers/staging/vt6656/main_usb.c | 1 +
 drivers/staging/vt6656/power.c| 1 +
 drivers/staging/vt6656/power.h| 1 +
 drivers/staging/vt6656/rf.c   | 1 +
 drivers/staging/vt6656/rf.h   | 1 +
 drivers/staging/vt6656/rxtx.c | 1 +
 drivers/staging/vt6656/rxtx.h | 1 +
 drivers/staging/vt6656/usbpipe.c  | 1 +
 drivers/staging/vt6656/usbpipe.h  | 1 +
 drivers/staging/vt6656/wcmd.c | 1 +
 drivers/staging/vt6656/wcmd.h | 1 +
 29 files changed, 29 insertions(+)

diff --git a/drivers/staging/vt6656/baseband.c 
b/drivers/staging/vt6656/baseband.c
index 882fe54ce41d..eefe4ed5d026 100644
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6656/baseband.h 
b/drivers/staging/vt6656/baseband.h
index fe1c25c64cca..3ec69050b9a1 100644
--- a/drivers/staging/vt6656/baseband.h
+++ b/drivers/staging/vt6656/baseband.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 4fd9cd64c6e8..fe12c9505eb1 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index 7f08cda27e2c..fa65db740e80 100644
--- a/drivers/staging/vt6656/card.h
+++ b/drivers/staging/vt6656/card.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6656/channel.c b/drivers/staging/vt6656/channel.c
index a4299f405d7f..403bd0b86aa6 100644
--- a/drivers/staging/vt6656/channel.c
+++ b/drivers/staging/vt6656/channel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6656/channel.h b/drivers/staging/vt6656/channel.h
index 62f18a959098..43f9452c32a6 100644
--- a/drivers/staging/vt6656/channel.h
+++ b/drivers/staging/vt6656/channel.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6656/desc.h b/drivers/staging/vt6656/desc.h
index 59e3071021bd..8dbf005db134 100644
--- a/drivers/staging/vt6656/desc.h
+++ b/drivers/staging/vt6656/desc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 74715c854856..8d19ec3ac692 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
index 655f0002f880..4299a32bfeb2 100644
--- a/drivers/staging/vt6656/dpc.c
+++ b/drivers/staging/vt6656/dpc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git 

[PATCH 6/9] staging: android: add SPDX identifiers to all android driver files

[Greg Kroah-Hartman]

It's good to have SPDX identifiers in all files to make it easier to
audit the kernel tree for correct licenses.

Update the android driver files with the correct SPDX license identifier
based on the license text in the file itself.  The SPDX identifier is a
legally binding shorthand, which can be used instead of the full boiler
plate text.

This work is based on a script and data from Thomas Gleixner, Philippe
Ombredanne, and Kate Stewart.

Cc: "Arve Hjønnevåg" 
Cc: Riley Andrews 
Cc: Laura Abbott 
Cc: Sumit Semwal 
Cc: Thomas Gleixner 
Cc: Kate Stewart 
Cc: Philippe Ombredanne 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/android/ashmem.c| 1 +
 drivers/staging/android/ashmem.h| 1 +
 drivers/staging/android/ion/ion-ioctl.c | 1 +
 drivers/staging/android/ion/ion.c   | 1 +
 drivers/staging/android/ion/ion.h   | 1 +
 drivers/staging/android/ion/ion_carveout_heap.c | 1 +
 drivers/staging/android/ion/ion_chunk_heap.c| 1 +
 drivers/staging/android/ion/ion_cma_heap.c  | 1 +
 drivers/staging/android/ion/ion_heap.c  | 1 +
 drivers/staging/android/ion/ion_page_pool.c | 1 +
 drivers/staging/android/ion/ion_system_heap.c   | 1 +
 drivers/staging/android/uapi/ashmem.h   | 1 +
 drivers/staging/android/uapi/ion.h  | 1 +
 13 files changed, 13 insertions(+)

diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index 0f695df14c9d..24298077a3ba 100644
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* mm/ashmem.c
  *
  * Anonymous Shared Memory Subsystem, ashmem
diff --git a/drivers/staging/android/ashmem.h b/drivers/staging/android/ashmem.h
index 5abcfd7aa706..60d7208f110a 100644
--- a/drivers/staging/android/ashmem.h
+++ b/drivers/staging/android/ashmem.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR Apache-2.0)
 /*
  * include/linux/ashmem.h
  *
diff --git a/drivers/staging/android/ion/ion-ioctl.c 
b/drivers/staging/android/ion/ion-ioctl.c
index c78989351f9c..4eda17713d82 100644
--- a/drivers/staging/android/ion/ion-ioctl.c
+++ b/drivers/staging/android/ion/ion-ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *
  * Copyright (C) 2011 Google, Inc.
diff --git a/drivers/staging/android/ion/ion.c 
b/drivers/staging/android/ion/ion.c
index a7d9b0e98572..eac43db27b60 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *
  * drivers/staging/android/ion/ion.c
diff --git a/drivers/staging/android/ion/ion.h 
b/drivers/staging/android/ion/ion.h
index f5f9cd63f8e9..3e9327625426 100644
--- a/drivers/staging/android/ion/ion.h
+++ b/drivers/staging/android/ion/ion.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/staging/android/ion/ion.h
  *
diff --git a/drivers/staging/android/ion/ion_carveout_heap.c 
b/drivers/staging/android/ion/ion_carveout_heap.c
index fee7650d6fbb..ff1345d81564 100644
--- a/drivers/staging/android/ion/ion_carveout_heap.c
+++ b/drivers/staging/android/ion/ion_carveout_heap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/staging/android/ion/ion_carveout_heap.c
  *
diff --git a/drivers/staging/android/ion/ion_chunk_heap.c 
b/drivers/staging/android/ion/ion_chunk_heap.c
index 102c09398317..b23694f6bf7f 100644
--- a/drivers/staging/android/ion/ion_chunk_heap.c
+++ b/drivers/staging/android/ion/ion_chunk_heap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/staging/android/ion/ion_chunk_heap.c
  *
diff --git a/drivers/staging/android/ion/ion_cma_heap.c 
b/drivers/staging/android/ion/ion_cma_heap.c
index dd5545d9990a..6f6b1e208ec5 100644
--- a/drivers/staging/android/ion/ion_cma_heap.c
+++ b/drivers/staging/android/ion/ion_cma_heap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/staging/android/ion/ion_cma_heap.c
  *
diff --git a/drivers/staging/android/ion/ion_heap.c 
b/drivers/staging/android/ion/ion_heap.c
index 91faa7f035b9..97344eba611c 100644
--- a/drivers/staging/android/ion/ion_heap.c
+++ b/drivers/staging/android/ion/ion_heap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/staging/android/ion/ion_heap.c
  *
diff --git a/drivers/staging/android/ion/ion_page_pool.c 
b/drivers/staging/android/ion/ion_page_pool.c
index 817849df9de3..4c63e8f25b3f 100644
--- a/drivers/staging/android/ion/ion_page_pool.c
+++ b/drivers/staging/android/ion/ion_page_pool.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/staging/android/ion/ion_mem_pool.c
  *
diff --git a/drivers/staging/android/ion/ion_system_heap.c 
b/drivers/staging/android/ion/ion_system_heap.c
index 

[PATCH 2/9] staging: wilc1000: add SPDX identifiers to all wilc100 files

[Greg Kroah-Hartman]

It's good to have SPDX identifiers in all files to make it easier to
audit the kernel tree for correct licenses.

Update the wilc100 driver files with the correct SPDX license identifier
based on the license text in the file itself.  The SPDX identifier is a
legally binding shorthand, which can be used instead of the full boiler
plate text.

This work is based on a script and data from Thomas Gleixner, Philippe
Ombredanne, and Kate Stewart.

Cc: Aditya Shankar 
Cc: Ganesh Krishna 
Cc: Thomas Gleixner 
Cc: Kate Stewart 
Cc: Philippe Ombredanne 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/wilc1000/linux_wlan.c   | 1 +
 drivers/staging/wilc1000/wilc_debugfs.c | 1 +
 drivers/staging/wilc1000/wilc_sdio.c| 1 +
 drivers/staging/wilc1000/wilc_spi.c | 1 +
 drivers/staging/wilc1000/wilc_wlan.c| 1 +
 5 files changed, 5 insertions(+)

diff --git a/drivers/staging/wilc1000/linux_wlan.c 
b/drivers/staging/wilc1000/linux_wlan.c
index 119f3459b5bb..da1fe4390707 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "wilc_wfi_cfgoperations.h"
 #include "wilc_wlan_if.h"
 #include "wilc_wlan.h"
diff --git a/drivers/staging/wilc1000/wilc_debugfs.c 
b/drivers/staging/wilc1000/wilc_debugfs.c
index ce54864569c7..0deb61a21b27 100644
--- a/drivers/staging/wilc1000/wilc_debugfs.c
+++ b/drivers/staging/wilc1000/wilc_debugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NewportMedia WiFi chipset driver test tools - wilc-debug
  * Copyright (c) 2012 NewportMedia Inc.
diff --git a/drivers/staging/wilc1000/wilc_sdio.c 
b/drivers/staging/wilc1000/wilc_sdio.c
index 0189e3edbbbe..bd2b29b8b356 100644
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) Atmel Corporation.  All rights reserved.
  *
diff --git a/drivers/staging/wilc1000/wilc_spi.c 
b/drivers/staging/wilc1000/wilc_spi.c
index 5ef84410e0f2..ff2ba1057cdf 100644
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) Atmel Corporation.  All rights reserved.
  *
diff --git a/drivers/staging/wilc1000/wilc_wlan.c 
b/drivers/staging/wilc1000/wilc_wlan.c
index f49dfa82f1b8..999fd09ad1cd 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include 
 #include "wilc_wlan_if.h"
 #include "wilc_wlan.h"
-- 
2.15.0

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

[PATCH 5/9] staging: vt6655: add SPDX identifiers to all vt6655 driver files

[Greg Kroah-Hartman]

It's good to have SPDX identifiers in all files to make it easier to
audit the kernel tree for correct licenses.

Update the vt6655 driver files with the correct SPDX license identifier
based on the license text in the file itself.  The SPDX identifier is a
legally binding shorthand, which can be used instead of the full boiler
plate text.

This work is based on a script and data from Thomas Gleixner, Philippe
Ombredanne, and Kate Stewart.

Cc: Forest Bond 
Cc: Thomas Gleixner 
Cc: Kate Stewart 
Cc: Philippe Ombredanne 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/vt6655/baseband.c| 1 +
 drivers/staging/vt6655/baseband.h| 1 +
 drivers/staging/vt6655/card.c| 1 +
 drivers/staging/vt6655/card.h| 1 +
 drivers/staging/vt6655/channel.c | 1 +
 drivers/staging/vt6655/channel.h | 1 +
 drivers/staging/vt6655/desc.h| 1 +
 drivers/staging/vt6655/device.h  | 1 +
 drivers/staging/vt6655/device_cfg.h  | 1 +
 drivers/staging/vt6655/device_main.c | 1 +
 drivers/staging/vt6655/dpc.c | 1 +
 drivers/staging/vt6655/dpc.h | 1 +
 drivers/staging/vt6655/key.c | 1 +
 drivers/staging/vt6655/key.h | 1 +
 drivers/staging/vt6655/mac.c | 1 +
 drivers/staging/vt6655/mac.h | 1 +
 drivers/staging/vt6655/power.c   | 1 +
 drivers/staging/vt6655/power.h   | 1 +
 drivers/staging/vt6655/rf.c  | 1 +
 drivers/staging/vt6655/rf.h  | 1 +
 drivers/staging/vt6655/rxtx.c| 1 +
 drivers/staging/vt6655/rxtx.h| 1 +
 drivers/staging/vt6655/srom.c| 1 +
 drivers/staging/vt6655/srom.h| 1 +
 drivers/staging/vt6655/tmacro.h  | 1 +
 drivers/staging/vt6655/upc.h | 1 +
 26 files changed, 26 insertions(+)

diff --git a/drivers/staging/vt6655/baseband.c 
b/drivers/staging/vt6655/baseband.c
index 44dfa5421374..fa7ab1969fd5 100644
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6655/baseband.h 
b/drivers/staging/vt6655/baseband.h
index feaf222574ee..1416c6d726d6 100644
--- a/drivers/staging/vt6655/baseband.h
+++ b/drivers/staging/vt6655/baseband.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 14034e342aa6..a83218fa5aae 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h
index 1a04dbb57d42..8bdf8ddf7486 100644
--- a/drivers/staging/vt6655/card.h
+++ b/drivers/staging/vt6655/card.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c
index ab89956511a0..f41f71d57d0d 100644
--- a/drivers/staging/vt6655/channel.c
+++ b/drivers/staging/vt6655/channel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6655/channel.h b/drivers/staging/vt6655/channel.h
index 8fe70760e548..73617ad0579d 100644
--- a/drivers/staging/vt6655/channel.h
+++ b/drivers/staging/vt6655/channel.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h
index 2fee6e759ad8..417411b64ecf 100644
--- a/drivers/staging/vt6655/desc.h
+++ b/drivers/staging/vt6655/desc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 3ae40d846a09..f87413195285 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git a/drivers/staging/vt6655/device_cfg.h 
b/drivers/staging/vt6655/device_cfg.h
index 0298ea923f97..cc48bd9ce2a5 100644
--- a/drivers/staging/vt6655/device_cfg.h
+++ b/drivers/staging/vt6655/device_cfg.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
  * All rights reserved.
diff --git 

[PATCH 1/9] staging: xgifb: add SPDX identifiers to the remaining holdout file

[Greg Kroah-Hartman]

It's good to have SPDX identifiers in all files to make it easier to
audit the kernel tree for correct licenses.

Update the xgifb/XGI_main_26.c file with the correct SPDX license
identifier based on the license text in the file itself.  The SPDX
identifier is a legally binding shorthand, which can be used instead of
the full boiler plate text.

This work is based on a script and data from Thomas Gleixner, Philippe
Ombredanne, and Kate Stewart.

Cc: Arnaud Patard 
Cc: Thomas Gleixner 
Cc: Kate Stewart 
Cc: Philippe Ombredanne 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/xgifb/XGI_main_26.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/xgifb/XGI_main_26.c 
b/drivers/staging/xgifb/XGI_main_26.c
index b813f1d460ce..6feecc55d2bc 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * XG20, XG21, XG40, XG42 frame buffer device
  * for Linux kernels  2.5.x, 2.6.x
-- 
2.15.0

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

[PATCH 3/9] staging: wlan-ng: add SPDX identifiers to all wlan-ng driver files

[Greg Kroah-Hartman]

It's good to have SPDX identifiers in all files to make it easier to
audit the kernel tree for correct licenses.

Update the wlan-ng driver files with the correct SPDX license identifier
based on the license text in the file itself.  The SPDX identifier is a
legally binding shorthand, which can be used instead of the full boiler
plate text.

This work is based on a script and data from Thomas Gleixner, Philippe
Ombredanne, and Kate Stewart.

Cc: Thomas Gleixner 
Cc: Kate Stewart 
Cc: Philippe Ombredanne 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/wlan-ng/hfa384x.h  | 1 +
 drivers/staging/wlan-ng/hfa384x_usb.c  | 1 +
 drivers/staging/wlan-ng/p80211conv.c   | 1 +
 drivers/staging/wlan-ng/p80211conv.h   | 1 +
 drivers/staging/wlan-ng/p80211hdr.h| 1 +
 drivers/staging/wlan-ng/p80211ioctl.h  | 1 +
 drivers/staging/wlan-ng/p80211metadef.h| 1 +
 drivers/staging/wlan-ng/p80211metastruct.h | 1 +
 drivers/staging/wlan-ng/p80211mgmt.h   | 1 +
 drivers/staging/wlan-ng/p80211msg.h| 1 +
 drivers/staging/wlan-ng/p80211netdev.c | 1 +
 drivers/staging/wlan-ng/p80211netdev.h | 1 +
 drivers/staging/wlan-ng/p80211req.c| 1 +
 drivers/staging/wlan-ng/p80211req.h| 1 +
 drivers/staging/wlan-ng/p80211types.h  | 1 +
 drivers/staging/wlan-ng/p80211wep.c| 1 +
 drivers/staging/wlan-ng/prism2fw.c | 1 +
 drivers/staging/wlan-ng/prism2mgmt.c   | 1 +
 drivers/staging/wlan-ng/prism2mgmt.h   | 1 +
 drivers/staging/wlan-ng/prism2mib.c| 1 +
 drivers/staging/wlan-ng/prism2sta.c| 1 +
 21 files changed, 21 insertions(+)

diff --git a/drivers/staging/wlan-ng/hfa384x.h 
b/drivers/staging/wlan-ng/hfa384x.h
index f5a3a1ce21ce..85c3af00abd2 100644
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1)
 /* hfa384x.h
  *
  * Defines the constants and data structures for the hfa384x
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c 
b/drivers/staging/wlan-ng/hfa384x_usb.c
index 5975d47dfa71..74dc37cff03f 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1)
 /* src/prism2/driver/hfa384x_usb.c
  *
  * Functions that talk to the USB variantof the Intersil hfa384x MAC
diff --git a/drivers/staging/wlan-ng/p80211conv.c 
b/drivers/staging/wlan-ng/p80211conv.c
index c1b6d426bcad..855b424f6423 100644
--- a/drivers/staging/wlan-ng/p80211conv.c
+++ b/drivers/staging/wlan-ng/p80211conv.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1)
 /* src/p80211/p80211conv.c
  *
  * Ether/802.11 conversions and packet buffer routines
diff --git a/drivers/staging/wlan-ng/p80211conv.h 
b/drivers/staging/wlan-ng/p80211conv.h
index 66332b1fb6d5..28459dcea4b1 100644
--- a/drivers/staging/wlan-ng/p80211conv.h
+++ b/drivers/staging/wlan-ng/p80211conv.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1)
 /* p80211conv.h
  *
  * Ether/802.11 conversions and packet buffer routines
diff --git a/drivers/staging/wlan-ng/p80211hdr.h 
b/drivers/staging/wlan-ng/p80211hdr.h
index 2c44c613a586..133d70c08ecf 100644
--- a/drivers/staging/wlan-ng/p80211hdr.h
+++ b/drivers/staging/wlan-ng/p80211hdr.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1)
 /* p80211hdr.h
  *
  * Macros, types, and functions for handling 802.11 MAC headers
diff --git a/drivers/staging/wlan-ng/p80211ioctl.h 
b/drivers/staging/wlan-ng/p80211ioctl.h
index ab6067e65050..d8cde1d8870b 100644
--- a/drivers/staging/wlan-ng/p80211ioctl.h
+++ b/drivers/staging/wlan-ng/p80211ioctl.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1)
 /* p80211ioctl.h
  *
  * Declares constants and types for the p80211 ioctls
diff --git a/drivers/staging/wlan-ng/p80211metadef.h 
b/drivers/staging/wlan-ng/p80211metadef.h
index ea3d9ce222b9..4ac2f08a520a 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1)
 /* This file is GENERATED AUTOMATICALLY.  DO NOT EDIT OR MODIFY.
  * 
  *
diff --git a/drivers/staging/wlan-ng/p80211metastruct.h 
b/drivers/staging/wlan-ng/p80211metastruct.h
index 850d897fc163..15b7c08e210d 100644
--- a/drivers/staging/wlan-ng/p80211metastruct.h
+++ b/drivers/staging/wlan-ng/p80211metastruct.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1)
 /* This file is GENERATED AUTOMATICALLY.  DO NOT EDIT OR MODIFY.
 * 
 *
diff --git a/drivers/staging/wlan-ng/p80211mgmt.h 
b/drivers/staging/wlan-ng/p80211mgmt.h
index 653950fd9843..3c12929858cb 100644
--- a/drivers/staging/wlan-ng/p80211mgmt.h
+++ 

[PATCH] staging: rtl8712: remove redundant zero assignment to val32

[Colin King]

From: Colin Ian King 

Variable val32 is being assigned a zero value that is never read
since val32 is being updated immediately afterwards.  Remove this
redundant assignment, cleans up clang warning:

drivers/staging/rtl8712/hal_init.c:339:2: warning: Value stored
to 'val32' is never read

Signed-off-by: Colin Ian King 
---
 drivers/staging/rtl8712/hal_init.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/staging/rtl8712/hal_init.c 
b/drivers/staging/rtl8712/hal_init.c
index de832b0b5eec..2a3f0746ee2c 100644
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -336,7 +336,6 @@ uint rtl8712_hal_init(struct _adapter *padapter)
r8712_read32(padapter, RCR));
val32 = r8712_read32(padapter, RCR);
r8712_write32(padapter, RCR, (val32 | BIT(25))); /* Append PHY status */
-   val32 = 0;
val32 = r8712_read32(padapter, 0x10250040);
r8712_write32(padapter,  0x10250040, (val32 & 0x00FF));
/* for usb rx aggregation */
-- 
2.14.1

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

[PATCH] staging: comedi: usbdux: remove redundant initialization of val

[Colin King]

From: Colin Ian King 

The early initialization of val is redundant as the value is never
read and is updated inside a for-loop. Remove the initialization
and move the declaration and initialization to the for-loop scope.
Cleans up clang warning:

drivers/staging/comedi/drivers/usbdux.c:812:15: warning: Value stored
to 'val' during its initialization is never read

Signed-off-by: Colin Ian King 
---
 drivers/staging/comedi/drivers/usbdux.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/usbdux.c 
b/drivers/staging/comedi/drivers/usbdux.c
index f4f05d29d30d..ede064b47aac 100644
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -809,7 +809,6 @@ static int usbdux_ao_insn_write(struct comedi_device *dev,
 {
struct usbdux_private *devpriv = dev->private;
unsigned int chan = CR_CHAN(insn->chanspec);
-   unsigned int val = s->readback[chan];
__le16 *p = (__le16 *)>dux_commands[2];
int ret = -EBUSY;
int i;
@@ -825,7 +824,7 @@ static int usbdux_ao_insn_write(struct comedi_device *dev,
devpriv->dux_commands[4] = chan << 6;
 
for (i = 0; i < insn->n; i++) {
-   val = data[i];
+   unsigned int val = data[i];
 
/* one 16 bit value */
*p = cpu_to_le16(val);
-- 
2.14.1

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

[PATCH] staging: dgnc: Fix usleep_range is preferred over udelay

[Joshua Abraham]

This patch fixes the issue:

CHECK: usleep_range is preferred over udelay; see
Documentation/timers/timers-howto.txt

Signed-off-by: Joshua Abraham 
---
 drivers/staging/dgnc/dgnc_cls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/dgnc/dgnc_cls.c b/drivers/staging/dgnc/dgnc_cls.c
index 9639035..e264fe1 100644
--- a/drivers/staging/dgnc/dgnc_cls.c
+++ b/drivers/staging/dgnc/dgnc_cls.c
@@ -397,7 +397,7 @@ static void cls_assert_modem_signals(struct channel_t *ch)
writeb(out, >ch_cls_uart->mcr);
 
/* Give time for the UART to actually drop the signals */
-   udelay(10);
+   usleep_range(10, 20);
 }
 
 static void cls_copy_data_from_queue_to_uart(struct channel_t *ch)
-- 
2.7.4

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

Re: [PATCH 02/11] staging: greybus: Remove redundant license text

[Johan Hovold]

On Tue, Nov 07, 2017 at 02:58:42PM +0100, Greg Kroah-Hartman wrote:
> Now that the SPDX tag is in all greybus files, that identifies the
> license in a specific and legally-defined manner.  So the extra GPL text
> wording can be removed as it is no longer needed at all.
> 
> This is done on a quest to remove the 700+ different ways that files in
> the kernel describe the GPL license text.  And there's unneeded stuff
> like the address (sometimes incorrect) for the FSF which is never
> needed.
> 
> No copyright headers or other non-license-description text was removed.
> 
> Cc: Vaibhav Hiremath 
> Cc: Johan Hovold 
> Cc: Alex Elder 
> Cc: Greg Kroah-Hartman 
> Cc: Vaibhav Agarwal 
> Cc: Mark Greer 
> Cc: Viresh Kumar 
> Cc: Rui Miguel Silva 
> Cc: David Lin 
> Cc: "Bryan O'Donoghue" 
> Signed-off-by: Greg Kroah-Hartman 

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

Re: [PATCH 01/11] staging: greybus: add SPDX identifiers to all greybus driver files

[Johan Hovold]

On Tue, Nov 07, 2017 at 02:58:41PM +0100, Greg Kroah-Hartman wrote:
> It's good to have SPDX identifiers in all files to make it easier to
> audit the kernel tree for correct licenses.
> 
> Update the drivers/staging/greybus files files with the correct SPDX
> license identifier based on the license text in the file itself.  The
> SPDX identifier is a legally binding shorthand, which can be used
> instead of the full boiler plate text.
> 
> This work is based on a script and data from Thomas Gleixner, Philippe
> Ombredanne, and Kate Stewart.
> 
> Cc: Johan Hovold 
> Cc: Alex Elder 
> Cc: Greg Kroah-Hartman 
> Cc: Vaibhav Hiremath 
> Cc: Vaibhav Agarwal 
> Cc: Mark Greer 
> Cc: Viresh Kumar 
> Cc: Rui Miguel Silva 
> Cc: David Lin 
> Cc: "Bryan O'Donoghue" 
> Cc: Thomas Gleixner 
> Cc: Kate Stewart 
> Cc: Philippe Ombredanne 
> Signed-off-by: Greg Kroah-Hartman 

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

Re: [PATCH 02/11] staging: greybus: Remove redundant license text

[Rui Miguel Silva]

Hi Greg,
On Tue 07 Nov 2017 at 13:58, Greg Kroah-Hartman 
wrote:
> Now that the SPDX tag is in all greybus files, that identifies the
> license in a specific and legally-defined manner.  So the extra GPL text
> wording can be removed as it is no longer needed at all.
>
> This is done on a quest to remove the 700+ different ways that files in
> the kernel describe the GPL license text.  And there's unneeded stuff
> like the address (sometimes incorrect) for the FSF which is never
> needed.
>
> No copyright headers or other non-license-description text was removed.
>
> Cc: Vaibhav Hiremath 
> Cc: Johan Hovold 
> Cc: Alex Elder 
> Cc: Greg Kroah-Hartman 
> Cc: Vaibhav Agarwal 
> Cc: Mark Greer 
> Cc: Viresh Kumar 
> Cc: Rui Miguel Silva 
> Cc: David Lin 
> Cc: "Bryan O'Donoghue" 
> Signed-off-by: Greg Kroah-Hartman 
> ---

Acked-by: Rui Miguel Silva 

Cheers,
Rui

>  drivers/staging/greybus/arche-apb-ctrl.c| 2 --
>  drivers/staging/greybus/arche-platform.c| 2 --
>  drivers/staging/greybus/arche_platform.h| 2 --
>  drivers/staging/greybus/audio_apbridgea.c   | 2 --
>  drivers/staging/greybus/audio_codec.c   | 2 --
>  drivers/staging/greybus/audio_codec.h   | 2 --
>  drivers/staging/greybus/audio_gb.c  | 2 --
>  drivers/staging/greybus/audio_manager.c | 2 --
>  drivers/staging/greybus/audio_manager.h | 2 --
>  drivers/staging/greybus/audio_manager_module.c  | 2 --
>  drivers/staging/greybus/audio_manager_private.h | 2 --
>  drivers/staging/greybus/audio_manager_sysfs.c   | 2 --
>  drivers/staging/greybus/audio_module.c  | 2 --
>  drivers/staging/greybus/audio_topology.c| 2 --
>  drivers/staging/greybus/authentication.c| 2 --
>  drivers/staging/greybus/bootrom.c   | 2 --
>  drivers/staging/greybus/bundle.c| 2 --
>  drivers/staging/greybus/bundle.h| 2 --
>  drivers/staging/greybus/camera.c| 2 --
>  drivers/staging/greybus/connection.c| 2 --
>  drivers/staging/greybus/connection.h| 2 --
>  drivers/staging/greybus/control.c   | 2 --
>  drivers/staging/greybus/control.h   | 2 --
>  drivers/staging/greybus/core.c  | 2 --
>  drivers/staging/greybus/debugfs.c   | 2 --
>  drivers/staging/greybus/es2.c   | 2 --
>  drivers/staging/greybus/firmware.h  | 2 --
>  drivers/staging/greybus/fw-core.c   | 2 --
>  drivers/staging/greybus/fw-download.c   | 2 --
>  drivers/staging/greybus/fw-management.c | 2 --
>  drivers/staging/greybus/gb-camera.h | 2 --
>  drivers/staging/greybus/gbphy.c | 2 --
>  drivers/staging/greybus/gbphy.h | 2 --
>  drivers/staging/greybus/gpio.c  | 2 --
>  drivers/staging/greybus/greybus.h   | 2 --
>  drivers/staging/greybus/greybus_trace.h | 2 --
>  drivers/staging/greybus/hd.c| 2 --
>  drivers/staging/greybus/hd.h| 2 --
>  drivers/staging/greybus/hid.c   | 2 --
>  drivers/staging/greybus/i2c.c   | 2 --
>  drivers/staging/greybus/interface.c | 2 --
>  drivers/staging/greybus/interface.h | 2 --
>  drivers/staging/greybus/light.c | 2 --
>  drivers/staging/greybus/log.c   | 2 --
>  drivers/staging/greybus/loopback.c  | 2 --
>  drivers/staging/greybus/manifest.c  | 2 --
>  drivers/staging/greybus/manifest.h  | 2 --
>  drivers/staging/greybus/module.c| 2 --
>  drivers/staging/greybus/module.h| 2 --
>  drivers/staging/greybus/operation.c | 2 --
>  drivers/staging/greybus/operation.h | 2 --
>  drivers/staging/greybus/power_supply.c  | 2 --
>  drivers/staging/greybus/pwm.c   | 2 --
>  drivers/staging/greybus/raw.c   | 2 --
>  drivers/staging/greybus/sdio.c  | 2 --
>  drivers/staging/greybus/spi.c   | 2 --
>  drivers/staging/greybus/spilib.c| 2 --
>  drivers/staging/greybus/svc.c   | 2 --
>  drivers/staging/greybus/svc.h   | 2 --
>  drivers/staging/greybus/svc_watchdog.c  | 2 --
>  drivers/staging/greybus/uart.c  | 2 --
>  drivers/staging/greybus/usb.c   | 3 ---
>  drivers/staging/greybus/vibrator.c  | 2 --
>  63 files changed, 127 deletions(-)
>
> diff --git a/drivers/staging/greybus/arche-apb-ctrl.c 
> b/drivers/staging/greybus/arche-apb-ctrl.c
> index 

Re: [PATCH 01/11] staging: greybus: add SPDX identifiers to all greybus driver files

[Rui Miguel Silva]

Hi Greg,
On Tue 07 Nov 2017 at 13:58, Greg Kroah-Hartman 
wrote:
> It's good to have SPDX identifiers in all files to make it easier to
> audit the kernel tree for correct licenses.
>
> Update the drivers/staging/greybus files files with the correct SPDX
> license identifier based on the license text in the file itself.  The
> SPDX identifier is a legally binding shorthand, which can be used
> instead of the full boiler plate text.
>
> This work is based on a script and data from Thomas Gleixner, Philippe
> Ombredanne, and Kate Stewart.
>
> Cc: Johan Hovold 
> Cc: Alex Elder 
> Cc: Greg Kroah-Hartman 
> Cc: Vaibhav Hiremath 
> Cc: Vaibhav Agarwal 
> Cc: Mark Greer 
> Cc: Viresh Kumar 
> Cc: Rui Miguel Silva 
> Cc: David Lin 
> Cc: "Bryan O'Donoghue" 
> Cc: Thomas Gleixner 
> Cc: Kate Stewart 
> Cc: Philippe Ombredanne 
> Signed-off-by: Greg Kroah-Hartman 
> ---

Acked-by: Rui Miguel Silva 

Cheers,
Rui

>  drivers/staging/greybus/Documentation/firmware/authenticate.c | 1 +
>  drivers/staging/greybus/Documentation/firmware/firmware.c | 1 +
>  drivers/staging/greybus/arche-apb-ctrl.c  | 1 +
>  drivers/staging/greybus/arche-platform.c  | 1 +
>  drivers/staging/greybus/arche_platform.h  | 1 +
>  drivers/staging/greybus/arpc.h| 1 +
>  drivers/staging/greybus/audio_apbridgea.c | 1 +
>  drivers/staging/greybus/audio_apbridgea.h | 1 +
>  drivers/staging/greybus/audio_codec.c | 1 +
>  drivers/staging/greybus/audio_codec.h | 1 +
>  drivers/staging/greybus/audio_gb.c| 1 +
>  drivers/staging/greybus/audio_manager.c   | 1 +
>  drivers/staging/greybus/audio_manager.h   | 1 +
>  drivers/staging/greybus/audio_manager_module.c| 1 +
>  drivers/staging/greybus/audio_manager_private.h   | 1 +
>  drivers/staging/greybus/audio_manager_sysfs.c | 1 +
>  drivers/staging/greybus/audio_module.c| 1 +
>  drivers/staging/greybus/audio_topology.c  | 1 +
>  drivers/staging/greybus/authentication.c  | 1 +
>  drivers/staging/greybus/bootrom.c | 1 +
>  drivers/staging/greybus/bundle.c  | 1 +
>  drivers/staging/greybus/bundle.h  | 1 +
>  drivers/staging/greybus/camera.c  | 1 +
>  drivers/staging/greybus/connection.c  | 1 +
>  drivers/staging/greybus/connection.h  | 1 +
>  drivers/staging/greybus/control.c | 1 +
>  drivers/staging/greybus/control.h | 1 +
>  drivers/staging/greybus/core.c| 1 +
>  drivers/staging/greybus/debugfs.c | 1 +
>  drivers/staging/greybus/es2.c | 1 +
>  drivers/staging/greybus/firmware.h| 1 +
>  drivers/staging/greybus/fw-core.c | 1 +
>  drivers/staging/greybus/fw-download.c | 1 +
>  drivers/staging/greybus/fw-management.c   | 1 +
>  drivers/staging/greybus/gb-camera.h   | 1 +
>  drivers/staging/greybus/gbphy.c   | 1 +
>  drivers/staging/greybus/gbphy.h   | 1 +
>  drivers/staging/greybus/gpio.c| 1 +
>  drivers/staging/greybus/greybus.h | 1 +
>  drivers/staging/greybus/greybus_authentication.h  | 1 +
>  drivers/staging/greybus/greybus_firmware.h| 1 +
>  drivers/staging/greybus/greybus_manifest.h| 1 +
>  drivers/staging/greybus/greybus_protocols.h   | 1 +
>  drivers/staging/greybus/greybus_trace.h   | 1 +
>  drivers/staging/greybus/hd.c  | 1 +
>  drivers/staging/greybus/hd.h  | 1 +
>  drivers/staging/greybus/hid.c | 1 +
>  drivers/staging/greybus/i2c.c | 1 +
>  drivers/staging/greybus/interface.c   | 1 +
>  drivers/staging/greybus/interface.h   | 1 +
>  drivers/staging/greybus/light.c   | 1 +
>  drivers/staging/greybus/log.c | 1 +
>  

Re: [PATCH 01/11] staging: greybus: add SPDX identifiers to all greybus driver files

[Alex Elder]

On 11/07/2017 08:47 AM, Greg Kroah-Hartman wrote:
> On Tue, Nov 07, 2017 at 08:42:07AM -0600, Alex Elder wrote:
>> On 11/07/2017 07:58 AM, Greg Kroah-Hartman wrote:
>>> It's good to have SPDX identifiers in all files to make it easier to
>>> audit the kernel tree for correct licenses.
>>>
>>> Update the drivers/staging/greybus files files with the correct SPDX
>>> license identifier based on the license text in the file itself.  The
>>> SPDX identifier is a legally binding shorthand, which can be used
>>> instead of the full boiler plate text.
>>>
>>> This work is based on a script and data from Thomas Gleixner, Philippe
>>> Ombredanne, and Kate Stewart.
>>
>> Looks good.  Except...  Why the C++ style comment?  (Use /* */ not //?)
> 
> That's the "style" that Linus wanted, it stands out, right?  :)

Yes it does.  I'm very happy to see SPDX getting deployed.  -Alex

> 
> thanks for the review.
> 
> greg k-h
> 

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

Re: [PATCH 02/11] staging: greybus: Remove redundant license text

[Alex Elder]

On 11/07/2017 07:58 AM, Greg Kroah-Hartman wrote:
> Now that the SPDX tag is in all greybus files, that identifies the
> license in a specific and legally-defined manner.  So the extra GPL text
> wording can be removed as it is no longer needed at all.
> 
> This is done on a quest to remove the 700+ different ways that files in
> the kernel describe the GPL license text.  And there's unneeded stuff
> like the address (sometimes incorrect) for the FSF which is never
> needed.
> 
> No copyright headers or other non-license-description text was removed.

Awesome.

Reviewed-by: Alex Elder 

> 
> Cc: Vaibhav Hiremath 
> Cc: Johan Hovold 
> Cc: Alex Elder 
> Cc: Greg Kroah-Hartman 
> Cc: Vaibhav Agarwal 
> Cc: Mark Greer 
> Cc: Viresh Kumar 
> Cc: Rui Miguel Silva 
> Cc: David Lin 
> Cc: "Bryan O'Donoghue" 
> Signed-off-by: Greg Kroah-Hartman 
> ---
>  drivers/staging/greybus/arche-apb-ctrl.c| 2 --
>  drivers/staging/greybus/arche-platform.c| 2 --
>  drivers/staging/greybus/arche_platform.h| 2 --
>  drivers/staging/greybus/audio_apbridgea.c   | 2 --
>  drivers/staging/greybus/audio_codec.c   | 2 --
>  drivers/staging/greybus/audio_codec.h   | 2 --
>  drivers/staging/greybus/audio_gb.c  | 2 --
>  drivers/staging/greybus/audio_manager.c | 2 --
>  drivers/staging/greybus/audio_manager.h | 2 --
>  drivers/staging/greybus/audio_manager_module.c  | 2 --
>  drivers/staging/greybus/audio_manager_private.h | 2 --
>  drivers/staging/greybus/audio_manager_sysfs.c   | 2 --
>  drivers/staging/greybus/audio_module.c  | 2 --
>  drivers/staging/greybus/audio_topology.c| 2 --
>  drivers/staging/greybus/authentication.c| 2 --
>  drivers/staging/greybus/bootrom.c   | 2 --
>  drivers/staging/greybus/bundle.c| 2 --
>  drivers/staging/greybus/bundle.h| 2 --
>  drivers/staging/greybus/camera.c| 2 --
>  drivers/staging/greybus/connection.c| 2 --
>  drivers/staging/greybus/connection.h| 2 --
>  drivers/staging/greybus/control.c   | 2 --
>  drivers/staging/greybus/control.h   | 2 --
>  drivers/staging/greybus/core.c  | 2 --
>  drivers/staging/greybus/debugfs.c   | 2 --
>  drivers/staging/greybus/es2.c   | 2 --
>  drivers/staging/greybus/firmware.h  | 2 --
>  drivers/staging/greybus/fw-core.c   | 2 --
>  drivers/staging/greybus/fw-download.c   | 2 --
>  drivers/staging/greybus/fw-management.c | 2 --
>  drivers/staging/greybus/gb-camera.h | 2 --
>  drivers/staging/greybus/gbphy.c | 2 --
>  drivers/staging/greybus/gbphy.h | 2 --
>  drivers/staging/greybus/gpio.c  | 2 --
>  drivers/staging/greybus/greybus.h   | 2 --
>  drivers/staging/greybus/greybus_trace.h | 2 --
>  drivers/staging/greybus/hd.c| 2 --
>  drivers/staging/greybus/hd.h| 2 --
>  drivers/staging/greybus/hid.c   | 2 --
>  drivers/staging/greybus/i2c.c   | 2 --
>  drivers/staging/greybus/interface.c | 2 --
>  drivers/staging/greybus/interface.h | 2 --
>  drivers/staging/greybus/light.c | 2 --
>  drivers/staging/greybus/log.c   | 2 --
>  drivers/staging/greybus/loopback.c  | 2 --
>  drivers/staging/greybus/manifest.c  | 2 --
>  drivers/staging/greybus/manifest.h  | 2 --
>  drivers/staging/greybus/module.c| 2 --
>  drivers/staging/greybus/module.h| 2 --
>  drivers/staging/greybus/operation.c | 2 --
>  drivers/staging/greybus/operation.h | 2 --
>  drivers/staging/greybus/power_supply.c  | 2 --
>  drivers/staging/greybus/pwm.c   | 2 --
>  drivers/staging/greybus/raw.c   | 2 --
>  drivers/staging/greybus/sdio.c  | 2 --
>  drivers/staging/greybus/spi.c   | 2 --
>  drivers/staging/greybus/spilib.c| 2 --
>  drivers/staging/greybus/svc.c   | 2 --
>  drivers/staging/greybus/svc.h   | 2 --
>  drivers/staging/greybus/svc_watchdog.c  | 2 --
>  drivers/staging/greybus/uart.c  | 2 --
>  drivers/staging/greybus/usb.c   | 3 ---
>  drivers/staging/greybus/vibrator.c  | 2 --
>  63 files changed, 127 deletions(-)
> 
> diff --git a/drivers/staging/greybus/arche-apb-ctrl.c 
> b/drivers/staging/greybus/arche-apb-ctrl.c
> index c6c3d01395ed..b0c66112eb18 100644
> --- 

Re: [PATCH 01/11] staging: greybus: add SPDX identifiers to all greybus driver files

[Alex Elder]

On 11/07/2017 07:58 AM, Greg Kroah-Hartman wrote:
> It's good to have SPDX identifiers in all files to make it easier to
> audit the kernel tree for correct licenses.
> 
> Update the drivers/staging/greybus files files with the correct SPDX
> license identifier based on the license text in the file itself.  The
> SPDX identifier is a legally binding shorthand, which can be used
> instead of the full boiler plate text.
> 
> This work is based on a script and data from Thomas Gleixner, Philippe
> Ombredanne, and Kate Stewart.

Looks good.  Except...  Why the C++ style comment?  (Use /* */ not //?)

Otherwise:

Reviewed-by: Alex Elder 

> 
> Cc: Johan Hovold 
> Cc: Alex Elder 
> Cc: Greg Kroah-Hartman 
> Cc: Vaibhav Hiremath 
> Cc: Vaibhav Agarwal 
> Cc: Mark Greer 
> Cc: Viresh Kumar 
> Cc: Rui Miguel Silva 
> Cc: David Lin 
> Cc: "Bryan O'Donoghue" 
> Cc: Thomas Gleixner 
> Cc: Kate Stewart 
> Cc: Philippe Ombredanne 
> Signed-off-by: Greg Kroah-Hartman 
> ---
>  drivers/staging/greybus/Documentation/firmware/authenticate.c | 1 +
>  drivers/staging/greybus/Documentation/firmware/firmware.c | 1 +
>  drivers/staging/greybus/arche-apb-ctrl.c  | 1 +
>  drivers/staging/greybus/arche-platform.c  | 1 +
>  drivers/staging/greybus/arche_platform.h  | 1 +
>  drivers/staging/greybus/arpc.h| 1 +
>  drivers/staging/greybus/audio_apbridgea.c | 1 +
>  drivers/staging/greybus/audio_apbridgea.h | 1 +
>  drivers/staging/greybus/audio_codec.c | 1 +
>  drivers/staging/greybus/audio_codec.h | 1 +
>  drivers/staging/greybus/audio_gb.c| 1 +
>  drivers/staging/greybus/audio_manager.c   | 1 +
>  drivers/staging/greybus/audio_manager.h   | 1 +
>  drivers/staging/greybus/audio_manager_module.c| 1 +
>  drivers/staging/greybus/audio_manager_private.h   | 1 +
>  drivers/staging/greybus/audio_manager_sysfs.c | 1 +
>  drivers/staging/greybus/audio_module.c| 1 +
>  drivers/staging/greybus/audio_topology.c  | 1 +
>  drivers/staging/greybus/authentication.c  | 1 +
>  drivers/staging/greybus/bootrom.c | 1 +
>  drivers/staging/greybus/bundle.c  | 1 +
>  drivers/staging/greybus/bundle.h  | 1 +
>  drivers/staging/greybus/camera.c  | 1 +
>  drivers/staging/greybus/connection.c  | 1 +
>  drivers/staging/greybus/connection.h  | 1 +
>  drivers/staging/greybus/control.c | 1 +
>  drivers/staging/greybus/control.h | 1 +
>  drivers/staging/greybus/core.c| 1 +
>  drivers/staging/greybus/debugfs.c | 1 +
>  drivers/staging/greybus/es2.c | 1 +
>  drivers/staging/greybus/firmware.h| 1 +
>  drivers/staging/greybus/fw-core.c | 1 +
>  drivers/staging/greybus/fw-download.c | 1 +
>  drivers/staging/greybus/fw-management.c   | 1 +
>  drivers/staging/greybus/gb-camera.h   | 1 +
>  drivers/staging/greybus/gbphy.c   | 1 +
>  drivers/staging/greybus/gbphy.h   | 1 +
>  drivers/staging/greybus/gpio.c| 1 +
>  drivers/staging/greybus/greybus.h | 1 +
>  drivers/staging/greybus/greybus_authentication.h  | 1 +
>  drivers/staging/greybus/greybus_firmware.h| 1 +
>  drivers/staging/greybus/greybus_manifest.h| 1 +
>  drivers/staging/greybus/greybus_protocols.h   | 1 +
>  drivers/staging/greybus/greybus_trace.h   | 1 +
>  drivers/staging/greybus/hd.c  | 1 +
>  drivers/staging/greybus/hd.h  | 1 +
>  drivers/staging/greybus/hid.c | 1 +
>  drivers/staging/greybus/i2c.c | 1 +
>  drivers/staging/greybus/interface.c   | 1 +
>  drivers/staging/greybus/interface.h   | 1 +
>  drivers/staging/greybus/light.c   | 1 +
>  drivers/staging/greybus/log.c

Re: [PATCH 01/11] staging: greybus: add SPDX identifiers to all greybus driver files

[Greg Kroah-Hartman]

On Tue, Nov 07, 2017 at 08:42:07AM -0600, Alex Elder wrote:
> On 11/07/2017 07:58 AM, Greg Kroah-Hartman wrote:
> > It's good to have SPDX identifiers in all files to make it easier to
> > audit the kernel tree for correct licenses.
> > 
> > Update the drivers/staging/greybus files files with the correct SPDX
> > license identifier based on the license text in the file itself.  The
> > SPDX identifier is a legally binding shorthand, which can be used
> > instead of the full boiler plate text.
> > 
> > This work is based on a script and data from Thomas Gleixner, Philippe
> > Ombredanne, and Kate Stewart.
> 
> Looks good.  Except...  Why the C++ style comment?  (Use /* */ not //?)

That's the "style" that Linus wanted, it stands out, right?  :)

thanks for the review.

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

[PATCH 06/11] staging: lustre: add SPDX identifiers to all lustre files

[Greg Kroah-Hartman]

It's good to have SPDX identifiers in all files to make it easier to
audit the kernel tree for correct licenses.

Update the drivers/staging/lustre files files with the correct SPDX
license identifier based on the license text in the file itself.  The
SPDX identifier is a legally binding shorthand, which can be used
instead of the full boiler plate text.

This work is based on a script and data from Thomas Gleixner, Philippe
Ombredanne, and Kate Stewart.

Cc: Oleg Drokin 
Cc: Andreas Dilger 
Cc: James Simmons 
Cc: Thomas Gleixner 
Cc: Kate Stewart 
Cc: Philippe Ombredanne 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/lustre/include/linux/libcfs/curproc.h   | 1 +
 drivers/staging/lustre/include/linux/libcfs/libcfs.h| 1 +
 drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h| 1 +
 drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h | 1 +
 drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h  | 1 +
 drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h   | 1 +
 drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h   | 1 +
 drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h   | 1 +
 drivers/staging/lustre/include/linux/libcfs/libcfs_private.h| 1 +
 drivers/staging/lustre/include/linux/libcfs/libcfs_string.h | 1 +
 drivers/staging/lustre/include/linux/libcfs/libcfs_time.h   | 1 +
 drivers/staging/lustre/include/linux/libcfs/libcfs_workitem.h   | 1 +
 drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h  | 1 +
 drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h   | 1 +
 drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h  | 1 +
 drivers/staging/lustre/include/linux/lnet/api.h | 1 +
 drivers/staging/lustre/include/linux/lnet/lib-lnet.h| 1 +
 drivers/staging/lustre/include/linux/lnet/lib-types.h   | 1 +
 drivers/staging/lustre/include/linux/lnet/socklnd.h | 1 +
 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 1 +
 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 1 +
 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c  | 1 +
 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c   | 1 +
 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c | 1 +
 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h | 1 +
 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c  | 1 +
 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c | 1 +
 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c   | 1 +
 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c   | 1 +
 drivers/staging/lustre/lnet/libcfs/debug.c  | 1 +
 drivers/staging/lustre/lnet/libcfs/fail.c   | 1 +
 drivers/staging/lustre/lnet/libcfs/hash.c   | 1 +
 drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c | 1 +
 drivers/staging/lustre/lnet/libcfs/libcfs_lock.c| 1 +
 drivers/staging/lustre/lnet/libcfs/libcfs_mem.c | 1 +
 drivers/staging/lustre/lnet/libcfs/libcfs_string.c  | 1 +
 drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c| 1 +
 drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c   | 1 +
 drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c | 1 +
 drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h | 1 +
 drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c| 1 +
 drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c  | 1 +
 drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c| 1 +
 drivers/staging/lustre/lnet/libcfs/linux/linux-module.c | 1 +
 drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c   | 1 +
 drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c  | 1 +
 drivers/staging/lustre/lnet/libcfs/module.c | 1 +
 drivers/staging/lustre/lnet/libcfs/prng.c   | 1 +
 drivers/staging/lustre/lnet/libcfs/tracefile.c  | 1 +
 drivers/staging/lustre/lnet/libcfs/tracefile.h  | 1 +
 drivers/staging/lustre/lnet/libcfs/workitem.c   | 1 +
 drivers/staging/lustre/lnet/lnet/acceptor.c | 1 +
 drivers/staging/lustre/lnet/lnet/api-ni.c   | 1 +
 drivers/staging/lustre/lnet/lnet/config.c   | 1 +
 drivers/staging/lustre/lnet/lnet/lib-eq.c   | 1 +
 drivers/staging/lustre/lnet/lnet/lib-md.c   | 1 +
 drivers/staging/lustre/lnet/lnet/lib-me.c   | 1 +
 drivers/staging/lustre/lnet/lnet/lib-move.c | 1 +
 drivers/staging/lustre/lnet/lnet/lib-msg.c  | 1 +
 

[PATCH 09/11] staging: unisys: Remove redundant license text

[Greg Kroah-Hartman]

Now that the SPDX tag is in all unisys driver files, that identifies the
license in a specific and legally-defined manner.  So the extra GPL text
wording can be removed as it is no longer needed at all.

This is done on a quest to remove the 700+ different ways that files in
the kernel describe the GPL license text.  And there's unneeded stuff
like the address (sometimes incorrect) for the FSF which is never
needed.

No copyright headers or other non-license-description text was removed.

Cc: David Kershner 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/unisys/include/iochannel.h   | 11 ---
 drivers/staging/unisys/include/visorbus.h| 11 ---
 drivers/staging/unisys/include/visorchannel.h| 11 ---
 drivers/staging/unisys/visorbus/controlvmchannel.h   | 10 --
 drivers/staging/unisys/visorbus/vbuschannel.h| 10 --
 drivers/staging/unisys/visorbus/visorbus_main.c  | 10 --
 drivers/staging/unisys/visorbus/visorbus_private.h   | 10 --
 drivers/staging/unisys/visorbus/visorchannel.c   | 10 --
 drivers/staging/unisys/visorbus/visorchipset.c   | 10 --
 drivers/staging/unisys/visorhba/visorhba_main.c  | 11 ---
 drivers/staging/unisys/visorinput/ultrainputreport.h | 10 --
 drivers/staging/unisys/visorinput/visorinput.c   | 10 --
 drivers/staging/unisys/visornic/visornic_main.c  | 10 --
 13 files changed, 134 deletions(-)

diff --git a/drivers/staging/unisys/include/iochannel.h 
b/drivers/staging/unisys/include/iochannel.h
index 6fc40f9cc768..a3c87544bf96 100644
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@ -2,17 +2,6 @@
 /*
  * Copyright (C) 2010 - 2016 UNISYS CORPORATION
  * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
  */
 
 #ifndef __IOCHANNEL_H__
diff --git a/drivers/staging/unisys/include/visorbus.h 
b/drivers/staging/unisys/include/visorbus.h
index 8a0303ba5ed8..fb4d3f814568 100644
--- a/drivers/staging/unisys/include/visorbus.h
+++ b/drivers/staging/unisys/include/visorbus.h
@@ -2,17 +2,6 @@
 /*
  * Copyright (C) 2010 - 2013 UNISYS CORPORATION
  * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
  */
 
 /*
diff --git a/drivers/staging/unisys/include/visorchannel.h 
b/drivers/staging/unisys/include/visorchannel.h
index b4c51d57fe90..0c45b63e973c 100644
--- a/drivers/staging/unisys/include/visorchannel.h
+++ b/drivers/staging/unisys/include/visorchannel.h
@@ -2,17 +2,6 @@
 /*
  * Copyright (C) 2010 - 2013 UNISYS CORPORATION
  * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
  */
 
 #ifndef __VISORCHANNEL_H__
diff --git a/drivers/staging/unisys/visorbus/controlvmchannel.h 
b/drivers/staging/unisys/visorbus/controlvmchannel.h
index e10a1018b418..bcc7b8e3d8eb 100644
--- a/drivers/staging/unisys/visorbus/controlvmchannel.h
+++ b/drivers/staging/unisys/visorbus/controlvmchannel.h
@@ -2,16 +2,6 @@
 /*
  * Copyright (C) 2010 - 2015 UNISYS CORPORATION
  * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the 

[PATCH 07/11] staging: unisys: add SPDX identifiers to all unisys driver files

[Greg Kroah-Hartman]

It's good to have SPDX identifiers in all files to make it easier to
audit the kernel tree for correct licenses.

Update the drivers/staging/unisys files files with the correct SPDX
license identifier based on the license text in the file itself.  The
SPDX identifier is a legally binding shorthand, which can be used
instead of the full boiler plate text.

This work is based on a script and data from Thomas Gleixner, Philippe
Ombredanne, and Kate Stewart.

Cc: David Kershner 
Cc: Thomas Gleixner 
Cc: Kate Stewart 
Cc: Philippe Ombredanne 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/unisys/include/iochannel.h   | 1 +
 drivers/staging/unisys/include/visorbus.h| 1 +
 drivers/staging/unisys/visorbus/controlvmchannel.h   | 1 +
 drivers/staging/unisys/visorbus/vbuschannel.h| 1 +
 drivers/staging/unisys/visorbus/visorbus_main.c  | 1 +
 drivers/staging/unisys/visorbus/visorbus_private.h   | 1 +
 drivers/staging/unisys/visorbus/visorchannel.c   | 1 +
 drivers/staging/unisys/visorbus/visorchipset.c   | 1 +
 drivers/staging/unisys/visorhba/visorhba_main.c  | 1 +
 drivers/staging/unisys/visorinput/ultrainputreport.h | 1 +
 drivers/staging/unisys/visorinput/visorinput.c   | 1 +
 drivers/staging/unisys/visornic/visornic_main.c  | 1 +
 12 files changed, 12 insertions(+)

diff --git a/drivers/staging/unisys/include/iochannel.h 
b/drivers/staging/unisys/include/iochannel.h
index 5cd407ca2251..bac5a04a9c28 100644
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2010 - 2016 UNISYS CORPORATION
  * All rights reserved.
diff --git a/drivers/staging/unisys/include/visorbus.h 
b/drivers/staging/unisys/include/visorbus.h
index 1a0986ba3d24..8a0303ba5ed8 100644
--- a/drivers/staging/unisys/include/visorbus.h
+++ b/drivers/staging/unisys/include/visorbus.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2010 - 2013 UNISYS CORPORATION
  * All rights reserved.
diff --git a/drivers/staging/unisys/visorbus/controlvmchannel.h 
b/drivers/staging/unisys/visorbus/controlvmchannel.h
index 9ee9886a9aed..e10a1018b418 100644
--- a/drivers/staging/unisys/visorbus/controlvmchannel.h
+++ b/drivers/staging/unisys/visorbus/controlvmchannel.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2010 - 2015 UNISYS CORPORATION
  * All rights reserved.
diff --git a/drivers/staging/unisys/visorbus/vbuschannel.h 
b/drivers/staging/unisys/visorbus/vbuschannel.h
index 981b180f3c4b..5681640fe7f1 100644
--- a/drivers/staging/unisys/visorbus/vbuschannel.h
+++ b/drivers/staging/unisys/visorbus/vbuschannel.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2010 - 2015 UNISYS CORPORATION
  * All rights reserved.
diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c 
b/drivers/staging/unisys/visorbus/visorbus_main.c
index b604d0cccef1..f940bc437737 100644
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright � 2010 - 2015 UNISYS CORPORATION
  * All rights reserved.
diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h 
b/drivers/staging/unisys/visorbus/visorbus_private.h
index 4a8b12d7cfaa..17ed63dc55a2 100644
--- a/drivers/staging/unisys/visorbus/visorbus_private.h
+++ b/drivers/staging/unisys/visorbus/visorbus_private.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2010 - 2015 UNISYS CORPORATION
  * All rights reserved.
diff --git a/drivers/staging/unisys/visorbus/visorchannel.c 
b/drivers/staging/unisys/visorbus/visorchannel.c
index aae16073ba03..d9de7eb05f40 100644
--- a/drivers/staging/unisys/visorbus/visorchannel.c
+++ b/drivers/staging/unisys/visorbus/visorchannel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2010 - 2015 UNISYS CORPORATION
  * All rights reserved.
diff --git a/drivers/staging/unisys/visorbus/visorchipset.c 
b/drivers/staging/unisys/visorbus/visorchipset.c
index fed554a43151..d9980a80da2d 100644
--- a/drivers/staging/unisys/visorbus/visorchipset.c
+++ b/drivers/staging/unisys/visorbus/visorchipset.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2010 - 2015 UNISYS CORPORATION
  * All rights reserved.
diff --git a/drivers/staging/unisys/visorhba/visorhba_main.c 
b/drivers/staging/unisys/visorhba/visorhba_main.c
index 0bcd3acb7b0c..83eba22a0f21 100644
--- a/drivers/staging/unisys/visorhba/visorhba_main.c
+++ b/drivers/staging/unisys/visorhba/visorhba_main.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2012 - 2015 UNISYS CORPORATION
  * All rights reserved.
diff --git 

[PATCH 03/11] staging: comedi: add SPDX identifiers to all greybus driver files

[Greg Kroah-Hartman]

It's good to have SPDX identifiers in all files to make it easier to
audit the kernel tree for correct licenses.

Update the drivers/staging/comedi files files with the correct SPDX
license identifier based on the license text in the file itself.  The
SPDX identifier is a legally binding shorthand, which can be used
instead of the full boiler plate text.

This work is based on a script and data from Thomas Gleixner, Philippe
Ombredanne, and Kate Stewart.

Cc: Ian Abbott 
Cc: H Hartley Sweeten 
Cc: Thomas Gleixner 
Cc: Kate Stewart 
Cc: Philippe Ombredanne 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/comedi/comedi.h  | 1 +
 drivers/staging/comedi/comedi_buf.c  | 1 +
 drivers/staging/comedi/comedi_compat32.c | 1 +
 drivers/staging/comedi/comedi_compat32.h | 1 +
 drivers/staging/comedi/comedi_fops.c | 1 +
 drivers/staging/comedi/comedi_pci.c  | 1 +
 drivers/staging/comedi/comedi_pci.h  | 1 +
 drivers/staging/comedi/comedi_pcmcia.c   | 1 +
 drivers/staging/comedi/comedi_pcmcia.h   | 1 +
 drivers/staging/comedi/comedi_usb.c  | 1 +
 drivers/staging/comedi/comedi_usb.h  | 1 +
 drivers/staging/comedi/comedidev.h   | 1 +
 drivers/staging/comedi/comedilib.h   | 1 +
 drivers/staging/comedi/drivers.c | 1 +
 drivers/staging/comedi/drivers/8255.c| 1 +
 drivers/staging/comedi/drivers/8255.h| 1 +
 drivers/staging/comedi/drivers/8255_pci.c| 1 +
 drivers/staging/comedi/drivers/addi_apci_1032.c  | 1 +
 drivers/staging/comedi/drivers/addi_apci_1500.c  | 1 +
 drivers/staging/comedi/drivers/addi_apci_1516.c  | 1 +
 drivers/staging/comedi/drivers/addi_apci_1564.c  | 1 +
 drivers/staging/comedi/drivers/addi_apci_16xx.c  | 1 +
 drivers/staging/comedi/drivers/addi_apci_2032.c  | 1 +
 drivers/staging/comedi/drivers/addi_apci_2200.c  | 1 +
 drivers/staging/comedi/drivers/addi_apci_3120.c  | 1 +
 drivers/staging/comedi/drivers/addi_apci_3501.c  | 1 +
 drivers/staging/comedi/drivers/addi_apci_3xxx.c  | 1 +
 drivers/staging/comedi/drivers/addi_watchdog.c   | 1 +
 drivers/staging/comedi/drivers/adl_pci6208.c | 1 +
 drivers/staging/comedi/drivers/adl_pci7x3x.c | 1 +
 drivers/staging/comedi/drivers/adl_pci8164.c | 1 +
 drivers/staging/comedi/drivers/adl_pci9111.c | 1 +
 drivers/staging/comedi/drivers/adl_pci9118.c | 1 +
 drivers/staging/comedi/drivers/adq12b.c  | 1 +
 drivers/staging/comedi/drivers/adv_pci1710.c | 1 +
 drivers/staging/comedi/drivers/adv_pci1720.c | 1 +
 drivers/staging/comedi/drivers/adv_pci1723.c | 1 +
 drivers/staging/comedi/drivers/adv_pci1724.c | 1 +
 drivers/staging/comedi/drivers/adv_pci1760.c | 1 +
 drivers/staging/comedi/drivers/adv_pci_dio.c | 1 +
 drivers/staging/comedi/drivers/aio_aio12_8.c | 1 +
 drivers/staging/comedi/drivers/aio_iiro_16.c | 1 +
 drivers/staging/comedi/drivers/amplc_dio200.c| 1 +
 drivers/staging/comedi/drivers/amplc_dio200.h| 1 +
 drivers/staging/comedi/drivers/amplc_dio200_common.c | 1 +
 drivers/staging/comedi/drivers/amplc_dio200_pci.c| 1 +
 drivers/staging/comedi/drivers/amplc_pc236.c | 1 +
 drivers/staging/comedi/drivers/amplc_pc236.h | 1 +
 drivers/staging/comedi/drivers/amplc_pc236_common.c  | 1 +
 drivers/staging/comedi/drivers/amplc_pc263.c | 1 +
 drivers/staging/comedi/drivers/amplc_pci224.c| 1 +
 drivers/staging/comedi/drivers/amplc_pci230.c| 1 +
 drivers/staging/comedi/drivers/amplc_pci236.c| 1 +
 drivers/staging/comedi/drivers/amplc_pci263.c| 1 +
 drivers/staging/comedi/drivers/c6xdigio.c| 1 +
 drivers/staging/comedi/drivers/cb_das16_cs.c | 1 +
 drivers/staging/comedi/drivers/cb_pcidas.c   | 1 +
 drivers/staging/comedi/drivers/cb_pcidas64.c | 1 +
 drivers/staging/comedi/drivers/cb_pcidda.c   | 1 +
 drivers/staging/comedi/drivers/cb_pcimdas.c  | 1 +
 drivers/staging/comedi/drivers/cb_pcimdda.c  | 1 +
 drivers/staging/comedi/drivers/comedi_8254.c | 1 +
 drivers/staging/comedi/drivers/comedi_8254.h | 1 +
 drivers/staging/comedi/drivers/comedi_8255.c | 1 +
 drivers/staging/comedi/drivers/comedi_bond.c | 1 +
 drivers/staging/comedi/drivers/comedi_isadma.c   | 1 +
 drivers/staging/comedi/drivers/comedi_isadma.h   | 1 +
 drivers/staging/comedi/drivers/comedi_parport.c  | 1 +
 drivers/staging/comedi/drivers/comedi_test.c | 1 +
 drivers/staging/comedi/drivers/contec_pci_dio.c  | 1 +
 drivers/staging/comedi/drivers/dac02.c 

[PATCH 08/11] staging: unisys: fix up some SPDX tags

[Greg Kroah-Hartman]

One .h file was missing a SPDX tag, and another one was wrong after
looking at the text of the license itself, so fix both of these issues
up at the same time.

Cc: David Kershner 
Cc: Thomas Gleixner 
Cc: Kate Stewart 
Cc: Philippe Ombredanne 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/unisys/include/iochannel.h| 2 +-
 drivers/staging/unisys/include/visorchannel.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/unisys/include/iochannel.h 
b/drivers/staging/unisys/include/iochannel.h
index bac5a04a9c28..6fc40f9cc768 100644
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2010 - 2016 UNISYS CORPORATION
  * All rights reserved.
diff --git a/drivers/staging/unisys/include/visorchannel.h 
b/drivers/staging/unisys/include/visorchannel.h
index 33945749c8b6..b4c51d57fe90 100644
--- a/drivers/staging/unisys/include/visorchannel.h
+++ b/drivers/staging/unisys/include/visorchannel.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2010 - 2013 UNISYS CORPORATION
  * All rights reserved.
-- 
2.15.0

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

[PATCH 04/11] staging: comedi: drivers: Remove redundant license text

[Greg Kroah-Hartman]

Now that the SPDX tag is in all comedi files, that identifies the
license in a specific and legally-defined manner.  So the extra GPL text
wording can be removed as it is no longer needed at all.

This is done on a quest to remove the 700+ different ways that files in
the kernel describe the GPL license text.  And there's unneeded stuff
like the address (sometimes incorrect) for the FSF which is never
needed.

No copyright headers or other non-license-description text was removed.

Cc: Ian Abbott 
Cc: H Hartley Sweeten 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/comedi/drivers/8255.c| 10 --
 drivers/staging/comedi/drivers/8255.h| 10 --
 drivers/staging/comedi/drivers/8255_pci.c| 10 --
 drivers/staging/comedi/drivers/addi_apci_1032.c  | 10 --
 drivers/staging/comedi/drivers/addi_apci_1500.c  | 10 --
 drivers/staging/comedi/drivers/addi_apci_1516.c  | 10 --
 drivers/staging/comedi/drivers/addi_apci_1564.c  | 10 --
 drivers/staging/comedi/drivers/addi_apci_16xx.c  | 10 --
 drivers/staging/comedi/drivers/addi_apci_2032.c  | 10 --
 drivers/staging/comedi/drivers/addi_apci_2200.c  | 10 --
 drivers/staging/comedi/drivers/addi_apci_3120.c  | 10 --
 drivers/staging/comedi/drivers/addi_apci_3501.c  | 10 --
 drivers/staging/comedi/drivers/addi_apci_3xxx.c  | 10 --
 drivers/staging/comedi/drivers/addi_watchdog.c   | 10 --
 drivers/staging/comedi/drivers/adl_pci6208.c | 10 --
 drivers/staging/comedi/drivers/adl_pci7x3x.c | 10 --
 drivers/staging/comedi/drivers/adl_pci8164.c | 10 --
 drivers/staging/comedi/drivers/adl_pci9111.c | 10 --
 drivers/staging/comedi/drivers/adq12b.c  | 10 --
 drivers/staging/comedi/drivers/adv_pci1720.c | 10 --
 drivers/staging/comedi/drivers/adv_pci1723.c | 10 --
 drivers/staging/comedi/drivers/adv_pci1724.c | 10 --
 drivers/staging/comedi/drivers/adv_pci1760.c | 10 --
 drivers/staging/comedi/drivers/aio_aio12_8.c | 10 --
 drivers/staging/comedi/drivers/aio_iiro_16.c | 10 --
 drivers/staging/comedi/drivers/amplc_dio200.c| 10 --
 drivers/staging/comedi/drivers/amplc_dio200.h| 10 --
 drivers/staging/comedi/drivers/amplc_dio200_common.c | 10 --
 drivers/staging/comedi/drivers/amplc_dio200_pci.c| 10 --
 drivers/staging/comedi/drivers/amplc_pc236.c | 10 --
 drivers/staging/comedi/drivers/amplc_pc236.h | 10 --
 drivers/staging/comedi/drivers/amplc_pc236_common.c  | 10 --
 drivers/staging/comedi/drivers/amplc_pc263.c | 10 --
 drivers/staging/comedi/drivers/amplc_pci224.c| 10 --
 drivers/staging/comedi/drivers/amplc_pci230.c| 10 --
 drivers/staging/comedi/drivers/amplc_pci236.c| 10 --
 drivers/staging/comedi/drivers/amplc_pci263.c| 10 --
 drivers/staging/comedi/drivers/c6xdigio.c| 10 --
 drivers/staging/comedi/drivers/cb_das16_cs.c | 10 --
 drivers/staging/comedi/drivers/cb_pcidas.c   | 10 --
 drivers/staging/comedi/drivers/cb_pcidas64.c | 10 --
 drivers/staging/comedi/drivers/cb_pcidda.c   | 10 --
 drivers/staging/comedi/drivers/cb_pcimdas.c  | 10 --
 drivers/staging/comedi/drivers/cb_pcimdda.c  | 10 --
 drivers/staging/comedi/drivers/comedi_8254.c | 10 --
 drivers/staging/comedi/drivers/comedi_8254.h | 10 --
 drivers/staging/comedi/drivers/comedi_8255.c | 10 --
 drivers/staging/comedi/drivers/comedi_bond.c | 10 --
 drivers/staging/comedi/drivers/comedi_isadma.c   | 10 --
 drivers/staging/comedi/drivers/comedi_isadma.h   | 10 --
 drivers/staging/comedi/drivers/comedi_parport.c  | 10 --
 drivers/staging/comedi/drivers/comedi_test.c | 10 --
 drivers/staging/comedi/drivers/contec_pci_dio.c  | 10 --
 drivers/staging/comedi/drivers/dac02.c   | 10 --
 drivers/staging/comedi/drivers/daqboard2000.c| 10 --
 drivers/staging/comedi/drivers/das08.c   | 10 --
 drivers/staging/comedi/drivers/das08.h   | 10 --
 drivers/staging/comedi/drivers/das08_cs.c| 10 --
 drivers/staging/comedi/drivers/das08_isa.c   | 10 --
 drivers/staging/comedi/drivers/das08_pci.c   | 10 --
 drivers/staging/comedi/drivers/das16.c   | 10 --
 drivers/staging/comedi/drivers/das16m1.c | 10 --
 

[PATCH 10/11] staging: most: add SPDX identifiers to all unisys driver files

[Greg Kroah-Hartman]

It's good to have SPDX identifiers in all files to make it easier to
audit the kernel tree for correct licenses.

Update the drivers/staging/most files files with the correct SPDX
license identifier based on the license text in the file itself.  The
SPDX identifier is a legally binding shorthand, which can be used
instead of the full boiler plate text.

This work is based on a script and data from Thomas Gleixner, Philippe
Ombredanne, and Kate Stewart.

Cc: Michael Fabry 
Cc: Christian Gromm 
Cc: Thomas Gleixner 
Cc: Kate Stewart 
Cc: Philippe Ombredanne 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/most/aim-cdev/cdev.c  | 1 +
 drivers/staging/most/aim-network/networking.c | 1 +
 drivers/staging/most/aim-sound/sound.c| 1 +
 drivers/staging/most/aim-v4l2/video.c | 1 +
 drivers/staging/most/hdm-dim2/dim2_errors.h   | 1 +
 drivers/staging/most/hdm-dim2/dim2_hal.c  | 1 +
 drivers/staging/most/hdm-dim2/dim2_hal.h  | 1 +
 drivers/staging/most/hdm-dim2/dim2_hdm.c  | 1 +
 drivers/staging/most/hdm-dim2/dim2_hdm.h  | 1 +
 drivers/staging/most/hdm-dim2/dim2_reg.h  | 1 +
 drivers/staging/most/hdm-dim2/dim2_sysfs.c| 1 +
 drivers/staging/most/hdm-dim2/dim2_sysfs.h| 1 +
 drivers/staging/most/hdm-i2c/hdm_i2c.c| 1 +
 drivers/staging/most/hdm-usb/hdm_usb.c| 1 +
 drivers/staging/most/mostcore/core.c  | 1 +
 drivers/staging/most/mostcore/mostcore.h  | 1 +
 16 files changed, 16 insertions(+)

diff --git a/drivers/staging/most/aim-cdev/cdev.c 
b/drivers/staging/most/aim-cdev/cdev.c
index 1e5cbc893496..d6e7e85d9ece 100644
--- a/drivers/staging/most/aim-cdev/cdev.c
+++ b/drivers/staging/most/aim-cdev/cdev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * cdev.c - Application interfacing module for character devices
  *
diff --git a/drivers/staging/most/aim-network/networking.c 
b/drivers/staging/most/aim-network/networking.c
index 936f013c350e..e2dff6d5cf30 100644
--- a/drivers/staging/most/aim-network/networking.c
+++ b/drivers/staging/most/aim-network/networking.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Networking AIM - Networking Application Interface Module for MostCore
  *
diff --git a/drivers/staging/most/aim-sound/sound.c 
b/drivers/staging/most/aim-sound/sound.c
index ea1366a44008..0f596ca532d8 100644
--- a/drivers/staging/most/aim-sound/sound.c
+++ b/drivers/staging/most/aim-sound/sound.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sound.c - Audio Application Interface Module for Mostcore
  *
diff --git a/drivers/staging/most/aim-v4l2/video.c 
b/drivers/staging/most/aim-v4l2/video.c
index e0748416aee5..e089d139b943 100644
--- a/drivers/staging/most/aim-v4l2/video.c
+++ b/drivers/staging/most/aim-v4l2/video.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * V4L2 AIM - V4L2 Application Interface Module for MostCore
  *
diff --git a/drivers/staging/most/hdm-dim2/dim2_errors.h 
b/drivers/staging/most/hdm-dim2/dim2_errors.h
index 66343ba426c1..073d93cf4927 100644
--- a/drivers/staging/most/hdm-dim2/dim2_errors.h
+++ b/drivers/staging/most/hdm-dim2/dim2_errors.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dim2_errors.h - Definitions of errors for DIM2 HAL API
  * (MediaLB, Device Interface Macro IP, OS62420)
diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.c 
b/drivers/staging/most/hdm-dim2/dim2_hal.c
index 91484643d289..f0a45863c8cb 100644
--- a/drivers/staging/most/hdm-dim2/dim2_hal.c
+++ b/drivers/staging/most/hdm-dim2/dim2_hal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dim2_hal.c - DIM2 HAL implementation
  * (MediaLB, Device Interface Macro IP, OS62420)
diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.h 
b/drivers/staging/most/hdm-dim2/dim2_hal.h
index 6df6ea5f7da4..df678124117c 100644
--- a/drivers/staging/most/hdm-dim2/dim2_hal.h
+++ b/drivers/staging/most/hdm-dim2/dim2_hal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dim2_hal.h - DIM2 HAL interface
  * (MediaLB, Device Interface Macro IP, OS62420)
diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.c 
b/drivers/staging/most/hdm-dim2/dim2_hdm.c
index df7021c522b3..c59c8a526d06 100644
--- a/drivers/staging/most/hdm-dim2/dim2_hdm.c
+++ b/drivers/staging/most/hdm-dim2/dim2_hdm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dim2_hdm.c - MediaLB DIM2 Hardware Dependent Module
  *
diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.h 
b/drivers/staging/most/hdm-dim2/dim2_hdm.h
index 4050e7c764ed..dc0293a7be1f 100644
--- a/drivers/staging/most/hdm-dim2/dim2_hdm.h
+++ b/drivers/staging/most/hdm-dim2/dim2_hdm.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dim2_hdm.h - MediaLB DIM2 HDM Header
  *
diff --git a/drivers/staging/most/hdm-dim2/dim2_reg.h 

[PATCH 05/11] staging: comedi: Remove redundant license text

[Greg Kroah-Hartman]

Now that the SPDX tag is in all comedi files, that identifies the
license in a specific and legally-defined manner.  So the extra GPL text
wording can be removed as it is no longer needed at all.

This is done on a quest to remove the 700+ different ways that files in
the kernel describe the GPL license text.  And there's unneeded stuff
like the address (sometimes incorrect) for the FSF which is never
needed.

No copyright headers or other non-license-description text was removed.

Cc: Ian Abbott 
Cc: H Hartley Sweeten 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/comedi/comedi.h | 10 --
 drivers/staging/comedi/comedi_buf.c | 10 --
 drivers/staging/comedi/comedi_compat32.c| 10 --
 drivers/staging/comedi/comedi_compat32.h| 10 --
 drivers/staging/comedi/comedi_fops.c| 10 --
 drivers/staging/comedi/comedi_pci.c | 10 --
 drivers/staging/comedi/comedi_pci.h | 10 --
 drivers/staging/comedi/comedi_pcmcia.c  | 10 --
 drivers/staging/comedi/comedi_pcmcia.h  | 10 --
 drivers/staging/comedi/comedi_usb.c | 10 --
 drivers/staging/comedi/comedi_usb.h | 10 --
 drivers/staging/comedi/comedidev.h  | 10 --
 drivers/staging/comedi/comedilib.h  | 10 --
 drivers/staging/comedi/drivers.c| 10 --
 drivers/staging/comedi/kcomedilib/kcomedilib_main.c | 10 --
 drivers/staging/comedi/proc.c   | 10 --
 drivers/staging/comedi/range.c  | 10 --
 17 files changed, 170 deletions(-)

diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index e915e42ab47f..c0bc413f7fe0 100644
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -5,16 +5,6 @@
  *
  * COMEDI - Linux Control and Measurement Device Interface
  * Copyright (C) 1998-2001 David A. Schleef 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 #ifndef _COMEDI_H
diff --git a/drivers/staging/comedi/comedi_buf.c 
b/drivers/staging/comedi/comedi_buf.c
index e75d41ac2a19..f693c2c0bec3 100644
--- a/drivers/staging/comedi/comedi_buf.c
+++ b/drivers/staging/comedi/comedi_buf.c
@@ -5,16 +5,6 @@
  * COMEDI - Linux Control and Measurement Device Interface
  * Copyright (C) 1997-2000 David A. Schleef 
  * Copyright (C) 2002 Frank Mori Hess 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 #include 
diff --git a/drivers/staging/comedi/comedi_compat32.c 
b/drivers/staging/comedi/comedi_compat32.c
index 26c62f7e6249..97fb9388bc22 100644
--- a/drivers/staging/comedi/comedi_compat32.c
+++ b/drivers/staging/comedi/comedi_compat32.c
@@ -8,16 +8,6 @@
  *
  * COMEDI - Linux Control and Measurement Device Interface
  * Copyright (C) 1997-2007 David A. Schleef 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 #include 
diff --git a/drivers/staging/comedi/comedi_compat32.h 
b/drivers/staging/comedi/comedi_compat32.h
index 9fa8ed2b8d41..3980e6e1bd0d 100644
--- a/drivers/staging/comedi/comedi_compat32.h
+++ b/drivers/staging/comedi/comedi_compat32.h
@@ -8,16 +8,6 @@
  *
  * COMEDI - Linux Control and Measurement Device Interface
  * Copyright (C) 1997-2007 David A. Schleef 
- *
- * This 

[PATCH 11/11] staging: most: Remove redundant license text

[Greg Kroah-Hartman]

Now that the SPDX tag is in all most driver files, that identifies the
license in a specific and legally-defined manner.  So the extra GPL text
wording can be removed as it is no longer needed at all.

This is done on a quest to remove the 700+ different ways that files in
the kernel describe the GPL license text.  And there's unneeded stuff
like the address (sometimes incorrect) for the FSF which is never
needed.

No copyright headers or other non-license-description text was removed.

Cc: Christian Gromm 
Cc: Michael Fabry 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/most/aim-cdev/cdev.c  | 7 ---
 drivers/staging/most/aim-network/networking.c | 7 ---
 drivers/staging/most/aim-sound/sound.c| 7 ---
 drivers/staging/most/aim-v4l2/video.c | 7 ---
 drivers/staging/most/hdm-dim2/dim2_errors.h   | 7 ---
 drivers/staging/most/hdm-dim2/dim2_hal.c  | 7 ---
 drivers/staging/most/hdm-dim2/dim2_hal.h  | 7 ---
 drivers/staging/most/hdm-dim2/dim2_hdm.c  | 7 ---
 drivers/staging/most/hdm-dim2/dim2_hdm.h  | 7 ---
 drivers/staging/most/hdm-dim2/dim2_reg.h  | 7 ---
 drivers/staging/most/hdm-dim2/dim2_sysfs.c| 7 ---
 drivers/staging/most/hdm-dim2/dim2_sysfs.h| 7 ---
 drivers/staging/most/hdm-i2c/hdm_i2c.c| 7 ---
 drivers/staging/most/hdm-usb/hdm_usb.c| 7 ---
 drivers/staging/most/mostcore/core.c  | 7 ---
 drivers/staging/most/mostcore/mostcore.h  | 7 ---
 16 files changed, 112 deletions(-)

diff --git a/drivers/staging/most/aim-cdev/cdev.c 
b/drivers/staging/most/aim-cdev/cdev.c
index d6e7e85d9ece..5010c7bf8772 100644
--- a/drivers/staging/most/aim-cdev/cdev.c
+++ b/drivers/staging/most/aim-cdev/cdev.c
@@ -3,13 +3,6 @@
  * cdev.c - Application interfacing module for character devices
  *
  * Copyright (C) 2013-2015 Microchip Technology Germany II GmbH & Co. KG
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * This file is licensed under GPLv2.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/staging/most/aim-network/networking.c 
b/drivers/staging/most/aim-network/networking.c
index e2dff6d5cf30..d98eb893d44c 100644
--- a/drivers/staging/most/aim-network/networking.c
+++ b/drivers/staging/most/aim-network/networking.c
@@ -3,13 +3,6 @@
  * Networking AIM - Networking Application Interface Module for MostCore
  *
  * Copyright (C) 2015, Microchip Technology Germany II GmbH & Co. KG
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * This file is licensed under GPLv2.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/staging/most/aim-sound/sound.c 
b/drivers/staging/most/aim-sound/sound.c
index 0f596ca532d8..d84a6e1b56a1 100644
--- a/drivers/staging/most/aim-sound/sound.c
+++ b/drivers/staging/most/aim-sound/sound.c
@@ -3,13 +3,6 @@
  * sound.c - Audio Application Interface Module for Mostcore
  *
  * Copyright (C) 2015 Microchip Technology Germany II GmbH & Co. KG
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * This file is licensed under GPLv2.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/staging/most/aim-v4l2/video.c 
b/drivers/staging/most/aim-v4l2/video.c
index e089d139b943..72e9a9a5d8b3 100644
--- a/drivers/staging/most/aim-v4l2/video.c
+++ b/drivers/staging/most/aim-v4l2/video.c
@@ -3,13 +3,6 @@
  * V4L2 AIM - V4L2 Application Interface Module for MostCore
  *
  * Copyright (C) 2015, Microchip Technology Germany II GmbH & Co. KG
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * This file is licensed under GPLv2.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/staging/most/hdm-dim2/dim2_errors.h 
b/drivers/staging/most/hdm-dim2/dim2_errors.h
index 073d93cf4927..8b90196076d5 100644
--- a/drivers/staging/most/hdm-dim2/dim2_errors.h
+++ b/drivers/staging/most/hdm-dim2/dim2_errors.h
@@ -4,13 +4,6 @@
  * (MediaLB, Device Interface Macro IP, OS62420)
  *
  * Copyright (C) 2015, Microchip Technology Germany II GmbH & Co. KG
- *
- * This program is 

[PATCH 02/11] staging: greybus: Remove redundant license text

[Greg Kroah-Hartman]

Now that the SPDX tag is in all greybus files, that identifies the
license in a specific and legally-defined manner.  So the extra GPL text
wording can be removed as it is no longer needed at all.

This is done on a quest to remove the 700+ different ways that files in
the kernel describe the GPL license text.  And there's unneeded stuff
like the address (sometimes incorrect) for the FSF which is never
needed.

No copyright headers or other non-license-description text was removed.

Cc: Vaibhav Hiremath 
Cc: Johan Hovold 
Cc: Alex Elder 
Cc: Greg Kroah-Hartman 
Cc: Vaibhav Agarwal 
Cc: Mark Greer 
Cc: Viresh Kumar 
Cc: Rui Miguel Silva 
Cc: David Lin 
Cc: "Bryan O'Donoghue" 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/greybus/arche-apb-ctrl.c| 2 --
 drivers/staging/greybus/arche-platform.c| 2 --
 drivers/staging/greybus/arche_platform.h| 2 --
 drivers/staging/greybus/audio_apbridgea.c   | 2 --
 drivers/staging/greybus/audio_codec.c   | 2 --
 drivers/staging/greybus/audio_codec.h   | 2 --
 drivers/staging/greybus/audio_gb.c  | 2 --
 drivers/staging/greybus/audio_manager.c | 2 --
 drivers/staging/greybus/audio_manager.h | 2 --
 drivers/staging/greybus/audio_manager_module.c  | 2 --
 drivers/staging/greybus/audio_manager_private.h | 2 --
 drivers/staging/greybus/audio_manager_sysfs.c   | 2 --
 drivers/staging/greybus/audio_module.c  | 2 --
 drivers/staging/greybus/audio_topology.c| 2 --
 drivers/staging/greybus/authentication.c| 2 --
 drivers/staging/greybus/bootrom.c   | 2 --
 drivers/staging/greybus/bundle.c| 2 --
 drivers/staging/greybus/bundle.h| 2 --
 drivers/staging/greybus/camera.c| 2 --
 drivers/staging/greybus/connection.c| 2 --
 drivers/staging/greybus/connection.h| 2 --
 drivers/staging/greybus/control.c   | 2 --
 drivers/staging/greybus/control.h   | 2 --
 drivers/staging/greybus/core.c  | 2 --
 drivers/staging/greybus/debugfs.c   | 2 --
 drivers/staging/greybus/es2.c   | 2 --
 drivers/staging/greybus/firmware.h  | 2 --
 drivers/staging/greybus/fw-core.c   | 2 --
 drivers/staging/greybus/fw-download.c   | 2 --
 drivers/staging/greybus/fw-management.c | 2 --
 drivers/staging/greybus/gb-camera.h | 2 --
 drivers/staging/greybus/gbphy.c | 2 --
 drivers/staging/greybus/gbphy.h | 2 --
 drivers/staging/greybus/gpio.c  | 2 --
 drivers/staging/greybus/greybus.h   | 2 --
 drivers/staging/greybus/greybus_trace.h | 2 --
 drivers/staging/greybus/hd.c| 2 --
 drivers/staging/greybus/hd.h| 2 --
 drivers/staging/greybus/hid.c   | 2 --
 drivers/staging/greybus/i2c.c   | 2 --
 drivers/staging/greybus/interface.c | 2 --
 drivers/staging/greybus/interface.h | 2 --
 drivers/staging/greybus/light.c | 2 --
 drivers/staging/greybus/log.c   | 2 --
 drivers/staging/greybus/loopback.c  | 2 --
 drivers/staging/greybus/manifest.c  | 2 --
 drivers/staging/greybus/manifest.h  | 2 --
 drivers/staging/greybus/module.c| 2 --
 drivers/staging/greybus/module.h| 2 --
 drivers/staging/greybus/operation.c | 2 --
 drivers/staging/greybus/operation.h | 2 --
 drivers/staging/greybus/power_supply.c  | 2 --
 drivers/staging/greybus/pwm.c   | 2 --
 drivers/staging/greybus/raw.c   | 2 --
 drivers/staging/greybus/sdio.c  | 2 --
 drivers/staging/greybus/spi.c   | 2 --
 drivers/staging/greybus/spilib.c| 2 --
 drivers/staging/greybus/svc.c   | 2 --
 drivers/staging/greybus/svc.h   | 2 --
 drivers/staging/greybus/svc_watchdog.c  | 2 --
 drivers/staging/greybus/uart.c  | 2 --
 drivers/staging/greybus/usb.c   | 3 ---
 drivers/staging/greybus/vibrator.c  | 2 --
 63 files changed, 127 deletions(-)

diff --git a/drivers/staging/greybus/arche-apb-ctrl.c 
b/drivers/staging/greybus/arche-apb-ctrl.c
index c6c3d01395ed..b0c66112eb18 100644
--- a/drivers/staging/greybus/arche-apb-ctrl.c
+++ b/drivers/staging/greybus/arche-apb-ctrl.c
@@ -4,8 +4,6 @@
  *
  * Copyright 2014-2015 Google Inc.
  * Copyright 2014-2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include 
diff --git a/drivers/staging/greybus/arche-platform.c 

[PATCH 01/11] staging: greybus: add SPDX identifiers to all greybus driver files

[Greg Kroah-Hartman]

It's good to have SPDX identifiers in all files to make it easier to
audit the kernel tree for correct licenses.

Update the drivers/staging/greybus files files with the correct SPDX
license identifier based on the license text in the file itself.  The
SPDX identifier is a legally binding shorthand, which can be used
instead of the full boiler plate text.

This work is based on a script and data from Thomas Gleixner, Philippe
Ombredanne, and Kate Stewart.

Cc: Johan Hovold 
Cc: Alex Elder 
Cc: Greg Kroah-Hartman 
Cc: Vaibhav Hiremath 
Cc: Vaibhav Agarwal 
Cc: Mark Greer 
Cc: Viresh Kumar 
Cc: Rui Miguel Silva 
Cc: David Lin 
Cc: "Bryan O'Donoghue" 
Cc: Thomas Gleixner 
Cc: Kate Stewart 
Cc: Philippe Ombredanne 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/staging/greybus/Documentation/firmware/authenticate.c | 1 +
 drivers/staging/greybus/Documentation/firmware/firmware.c | 1 +
 drivers/staging/greybus/arche-apb-ctrl.c  | 1 +
 drivers/staging/greybus/arche-platform.c  | 1 +
 drivers/staging/greybus/arche_platform.h  | 1 +
 drivers/staging/greybus/arpc.h| 1 +
 drivers/staging/greybus/audio_apbridgea.c | 1 +
 drivers/staging/greybus/audio_apbridgea.h | 1 +
 drivers/staging/greybus/audio_codec.c | 1 +
 drivers/staging/greybus/audio_codec.h | 1 +
 drivers/staging/greybus/audio_gb.c| 1 +
 drivers/staging/greybus/audio_manager.c   | 1 +
 drivers/staging/greybus/audio_manager.h   | 1 +
 drivers/staging/greybus/audio_manager_module.c| 1 +
 drivers/staging/greybus/audio_manager_private.h   | 1 +
 drivers/staging/greybus/audio_manager_sysfs.c | 1 +
 drivers/staging/greybus/audio_module.c| 1 +
 drivers/staging/greybus/audio_topology.c  | 1 +
 drivers/staging/greybus/authentication.c  | 1 +
 drivers/staging/greybus/bootrom.c | 1 +
 drivers/staging/greybus/bundle.c  | 1 +
 drivers/staging/greybus/bundle.h  | 1 +
 drivers/staging/greybus/camera.c  | 1 +
 drivers/staging/greybus/connection.c  | 1 +
 drivers/staging/greybus/connection.h  | 1 +
 drivers/staging/greybus/control.c | 1 +
 drivers/staging/greybus/control.h | 1 +
 drivers/staging/greybus/core.c| 1 +
 drivers/staging/greybus/debugfs.c | 1 +
 drivers/staging/greybus/es2.c | 1 +
 drivers/staging/greybus/firmware.h| 1 +
 drivers/staging/greybus/fw-core.c | 1 +
 drivers/staging/greybus/fw-download.c | 1 +
 drivers/staging/greybus/fw-management.c   | 1 +
 drivers/staging/greybus/gb-camera.h   | 1 +
 drivers/staging/greybus/gbphy.c   | 1 +
 drivers/staging/greybus/gbphy.h   | 1 +
 drivers/staging/greybus/gpio.c| 1 +
 drivers/staging/greybus/greybus.h | 1 +
 drivers/staging/greybus/greybus_authentication.h  | 1 +
 drivers/staging/greybus/greybus_firmware.h| 1 +
 drivers/staging/greybus/greybus_manifest.h| 1 +
 drivers/staging/greybus/greybus_protocols.h   | 1 +
 drivers/staging/greybus/greybus_trace.h   | 1 +
 drivers/staging/greybus/hd.c  | 1 +
 drivers/staging/greybus/hd.h  | 1 +
 drivers/staging/greybus/hid.c | 1 +
 drivers/staging/greybus/i2c.c | 1 +
 drivers/staging/greybus/interface.c   | 1 +
 drivers/staging/greybus/interface.h   | 1 +
 drivers/staging/greybus/light.c   | 1 +
 drivers/staging/greybus/log.c | 1 +
 drivers/staging/greybus/loopback.c| 1 +
 drivers/staging/greybus/manifest.c| 1 +
 drivers/staging/greybus/manifest.h| 1 +
 drivers/staging/greybus/module.c  | 1 +
 drivers/staging/greybus/module.h

Re: [PATCH 7/8] staging: ccree: remove compare to none zero

[Dan Carpenter]

On Tue, Nov 07, 2017 at 09:40:03AM +, Gilad Ben-Yossef wrote:
> diff --git a/drivers/staging/ccree/ssi_aead.c 
> b/drivers/staging/ccree/ssi_aead.c
> index f1a3976..e9d03ee 100644
> --- a/drivers/staging/ccree/ssi_aead.c
> +++ b/drivers/staging/ccree/ssi_aead.c
> @@ -240,7 +240,7 @@ static void ssi_aead_complete(struct device *dev, void 
> *ssi_req, void __iomem *c
>  
>   if (areq_ctx->gen_ctx.op_type == DRV_CRYPTO_DIRECTION_DECRYPT) {
>   if (memcmp(areq_ctx->mac_buf, areq_ctx->icv_virt_addr,
> -ctx->authsize) != 0) {
> +ctx->authsize)) {

Keep the != for *cmp functions.  It makes it way more readable.  The
idiom is:

if (memcmp(a, b, size) != 0)  <-- this means a != b
if (memcmp(a, b, size) < 0)   <-- this means a < b
if (memcmp(a, b, size) == 0)  <-- this means a == b

>   dev_dbg(dev, "Payload authentication failure, 
> (auth-size=%d, cipher=%d)\n",
>   ctx->authsize, ctx->cipher_mode);
>   /* In case of payload authentication failure, MUST NOT
> @@ -458,7 +458,7 @@ ssi_get_plain_hmac_key(struct crypto_aead *tfm, const u8 
> *key, unsigned int keyl
>   hashmode = DRV_HASH_HW_SHA256;
>   }
>  
> - if (likely(keylen != 0)) {
> + if (likely(keylen)) {

You can keep the zero here as well if you want.  keylen is a number and
zero is a number.  If you want to remove it that's fine too.

>   key_dma_addr = dma_map_single(dev, (void *)key, keylen, 
> DMA_TO_DEVICE);
>   if (unlikely(dma_mapping_error(dev, key_dma_addr))) {
>   dev_err(dev, "Mapping key va=0x%p len=%u for DMA 
> failed\n",
> @@ -517,7 +517,7 @@ ssi_get_plain_hmac_key(struct crypto_aead *tfm, const u8 
> *key, unsigned int keyl
> keylen, NS_BIT, 0);
>   idx++;
>  
> - if ((blocksize - keylen) != 0) {
> + if (blocksize - keylen) {

Same.  Numbers can be compared to zero and it's fine.

>   hw_desc_init([idx]);
>   set_din_const([idx], 0,
> (blocksize - keylen));
> @@ -539,10 +539,10 @@ ssi_get_plain_hmac_key(struct crypto_aead *tfm, const 
> u8 *key, unsigned int keyl
>   }
>  
>   rc = send_request(ctx->drvdata, _req, desc, idx, 0);
> - if (unlikely(rc != 0))
> + if (unlikely(rc))

Where-as for these ones "rc" is not a number we can use for math so the
!= 0 is just a double negative and slightly confusing, so removing it
is the right thing.

regards,
dan carpenter

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

[PATCH] staging: rtlwifi: rtlwifi: use ktime_get_real_seconds() for suspend time

[Arnd Bergmann]

do_gettimeofday() is deprecated and slower than necessary for the purpose
of reading the seconds. This changes rtl_op_suspend/resume to use
ktime_get_real_seconds() instead, which is simpler and avoids confusion
about whether it is y2038-safe or not.

Signed-off-by: Arnd Bergmann 
---
This duplicates what I did for the regular (non-staging) rtlwifi driver
---
 drivers/staging/rtlwifi/core.c | 8 ++--
 drivers/staging/rtlwifi/wifi.h | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/rtlwifi/core.c b/drivers/staging/rtlwifi/core.c
index b00e51df984f..a43d37452e8b 100644
--- a/drivers/staging/rtlwifi/core.c
+++ b/drivers/staging/rtlwifi/core.c
@@ -509,15 +509,13 @@ static int rtl_op_suspend(struct ieee80211_hw *hw,
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-   struct timeval ts;
 
RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, "\n");
if (WARN_ON(!wow))
return -EINVAL;
 
/* to resolve s4 can not wake up*/
-   do_gettimeofday();
-   rtlhal->last_suspend_sec = ts.tv_sec;
+   rtlhal->last_suspend_sec = ktime_get_real_seconds();
 
if ((ppsc->wo_wlan_mode & WAKE_ON_PATTERN_MATCH) && wow->n_patterns)
_rtl_add_wowlan_patterns(hw, wow);
@@ -536,7 +534,6 @@ static int rtl_op_resume(struct ieee80211_hw *hw)
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-   struct timeval ts;
 
RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, "\n");
rtlhal->driver_is_goingto_unload = false;
@@ -544,8 +541,7 @@ static int rtl_op_resume(struct ieee80211_hw *hw)
rtlhal->wake_from_pnp_sleep = true;
 
/* to resovle s4 can not wake up*/
-   do_gettimeofday();
-   if (ts.tv_sec - rtlhal->last_suspend_sec < 5)
+   if (ktime_get_real_seconds() - rtlhal->last_suspend_sec < 5)
return -1;
 
rtl_op_start(hw);
diff --git a/drivers/staging/rtlwifi/wifi.h b/drivers/staging/rtlwifi/wifi.h
index eb91c130b245..ca0243fa2e66 100644
--- a/drivers/staging/rtlwifi/wifi.h
+++ b/drivers/staging/rtlwifi/wifi.h
@@ -1670,7 +1670,7 @@ struct rtl_hal {
bool enter_pnp_sleep;
bool wake_from_pnp_sleep;
bool wow_enabled;
-   __kernel_time_t last_suspend_sec;
+   time64_t last_suspend_sec;
u32 wowlan_fwsize;
u8 *wowlan_firmware;
 
-- 
2.9.0

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

Re: [PATCH 6/8] staging: ccree: simplify pm manager using local var

[Dan Carpenter]

On Tue, Nov 07, 2017 at 09:40:02AM +, Gilad Ben-Yossef wrote:
> --- a/drivers/staging/ccree/ssi_pm.c
> +++ b/drivers/staging/ccree/ssi_pm.c
> @@ -90,20 +90,24 @@ int cc_pm_resume(struct device *dev)
>  int cc_pm_get(struct device *dev)
>  {
>   int rc = 0;
> + struct ssi_drvdata *drvdata =
> + (struct ssi_drvdata *)dev_get_drvdata(dev);

No need to cast:

struct ssi_drvdata *drvdata = dev_get_drvdata(dev);


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

Re: [PATCH 5/8] staging: ccree: fold common code into function

[Dan Carpenter]

On Tue, Nov 07, 2017 at 09:40:01AM +, Gilad Ben-Yossef wrote:
> @@ -669,21 +690,12 @@ void cc_unmap_aead_request(struct device *dev, struct 
> aead_request *req)
>   }
>   if (drvdata->coherent &&
>   (areq_ctx->gen_ctx.op_type == DRV_CRYPTO_DIRECTION_DECRYPT) &&
> - likely(req->src == req->dst)) {
> - u32 size_to_skip = req->assoclen;
> -
> - if (areq_ctx->is_gcm4543)
> - size_to_skip += crypto_aead_ivsize(tfm);
> + likely(req->src == req->dst))

Don't remove the curly braces from this one.  Multi-line indents get
curly braces for readability.

>  
> - /* copy mac to a temporary location to deal with possible
> + /* copy back mac from temporary location to deal with possible
>* data memory overriding that caused by cache coherence 
> problem.
>*/
> - cc_copy_sg_portion(dev, areq_ctx->backup_mac, req->src,
> -(size_to_skip + req->cryptlen -
> - areq_ctx->req_authsize),
> -(size_to_skip + req->cryptlen),
> -SSI_SG_FROM_BUF);
> - }
> + cc_copy_mac(dev, req, SSI_SG_FROM_BUF);
>  }

regards,
dan carpenter

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

Re: [PATCH 3/8] staging: ccree: simplify AEAD using local var

[Dan Carpenter]

On Tue, Nov 07, 2017 at 09:39:59AM +, Gilad Ben-Yossef wrote:
> Make the code more readable by using a local variable
> for commonly use expression in the AEAD part of the driver.
> 
> Signed-off-by: Gilad Ben-Yossef 
> ---
>  drivers/staging/ccree/ssi_aead.c | 10 --
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/ccree/ssi_aead.c 
> b/drivers/staging/ccree/ssi_aead.c
> index 0b5b230..f1a3976 100644
> --- a/drivers/staging/ccree/ssi_aead.c
> +++ b/drivers/staging/ccree/ssi_aead.c
> @@ -251,13 +251,11 @@ static void ssi_aead_complete(struct device *dev, void 
> *ssi_req, void __iomem *c
>   }
>   } else { /*ENCRYPT*/
>   if (unlikely(areq_ctx->is_icv_fragmented)) {
> + u32 loc = areq->cryptlen + areq_ctx->dst_offset;

"loc" isn't a very canonical name.  At first I thought this was "pos"
or maybe "end" but now I'm thinking this is "skip"?  I don't know what
this variable is.

> +
>   cc_copy_sg_portion(dev, areq_ctx->mac_buf,
> -areq_ctx->dst_sgl,
> -(areq->cryptlen +
> - areq_ctx->dst_offset),
> -(areq->cryptlen +
> - areq_ctx->dst_offset +
> - ctx->authsize),
> +areq_ctx->dst_sgl, loc,
> +(loc + ctx->authsize),
>  SSI_SG_FROM_BUF);
>   }

regards,
dan carpenter

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

Re: [PATCH 2/8] staging: ccree: use more readable func names

[Dan Carpenter]

On Tue, Nov 07, 2017 at 09:39:58AM +, Gilad Ben-Yossef wrote:
> @@ -780,11 +766,10 @@ static inline int ssi_buffer_mgr_aead_chain_iv(
>   unsigned int iv_size_to_authenc = crypto_aead_ivsize(tfm);
>   unsigned int iv_ofs = GCM_BLOCK_RFC4_IV_OFFSET;
>   /* Chain to given list */
> - ssi_buffer_mgr_add_buffer_entry(
> - dev, sg_data,
> - areq_ctx->gen_ctx.iv_dma_addr + iv_ofs,
> - iv_size_to_authenc, is_last,
> - _ctx->assoc.mlli_nents);
> + cc_add_buffer_entry(dev, sg_data,
> + (areq_ctx->gen_ctx.iv_dma_addr + iv_ofs),
^  ^

No need to resend the patch, but you've added parenthesis here that
weren't in the original code and in other places you fixed up some long
line warnings.  I'd prefer if you didn't do that because I use scripts
to review rename patches automatically and since these are not a rename
so it means I have to review them manually.  Also in that patch that
Tobin complained about you had some extra comment changes and some were
related to the API but some were just reformatted to fit in 80 chars.

In this sample, you've re-indented the code a bit to align correctly.
That would be mandatory especially if the original code had aligned
correctly so that's fine.  But otherwise try to be strict about the one
thing per patch.

> + iv_size_to_authenc, is_last,
> + _ctx->assoc.mlli_nents);
>   areq_ctx->assoc_buff_type = SSI_DMA_BUF_MLLI;
>   }
>  

regards,
dan carpenter

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

[PATCH 7/8] staging: ccree: remove compare to none zero

[Gilad Ben-Yossef]

The driver was full of code checking "if (x != 0)".
Replace by "if (x)" for better readability.

Signed-off-by: Gilad Ben-Yossef 
---
 drivers/staging/ccree/ssi_aead.c| 34 +++---
 drivers/staging/ccree/ssi_buffer_mgr.c  | 74 ++---
 drivers/staging/ccree/ssi_cipher.c  | 14 +++---
 drivers/staging/ccree/ssi_driver.c  | 34 +++---
 drivers/staging/ccree/ssi_hash.c| 82 -
 drivers/staging/ccree/ssi_ivgen.c   |  2 +-
 drivers/staging/ccree/ssi_pm.c  |  8 ++--
 drivers/staging/ccree/ssi_request_mgr.c | 12 ++---
 drivers/staging/ccree/ssi_sram_mgr.c|  2 +-
 9 files changed, 131 insertions(+), 131 deletions(-)

diff --git a/drivers/staging/ccree/ssi_aead.c b/drivers/staging/ccree/ssi_aead.c
index f1a3976..e9d03ee 100644
--- a/drivers/staging/ccree/ssi_aead.c
+++ b/drivers/staging/ccree/ssi_aead.c
@@ -240,7 +240,7 @@ static void ssi_aead_complete(struct device *dev, void 
*ssi_req, void __iomem *c
 
if (areq_ctx->gen_ctx.op_type == DRV_CRYPTO_DIRECTION_DECRYPT) {
if (memcmp(areq_ctx->mac_buf, areq_ctx->icv_virt_addr,
-  ctx->authsize) != 0) {
+  ctx->authsize)) {
dev_dbg(dev, "Payload authentication failure, 
(auth-size=%d, cipher=%d)\n",
ctx->authsize, ctx->cipher_mode);
/* In case of payload authentication failure, MUST NOT
@@ -458,7 +458,7 @@ ssi_get_plain_hmac_key(struct crypto_aead *tfm, const u8 
*key, unsigned int keyl
hashmode = DRV_HASH_HW_SHA256;
}
 
-   if (likely(keylen != 0)) {
+   if (likely(keylen)) {
key_dma_addr = dma_map_single(dev, (void *)key, keylen, 
DMA_TO_DEVICE);
if (unlikely(dma_mapping_error(dev, key_dma_addr))) {
dev_err(dev, "Mapping key va=0x%p len=%u for DMA 
failed\n",
@@ -517,7 +517,7 @@ ssi_get_plain_hmac_key(struct crypto_aead *tfm, const u8 
*key, unsigned int keyl
  keylen, NS_BIT, 0);
idx++;
 
-   if ((blocksize - keylen) != 0) {
+   if (blocksize - keylen) {
hw_desc_init([idx]);
set_din_const([idx], 0,
  (blocksize - keylen));
@@ -539,10 +539,10 @@ ssi_get_plain_hmac_key(struct crypto_aead *tfm, const u8 
*key, unsigned int keyl
}
 
rc = send_request(ctx->drvdata, _req, desc, idx, 0);
-   if (unlikely(rc != 0))
+   if (unlikely(rc))
dev_err(dev, "send_request() failed (rc=%d)\n", rc);
 
-   if (likely(key_dma_addr != 0))
+   if (likely(key_dma_addr))
dma_unmap_single(dev, key_dma_addr, keylen, DMA_TO_DEVICE);
 
return rc;
@@ -598,7 +598,7 @@ ssi_aead_setkey(struct crypto_aead *tfm, const u8 *key, 
unsigned int keylen)
}
 
rc = validate_keys_sizes(ctx);
-   if (unlikely(rc != 0))
+   if (unlikely(rc))
goto badkey;
 
/* STAT_PHASE_1: Copy key to ctx */
@@ -611,7 +611,7 @@ ssi_aead_setkey(struct crypto_aead *tfm, const u8 *key, 
unsigned int keylen)
memcpy(ctx->auth_state.xcbc.xcbc_keys, key, ctx->auth_keylen);
} else if (ctx->auth_mode != DRV_HASH_NULL) { /* HMAC */
rc = ssi_get_plain_hmac_key(tfm, key, ctx->auth_keylen);
-   if (rc != 0)
+   if (rc)
goto badkey;
}
 
@@ -637,7 +637,7 @@ ssi_aead_setkey(struct crypto_aead *tfm, const u8 *key, 
unsigned int keylen)
 
if (seq_len > 0) { /* For CCM there is no sequence to setup the key */
rc = send_request(ctx->drvdata, _req, desc, seq_len, 0);
-   if (unlikely(rc != 0)) {
+   if (unlikely(rc)) {
dev_err(dev, "send_request() failed (rc=%d)\n", rc);
goto setkey_error;
}
@@ -1520,7 +1520,7 @@ static inline int ssi_aead_ccm(
}
 
/* process the cipher */
-   if (req_ctx->cryptlen != 0)
+   if (req_ctx->cryptlen)
ssi_aead_process_cipher_data_desc(req, cipher_flow_mode, desc, 
);
 
/* Read temporal MAC */
@@ -1602,7 +1602,7 @@ static int config_ccm_adata(struct aead_request *req)
*b0 |= 64;  /* Enable bit 6 if Adata exists. */
 
rc = set_msg_len(b0 + 16 - l, cryptlen, l);  /* Write L'. */
-   if (rc != 0) {
+   if (rc) {
dev_err(dev, "message len overflow detected");
return rc;
}
@@ -1739,7 +1739,7 @@ static inline void ssi_aead_gcm_setup_gctr_desc(
set_flow_mode([idx], S_DIN_to_AES);
idx++;
 
-   if ((req_ctx->cryptlen != 0) && 
(!req_ctx->plaintext_authenticate_only)) {
+   if (req_ctx->cryptlen && 

[PATCH 5/8] staging: ccree: fold common code into function

[Gilad Ben-Yossef]

Fold common code copying MAC to/from a temp. buffer
into an inline function instead of keeping multiple
open coded versions of same.

Signed-off-by: Gilad Ben-Yossef 
---
 drivers/staging/ccree/ssi_buffer_mgr.c | 92 ++
 1 file changed, 38 insertions(+), 54 deletions(-)

diff --git a/drivers/staging/ccree/ssi_buffer_mgr.c 
b/drivers/staging/ccree/ssi_buffer_mgr.c
index b3ca249..f3076f3 100644
--- a/drivers/staging/ccree/ssi_buffer_mgr.c
+++ b/drivers/staging/ccree/ssi_buffer_mgr.c
@@ -65,6 +65,27 @@ struct buffer_array {
 };
 
 /**
+ * cc_copy_mac() - Copy MAC to temporary location
+ *
+ * @dev: device object
+ * @req: aead request object
+ * @dir: [IN] copy from/to sgl
+ */
+static inline void cc_copy_mac(struct device *dev, struct aead_request *req,
+  enum ssi_sg_cpy_direct dir)
+{
+   struct aead_req_ctx *areq_ctx = aead_request_ctx(req);
+   struct crypto_aead *tfm = crypto_aead_reqtfm(req);
+   u32 skip = req->assoclen + req->cryptlen;
+
+   if (areq_ctx->is_gcm4543)
+   skip += crypto_aead_ivsize(tfm);
+
+   cc_copy_sg_portion(dev, areq_ctx->backup_mac, req->src,
+  (skip - areq_ctx->req_authsize), skip, dir);
+}
+
+/**
  * cc_get_sgl_nents() - Get scatterlist number of entries.
  *
  * @sg_list: SG list
@@ -669,21 +690,12 @@ void cc_unmap_aead_request(struct device *dev, struct 
aead_request *req)
}
if (drvdata->coherent &&
(areq_ctx->gen_ctx.op_type == DRV_CRYPTO_DIRECTION_DECRYPT) &&
-   likely(req->src == req->dst)) {
-   u32 size_to_skip = req->assoclen;
-
-   if (areq_ctx->is_gcm4543)
-   size_to_skip += crypto_aead_ivsize(tfm);
+   likely(req->src == req->dst))
 
-   /* copy mac to a temporary location to deal with possible
+   /* copy back mac from temporary location to deal with possible
 * data memory overriding that caused by cache coherence 
problem.
 */
-   cc_copy_sg_portion(dev, areq_ctx->backup_mac, req->src,
-  (size_to_skip + req->cryptlen -
-   areq_ctx->req_authsize),
-  (size_to_skip + req->cryptlen),
-  SSI_SG_FROM_BUF);
-   }
+   cc_copy_mac(dev, req, SSI_SG_FROM_BUF);
 }
 
 static inline int cc_get_aead_icv_nents(
@@ -918,7 +930,6 @@ static inline int cc_prepare_aead_data_mlli(
enum drv_crypto_direction direct = areq_ctx->gen_ctx.op_type;
unsigned int authsize = areq_ctx->req_authsize;
int rc = 0, icv_nents;
-   struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct device *dev = drvdata_to_dev(drvdata);
 
if (likely(req->src == req->dst)) {
@@ -943,24 +954,14 @@ static inline int cc_prepare_aead_data_mlli(
 * MAC verification upon request completion
 */
if (direct == DRV_CRYPTO_DIRECTION_DECRYPT) {
-   if (!drvdata->coherent) {
/* In coherent platforms (e.g. ACP)
 * already copying ICV for any
 * INPLACE-DECRYPT operation, hence
 * we must neglect this code.
 */
-   u32 skip = req->assoclen;
-
-   if (areq_ctx->is_gcm4543)
-   skip += crypto_aead_ivsize(tfm);
-
-   cc_copy_sg_portion(dev,
-  areq_ctx->backup_mac,
-  req->src,
-  (skip + 
req->cryptlen - areq_ctx->req_authsize),
-  (skip + 
req->cryptlen),
-  SSI_SG_TO_BUF);
-   }
+   if (!drvdata->coherent)
+   cc_copy_mac(dev, req, SSI_SG_TO_BUF);
+
areq_ctx->icv_virt_addr = areq_ctx->backup_mac;
} else {
areq_ctx->icv_virt_addr = areq_ctx->mac_buf;
@@ -996,22 +997,14 @@ static inline int cc_prepare_aead_data_mlli(
goto prepare_data_mlli_exit;
}
 
+   /* Backup happens only when ICV is fragmented, ICV
+* verification is made by CPU compare in order to simplify
+* MAC verification upon request completion
+*/
if (unlikely(areq_ctx->is_icv_fragmented)) {
-   /* 

[PATCH 4/8] staging: ccree: simplify buf mgr using local vars

[Gilad Ben-Yossef]

Make the code more readable by using a local variables
for commonly use expressions in the buffer manager part
of the driver.

Signed-off-by: Gilad Ben-Yossef 
---
 drivers/staging/ccree/ssi_buffer_mgr.c | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/ccree/ssi_buffer_mgr.c 
b/drivers/staging/ccree/ssi_buffer_mgr.c
index 2d971f2..b3ca249 100644
--- a/drivers/staging/ccree/ssi_buffer_mgr.c
+++ b/drivers/staging/ccree/ssi_buffer_mgr.c
@@ -225,16 +225,18 @@ static int cc_generate_mlli(
mlli_p = (u32 *)mlli_params->mlli_virt_addr;
/* go over all SG's and link it to one MLLI table */
for (i = 0; i < sg_data->num_of_buffers; i++) {
+   union buffer_array_entry *entry = _data->entry[i];
+   u32 tot_len = sg_data->total_data_len[i];
+   u32 offset = sg_data->offset[i];
+
if (sg_data->type[i] == DMA_SGL_TYPE)
-   rc = cc_render_sg_to_mlli(dev, sg_data->entry[i].sgl,
- sg_data->total_data_len[i],
- sg_data->offset[i],
- _nents, _p);
+   rc = cc_render_sg_to_mlli(dev, entry->sgl, tot_len,
+ offset, _nents,
+ _p);
else /*DMA_BUFF_TYPE*/
-   rc = cc_render_buff_to_mlli(dev,
-   
sg_data->entry[i].buffer_dma,
-   sg_data->total_data_len[i],
-   _nents, _p);
+   rc = cc_render_buff_to_mlli(dev, entry->buffer_dma,
+   tot_len, _nents,
+   _p);
if (rc != 0)
return rc;
 
-- 
2.7.4

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

[PATCH 8/8] staging: ccree: remove braces for single statement

[Gilad Ben-Yossef]

Remove necessary braces for single statement blocks to
improve code readabilty.

Signed-off-by: Gilad Ben-Yossef 
---
 drivers/staging/ccree/ssi_buffer_mgr.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/ccree/ssi_buffer_mgr.c 
b/drivers/staging/ccree/ssi_buffer_mgr.c
index 838e973..3418c64 100644
--- a/drivers/staging/ccree/ssi_buffer_mgr.c
+++ b/drivers/staging/ccree/ssi_buffer_mgr.c
@@ -1490,9 +1490,8 @@ int cc_map_hash_request_final(struct ssi_drvdata 
*drvdata, void *ctx,
/* add the src data to the sg_data */
cc_add_sg_entry(dev, _data, areq_ctx->in_nents, src, nbytes,
0, true, _ctx->mlli_nents);
-   if (unlikely(cc_generate_mlli(dev, _data, mlli_params))) {
+   if (unlikely(cc_generate_mlli(dev, _data, mlli_params)))
goto fail_unmap_din;
-   }
}
/* change the buffer index for the unmap function */
areq_ctx->buff_index = (areq_ctx->buff_index ^ 1);
@@ -1609,9 +1608,8 @@ int cc_map_hash_request_update(struct ssi_drvdata 
*drvdata, void *ctx,
cc_add_sg_entry(dev, _data, areq_ctx->in_nents, src,
(update_data_len - *curr_buff_cnt), 0, true,
_ctx->mlli_nents);
-   if (unlikely(cc_generate_mlli(dev, _data, mlli_params))) {
+   if (unlikely(cc_generate_mlli(dev, _data, mlli_params)))
goto fail_unmap_din;
-   }
}
areq_ctx->buff_index = (areq_ctx->buff_index ^ swap_index);
 
-- 
2.7.4

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

[PATCH 3/8] staging: ccree: simplify AEAD using local var

[Gilad Ben-Yossef]

Make the code more readable by using a local variable
for commonly use expression in the AEAD part of the driver.

Signed-off-by: Gilad Ben-Yossef 
---
 drivers/staging/ccree/ssi_aead.c | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/ccree/ssi_aead.c b/drivers/staging/ccree/ssi_aead.c
index 0b5b230..f1a3976 100644
--- a/drivers/staging/ccree/ssi_aead.c
+++ b/drivers/staging/ccree/ssi_aead.c
@@ -251,13 +251,11 @@ static void ssi_aead_complete(struct device *dev, void 
*ssi_req, void __iomem *c
}
} else { /*ENCRYPT*/
if (unlikely(areq_ctx->is_icv_fragmented)) {
+   u32 loc = areq->cryptlen + areq_ctx->dst_offset;
+
cc_copy_sg_portion(dev, areq_ctx->mac_buf,
-  areq_ctx->dst_sgl,
-  (areq->cryptlen +
-   areq_ctx->dst_offset),
-  (areq->cryptlen +
-   areq_ctx->dst_offset +
-   ctx->authsize),
+  areq_ctx->dst_sgl, loc,
+  (loc + ctx->authsize),
   SSI_SG_FROM_BUF);
}
 
-- 
2.7.4

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

[PATCH 6/8] staging: ccree: simplify pm manager using local var

[Gilad Ben-Yossef]

Make the code more readable by using a local variable.

Signed-off-by: Gilad Ben-Yossef 
---
 drivers/staging/ccree/ssi_pm.c | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/ccree/ssi_pm.c b/drivers/staging/ccree/ssi_pm.c
index e1bc4c5..d60143c 100644
--- a/drivers/staging/ccree/ssi_pm.c
+++ b/drivers/staging/ccree/ssi_pm.c
@@ -90,20 +90,24 @@ int cc_pm_resume(struct device *dev)
 int cc_pm_get(struct device *dev)
 {
int rc = 0;
+   struct ssi_drvdata *drvdata =
+   (struct ssi_drvdata *)dev_get_drvdata(dev);
 
-   if (cc_req_queue_suspended((struct ssi_drvdata *)dev_get_drvdata(dev))) 
{
+   if (cc_req_queue_suspended(drvdata))
rc = pm_runtime_get_sync(dev);
-   } else {
+   else
pm_runtime_get_noresume(dev);
-   }
+
return rc;
 }
 
 int cc_pm_put_suspend(struct device *dev)
 {
int rc = 0;
+   struct ssi_drvdata *drvdata =
+   (struct ssi_drvdata *)dev_get_drvdata(dev);
 
-   if (!cc_req_queue_suspended((struct ssi_drvdata 
*)dev_get_drvdata(dev))) {
+   if (!cc_req_queue_suspended(drvdata)) {
pm_runtime_mark_last_busy(dev);
rc = pm_runtime_put_autosuspend(dev);
} else {
-- 
2.7.4

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

[PATCH 2/8] staging: ccree: use more readable func names

[Gilad Ben-Yossef]

The driver was using a function naming scheme
including common prefixes for driver global
functions based on the code module they came from.

The combination of long names with long common
prefixes made the whole thing hard for a human
to parse.

Make the semantic change of switching to simple
function naming scheme and shorten function
name for better readabilty.

Signed-off-by: Gilad Ben-Yossef 
---
 drivers/staging/ccree/ssi_aead.c|  32 +--
 drivers/staging/ccree/ssi_buffer_mgr.c  | 430 ++--
 drivers/staging/ccree/ssi_buffer_mgr.h  |  49 ++--
 drivers/staging/ccree/ssi_cipher.c  |  13 +-
 drivers/staging/ccree/ssi_driver.c  |  18 +-
 drivers/staging/ccree/ssi_hash.c| 116 +
 drivers/staging/ccree/ssi_ivgen.c   |   2 +-
 drivers/staging/ccree/ssi_pm.c  |  26 +-
 drivers/staging/ccree/ssi_pm.h  |  12 +-
 drivers/staging/ccree/ssi_request_mgr.c |  16 +-
 drivers/staging/ccree/ssi_request_mgr.h |   6 +-
 drivers/staging/ccree/ssi_sram_mgr.c|  11 +-
 drivers/staging/ccree/ssi_sram_mgr.h|   6 +-
 13 files changed, 345 insertions(+), 392 deletions(-)

diff --git a/drivers/staging/ccree/ssi_aead.c b/drivers/staging/ccree/ssi_aead.c
index ba0954e..0b5b230 100644
--- a/drivers/staging/ccree/ssi_aead.c
+++ b/drivers/staging/ccree/ssi_aead.c
@@ -233,7 +233,7 @@ static void ssi_aead_complete(struct device *dev, void 
*ssi_req, void __iomem *c
struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
int err = 0;
 
-   ssi_buffer_mgr_unmap_aead_request(dev, areq);
+   cc_unmap_aead_request(dev, areq);
 
/* Restore ordinary iv pointer */
areq->iv = areq_ctx->backup_iv;
@@ -246,17 +246,20 @@ static void ssi_aead_complete(struct device *dev, void 
*ssi_req, void __iomem *c
/* In case of payload authentication failure, MUST NOT
 * revealed the decrypted message --> zero its memory.
 */
-   ssi_buffer_mgr_zero_sgl(areq->dst, areq_ctx->cryptlen);
+   cc_zero_sgl(areq->dst, areq_ctx->cryptlen);
err = -EBADMSG;
}
} else { /*ENCRYPT*/
-   if (unlikely(areq_ctx->is_icv_fragmented))
-   ssi_buffer_mgr_copy_scatterlist_portion(
-   dev, areq_ctx->mac_buf, areq_ctx->dst_sgl,
-   areq->cryptlen + areq_ctx->dst_offset,
-   (areq->cryptlen + areq_ctx->dst_offset +
-ctx->authsize),
-   SSI_SG_FROM_BUF);
+   if (unlikely(areq_ctx->is_icv_fragmented)) {
+   cc_copy_sg_portion(dev, areq_ctx->mac_buf,
+  areq_ctx->dst_sgl,
+  (areq->cryptlen +
+   areq_ctx->dst_offset),
+  (areq->cryptlen +
+   areq_ctx->dst_offset +
+   ctx->authsize),
+  SSI_SG_FROM_BUF);
+   }
 
/* If an IV was generated, copy it back to the user provided 
buffer. */
if (areq_ctx->backup_giv) {
@@ -2053,7 +2056,7 @@ static int ssi_aead_process(struct aead_request *req, 
enum drv_crypto_direction
}
 #endif /*SSI_CC_HAS_AES_GCM*/
 
-   rc = ssi_buffer_mgr_map_aead_request(ctx->drvdata, req);
+   rc = cc_map_aead_request(ctx->drvdata, req);
if (unlikely(rc != 0)) {
dev_err(dev, "map_request() failed\n");
goto exit;
@@ -2112,7 +2115,7 @@ static int ssi_aead_process(struct aead_request *req, 
enum drv_crypto_direction
 #endif
default:
dev_err(dev, "Unsupported authenc (%d)\n", ctx->auth_mode);
-   ssi_buffer_mgr_unmap_aead_request(dev, req);
+   cc_unmap_aead_request(dev, req);
rc = -ENOTSUPP;
goto exit;
}
@@ -2123,7 +2126,7 @@ static int ssi_aead_process(struct aead_request *req, 
enum drv_crypto_direction
 
if (unlikely(rc != -EINPROGRESS)) {
dev_err(dev, "send_request() failed (rc=%d)\n", rc);
-   ssi_buffer_mgr_unmap_aead_request(dev, req);
+   cc_unmap_aead_request(dev, req);
}
 
 exit:
@@ -2753,8 +2756,9 @@ int ssi_aead_alloc(struct ssi_drvdata *drvdata)
INIT_LIST_HEAD(_handle->aead_list);
drvdata->aead_handle = aead_handle;
 
-   aead_handle->sram_workspace_addr = ssi_sram_mgr_alloc(
-   drvdata, MAX_HMAC_DIGEST_SIZE);
+   aead_handle->sram_workspace_addr = cc_sram_alloc(drvdata,
+MAX_HMAC_DIGEST_SIZE);
+
if (aead_handle->sram_workspace_addr == 

[PATCH 1/8] staging: ccree: fix leak of import() after init()

[Gilad Ben-Yossef]

crypto_ahash_import() may be called either after
crypto_ahash_init() or without such call. Right now
we always internally call init() as part of
import(), thus leaking memory and mappings if the
user has already called init() herself.

Fix this by only calling init() internally if the
state is not already initialized.

Fixes: commit 454527d0d94f ("staging: ccree: fix hash import/export")
Cc: stable 
Signed-off-by: Gilad Ben-Yossef 
---
 drivers/staging/ccree/ssi_hash.c | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/ccree/ssi_hash.c b/drivers/staging/ccree/ssi_hash.c
index d79090e..1799d3f 100644
--- a/drivers/staging/ccree/ssi_hash.c
+++ b/drivers/staging/ccree/ssi_hash.c
@@ -1778,9 +1778,12 @@ static int ssi_ahash_import(struct ahash_request *req, 
const void *in)
}
in += sizeof(u32);
 
-   rc = ssi_hash_init(state, ctx);
-   if (rc)
-   goto out;
+   /* call init() to allocate bufs if the user hasn't */
+   if (!state->digest_buff) {
+   rc = ssi_hash_init(state, ctx);
+   if (rc)
+   goto out;
+   }
 
dma_sync_single_for_cpu(dev, state->digest_buff_dma_addr,
ctx->inter_digestsize, DMA_BIDIRECTIONAL);
-- 
2.7.4

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

[PATCH 0/8] staging: ccree: fixes and cleanups

[Gilad Ben-Yossef]

This is another batch of ccree fixes & cleanups.

The first patch is a bug fix. All others are pure
readability and coding style fixes.

Gilad Ben-Yossef (8):
  staging: ccree: fix leak of import() after init()
  staging: ccree: use more readable func names
  staging: ccree: simplify AEAD using local var
  staging: ccree: simplify buf mgr using local vars
  staging: ccree: fold common code into function
  staging: ccree: simplify pm manager using local var
  staging: ccree: remove compare to none zero
  staging: ccree: remove braces for single statement

 drivers/staging/ccree/ssi_aead.c|  64 ++--
 drivers/staging/ccree/ssi_buffer_mgr.c  | 556 ++--
 drivers/staging/ccree/ssi_buffer_mgr.h  |  49 ++-
 drivers/staging/ccree/ssi_cipher.c  |  27 +-
 drivers/staging/ccree/ssi_driver.c  |  48 +--
 drivers/staging/ccree/ssi_hash.c| 195 +--
 drivers/staging/ccree/ssi_ivgen.c   |   4 +-
 drivers/staging/ccree/ssi_pm.c  |  42 +--
 drivers/staging/ccree/ssi_pm.h  |  12 +-
 drivers/staging/ccree/ssi_request_mgr.c |  24 +-
 drivers/staging/ccree/ssi_request_mgr.h |   6 +-
 drivers/staging/ccree/ssi_sram_mgr.c|  13 +-
 drivers/staging/ccree/ssi_sram_mgr.h|   6 +-
 13 files changed, 494 insertions(+), 552 deletions(-)

-- 
2.7.4

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