diff options
Diffstat (limited to 'drivers')
2258 files changed, 3157 insertions, 616 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 505c676fa9c7..1d7af3c2ff27 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | menu "Device Drivers" | 2 | menu "Device Drivers" |
| 2 | 3 | ||
| 3 | source "drivers/amba/Kconfig" | 4 | source "drivers/amba/Kconfig" |
diff --git a/drivers/Makefile b/drivers/Makefile index d90fdc413648..d242d3514d30 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux kernel device drivers. | 3 | # Makefile for the Linux kernel device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/accessibility/Kconfig b/drivers/accessibility/Kconfig index ef3b65bfdd0a..00f7512c9cf4 100644 --- a/drivers/accessibility/Kconfig +++ b/drivers/accessibility/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | menuconfig ACCESSIBILITY | 2 | menuconfig ACCESSIBILITY |
| 2 | bool "Accessibility support" | 3 | bool "Accessibility support" |
| 3 | ---help--- | 4 | ---help--- |
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 1ce52f84dc23..5b1938f4b626 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # ACPI Configuration | 3 | # ACPI Configuration |
| 3 | # | 4 | # |
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 90265ab4437a..cd1abc9bc325 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux ACPI interpreter | 3 | # Makefile for the Linux ACPI interpreter |
| 3 | # | 4 | # |
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile index 1709551bc4aa..e05232da0588 100644 --- a/drivers/acpi/acpica/Makefile +++ b/drivers/acpi/acpica/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for ACPICA Core interpreter | 3 | # Makefile for ACPICA Core interpreter |
| 3 | # | 4 | # |
diff --git a/drivers/acpi/apei/Kconfig b/drivers/acpi/apei/Kconfig index de14d49a5c90..52ae5438edeb 100644 --- a/drivers/acpi/apei/Kconfig +++ b/drivers/acpi/apei/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | config HAVE_ACPI_APEI | 2 | config HAVE_ACPI_APEI |
| 2 | bool | 3 | bool |
| 3 | 4 | ||
diff --git a/drivers/acpi/apei/Makefile b/drivers/acpi/apei/Makefile index e50573de25f1..4dfac2128737 100644 --- a/drivers/acpi/apei/Makefile +++ b/drivers/acpi/apei/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_ACPI_APEI) += apei.o | 2 | obj-$(CONFIG_ACPI_APEI) += apei.o |
| 2 | obj-$(CONFIG_ACPI_APEI_GHES) += ghes.o | 3 | obj-$(CONFIG_ACPI_APEI_GHES) += ghes.o |
| 3 | obj-$(CONFIG_ACPI_APEI_EINJ) += einj.o | 4 | obj-$(CONFIG_ACPI_APEI_EINJ) += einj.o |
diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h index cb4126051f62..1d6ef9654725 100644 --- a/drivers/acpi/apei/apei-internal.h +++ b/drivers/acpi/apei/apei-internal.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * apei-internal.h - ACPI Platform Error Interface internal | 3 | * apei-internal.h - ACPI Platform Error Interface internal |
| 3 | * definitions. | 4 | * definitions. |
diff --git a/drivers/acpi/battery.h b/drivers/acpi/battery.h index 6c084976987d..225f493d4c27 100644 --- a/drivers/acpi/battery.h +++ b/drivers/acpi/battery.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __ACPI_BATTERY_H | 2 | #ifndef __ACPI_BATTERY_H |
| 2 | #define __ACPI_BATTERY_H | 3 | #define __ACPI_BATTERY_H |
| 3 | 4 | ||
diff --git a/drivers/acpi/dptf/Kconfig b/drivers/acpi/dptf/Kconfig index ac0a6ed0cf46..90a2fd979282 100644 --- a/drivers/acpi/dptf/Kconfig +++ b/drivers/acpi/dptf/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | config DPTF_POWER | 2 | config DPTF_POWER |
| 2 | tristate "DPTF Platform Power Participant" | 3 | tristate "DPTF Platform Power Participant" |
| 3 | depends on X86 | 4 | depends on X86 |
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c index 7fceb3b4691b..5a127f3f2d5c 100644 --- a/drivers/acpi/event.c +++ b/drivers/acpi/event.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * event.c - exporting ACPI events via procfs | 3 | * event.c - exporting ACPI events via procfs |
| 3 | * | 4 | * |
diff --git a/drivers/acpi/nfit/Kconfig b/drivers/acpi/nfit/Kconfig index 929ba4da0b30..f7c57e33499e 100644 --- a/drivers/acpi/nfit/Kconfig +++ b/drivers/acpi/nfit/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | config ACPI_NFIT | 2 | config ACPI_NFIT |
| 2 | tristate "ACPI NVDIMM Firmware Interface Table (NFIT)" | 3 | tristate "ACPI NVDIMM Firmware Interface Table (NFIT)" |
| 3 | depends on PHYS_ADDR_T_64BIT | 4 | depends on PHYS_ADDR_T_64BIT |
diff --git a/drivers/acpi/pmic/intel_pmic.h b/drivers/acpi/pmic/intel_pmic.h index e8bfa7b865a5..095afc96952e 100644 --- a/drivers/acpi/pmic/intel_pmic.h +++ b/drivers/acpi/pmic/intel_pmic.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __INTEL_PMIC_H | 2 | #ifndef __INTEL_PMIC_H |
| 2 | #define __INTEL_PMIC_H | 3 | #define __INTEL_PMIC_H |
| 3 | 4 | ||
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c index 85ac848ac6ab..652f19e6c541 100644 --- a/drivers/acpi/proc.c +++ b/drivers/acpi/proc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/proc_fs.h> | 2 | #include <linux/proc_fs.h> |
| 2 | #include <linux/seq_file.h> | 3 | #include <linux/seq_file.h> |
| 3 | #include <linux/export.h> | 4 | #include <linux/export.h> |
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 2736e25e9dc6..d50a7b6ccddd 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -710,6 +710,8 @@ static DEFINE_RAW_SPINLOCK(c3_lock); | |||
| 710 | static void acpi_idle_enter_bm(struct acpi_processor *pr, | 710 | static void acpi_idle_enter_bm(struct acpi_processor *pr, |
| 711 | struct acpi_processor_cx *cx, bool timer_bc) | 711 | struct acpi_processor_cx *cx, bool timer_bc) |
| 712 | { | 712 | { |
| 713 | acpi_unlazy_tlb(smp_processor_id()); | ||
| 714 | |||
| 713 | /* | 715 | /* |
| 714 | * Must be done before busmaster disable as we might need to | 716 | * Must be done before busmaster disable as we might need to |
| 715 | * access HPET ! | 717 | * access HPET ! |
diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c index 74f738cb6073..813f1b78c16a 100644 --- a/drivers/acpi/processor_pdc.c +++ b/drivers/acpi/processor_pdc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 2005 Intel Corporation | 3 | * Copyright (C) 2005 Intel Corporation |
| 3 | * Copyright (C) 2009 Hewlett-Packard Development Company, L.P. | 4 | * Copyright (C) 2009 Hewlett-Packard Development Company, L.P. |
diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c index a6c77e8b37bd..71769fd687b2 100644 --- a/drivers/acpi/reboot.c +++ b/drivers/acpi/reboot.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | #include <linux/pci.h> | 3 | #include <linux/pci.h> |
| 3 | #include <linux/acpi.h> | 4 | #include <linux/acpi.h> |
diff --git a/drivers/acpi/sbshc.h b/drivers/acpi/sbshc.h index a57b0762dd7f..06372a37df10 100644 --- a/drivers/acpi/sbshc.h +++ b/drivers/acpi/sbshc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | struct acpi_smb_hc; | 2 | struct acpi_smb_hc; |
| 2 | enum acpi_smb_protocol { | 3 | enum acpi_smb_protocol { |
| 3 | SMBUS_WRITE_QUICK = 2, | 4 | SMBUS_WRITE_QUICK = 2, |
diff --git a/drivers/acpi/sleep.h b/drivers/acpi/sleep.h index a82ff74faf7a..41675d24a9bc 100644 --- a/drivers/acpi/sleep.h +++ b/drivers/acpi/sleep.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | extern void acpi_enable_wakeup_devices(u8 sleep_state); | 3 | extern void acpi_enable_wakeup_devices(u8 sleep_state); |
| 3 | extern void acpi_disable_wakeup_devices(u8 sleep_state); | 4 | extern void acpi_disable_wakeup_devices(u8 sleep_state); |
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c index 78a5a23010ab..0fd57bf33524 100644 --- a/drivers/acpi/sysfs.c +++ b/drivers/acpi/sysfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * sysfs.c - ACPI sysfs interface to userspace. | 3 | * sysfs.c - ACPI sysfs interface to userspace. |
| 3 | */ | 4 | */ |
diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c index 1638401ab282..9614126bf56e 100644 --- a/drivers/acpi/wakeup.c +++ b/drivers/acpi/wakeup.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * wakeup.c - support wakeup devices | 3 | * wakeup.c - support wakeup devices |
| 3 | * Copyright (C) 2004 Li Shaohua <shaohua.li@intel.com> | 4 | * Copyright (C) 2004 Li Shaohua <shaohua.li@intel.com> |
diff --git a/drivers/amba/Kconfig b/drivers/amba/Kconfig index 294ba6f36396..fb6c7e0b4cce 100644 --- a/drivers/amba/Kconfig +++ b/drivers/amba/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | config ARM_AMBA | 2 | config ARM_AMBA |
| 2 | bool | 3 | bool |
| 3 | 4 | ||
diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig index 9801d852bd56..7dce3795b887 100644 --- a/drivers/android/Kconfig +++ b/drivers/android/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | menu "Android" | 2 | menu "Android" |
| 2 | 3 | ||
| 3 | config ANDROID | 4 | config ANDROID |
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 488c93724220..cb5339166563 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # SATA/PATA driver configuration | 3 | # SATA/PATA driver configuration |
| 3 | # | 4 | # |
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile index ff9cd2e37458..8daec3e657f8 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | obj-$(CONFIG_ATA) += libata.o | 3 | obj-$(CONFIG_ATA) += libata.o |
| 3 | 4 | ||
diff --git a/drivers/ata/libata-transport.h b/drivers/ata/libata-transport.h index 2820cf864f11..08a57fb9dc61 100644 --- a/drivers/ata/libata-transport.h +++ b/drivers/ata/libata-transport.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _LIBATA_TRANSPORT_H | 2 | #ifndef _LIBATA_TRANSPORT_H |
| 2 | #define _LIBATA_TRANSPORT_H | 3 | #define _LIBATA_TRANSPORT_H |
| 3 | 4 | ||
diff --git a/drivers/ata/libata-zpodd.c b/drivers/ata/libata-zpodd.c index 23a62e4015d0..de4ddd0e8550 100644 --- a/drivers/ata/libata-zpodd.c +++ b/drivers/ata/libata-zpodd.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/libata.h> | 2 | #include <linux/libata.h> |
| 2 | #include <linux/cdrom.h> | 3 | #include <linux/cdrom.h> |
| 3 | #include <linux/pm_runtime.h> | 4 | #include <linux/pm_runtime.h> |
diff --git a/drivers/ata/sata_gemini.h b/drivers/ata/sata_gemini.h index ca1837a394c8..6f6e691d6007 100644 --- a/drivers/ata/sata_gemini.h +++ b/drivers/ata/sata_gemini.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* Header for the Gemini SATA bridge */ | 2 | /* Header for the Gemini SATA bridge */ |
| 2 | #ifndef SATA_GEMINI_H | 3 | #ifndef SATA_GEMINI_H |
| 3 | #define SATA_GEMINI_H | 4 | #define SATA_GEMINI_H |
diff --git a/drivers/ata/sis.h b/drivers/ata/sis.h index f7f3eebe666c..0be49691fb24 100644 --- a/drivers/ata/sis.h +++ b/drivers/ata/sis.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | struct ata_port_info; | 3 | struct ata_port_info; |
| 3 | 4 | ||
diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig index 31c60101a69a..2e2efa577437 100644 --- a/drivers/atm/Kconfig +++ b/drivers/atm/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # ATM device configuration | 3 | # ATM device configuration |
| 3 | # | 4 | # |
diff --git a/drivers/atm/Makefile b/drivers/atm/Makefile index c6c9ee9f5da2..aa191616a72e 100644 --- a/drivers/atm/Makefile +++ b/drivers/atm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux network (ATM) device drivers. | 3 | # Makefile for the Linux network (ATM) device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/atm/eni.h b/drivers/atm/eni.h index 565e53a5cb78..de1ed802cbf8 100644 --- a/drivers/atm/eni.h +++ b/drivers/atm/eni.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* drivers/atm/eni.h - Efficient Networks ENI155P device driver declarations */ | 2 | /* drivers/atm/eni.h - Efficient Networks ENI155P device driver declarations */ |
| 2 | 3 | ||
| 3 | /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ | 4 | /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ |
diff --git a/drivers/atm/fore200e.h b/drivers/atm/fore200e.h index ba34a02b717d..c8a02c8fba15 100644 --- a/drivers/atm/fore200e.h +++ b/drivers/atm/fore200e.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _FORE200E_H | 2 | #ifndef _FORE200E_H |
| 2 | #define _FORE200E_H | 3 | #define _FORE200E_H |
| 3 | 4 | ||
diff --git a/drivers/atm/idt77105.h b/drivers/atm/idt77105.h index 3fd2bc899761..8dfea9e361de 100644 --- a/drivers/atm/idt77105.h +++ b/drivers/atm/idt77105.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* drivers/atm/idt77105.h - IDT77105 (PHY) declarations */ | 2 | /* drivers/atm/idt77105.h - IDT77105 (PHY) declarations */ |
| 2 | 3 | ||
| 3 | /* Written 1999 by Greg Banks, NEC Australia <gnb@linuxfan.com>. Based on suni.h */ | 4 | /* Written 1999 by Greg Banks, NEC Australia <gnb@linuxfan.com>. Based on suni.h */ |
diff --git a/drivers/atm/idt77252_tables.h b/drivers/atm/idt77252_tables.h index b6c8ee512fb4..12b81e046a7b 100644 --- a/drivers/atm/idt77252_tables.h +++ b/drivers/atm/idt77252_tables.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* Do not edit, automatically generated by `./genrtbl'. | 2 | /* Do not edit, automatically generated by `./genrtbl'. |
| 2 | * | 3 | * |
| 3 | * Cell Line Rate: 353207.55 (155520000 bps) | 4 | * Cell Line Rate: 353207.55 (155520000 bps) |
diff --git a/drivers/atm/midway.h b/drivers/atm/midway.h index d8bec0f2a71c..d47307adc0c9 100644 --- a/drivers/atm/midway.h +++ b/drivers/atm/midway.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* drivers/atm/midway.h - Efficient Networks Midway (SAR) description */ | 2 | /* drivers/atm/midway.h - Efficient Networks Midway (SAR) description */ |
| 2 | 3 | ||
| 3 | /* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */ | 4 | /* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */ |
diff --git a/drivers/atm/nicstar.h b/drivers/atm/nicstar.h index 9bc27ea5088e..1b7f1dfc1735 100644 --- a/drivers/atm/nicstar.h +++ b/drivers/atm/nicstar.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * nicstar.h | 3 | * nicstar.h |
| 3 | * | 4 | * |
diff --git a/drivers/atm/nicstarmac.c b/drivers/atm/nicstarmac.c index f594526f8c6d..e0dda9062e6b 100644 --- a/drivers/atm/nicstarmac.c +++ b/drivers/atm/nicstarmac.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * this file included by nicstar.c | 3 | * this file included by nicstar.c |
| 3 | */ | 4 | */ |
diff --git a/drivers/atm/solos-attrlist.c b/drivers/atm/solos-attrlist.c index 9a676ee30824..1830d1b8619f 100644 --- a/drivers/atm/solos-attrlist.c +++ b/drivers/atm/solos-attrlist.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | SOLOS_ATTR_RO(DriverVersion) | 2 | SOLOS_ATTR_RO(DriverVersion) |
| 2 | SOLOS_ATTR_RO(APIVersion) | 3 | SOLOS_ATTR_RO(APIVersion) |
| 3 | SOLOS_ATTR_RO(FirmwareVersion) | 4 | SOLOS_ATTR_RO(FirmwareVersion) |
diff --git a/drivers/atm/suni.h b/drivers/atm/suni.h index 7e3e656b3993..d28a50d47d8b 100644 --- a/drivers/atm/suni.h +++ b/drivers/atm/suni.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * drivers/atm/suni.h - S/UNI PHY driver | 3 | * drivers/atm/suni.h - S/UNI PHY driver |
| 3 | */ | 4 | */ |
diff --git a/drivers/atm/tonga.h b/drivers/atm/tonga.h index 672da96243ca..771b3f95246c 100644 --- a/drivers/atm/tonga.h +++ b/drivers/atm/tonga.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* drivers/atm/tonga.h - Efficient Networks Tonga (PCI bridge) declarations */ | 2 | /* drivers/atm/tonga.h - Efficient Networks Tonga (PCI bridge) declarations */ |
| 2 | 3 | ||
| 3 | /* Written 1995 by Werner Almesberger, EPFL LRC */ | 4 | /* Written 1995 by Werner Almesberger, EPFL LRC */ |
diff --git a/drivers/atm/uPD98401.h b/drivers/atm/uPD98401.h index 0ab36503a4b7..f766a5ef0c5d 100644 --- a/drivers/atm/uPD98401.h +++ b/drivers/atm/uPD98401.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* drivers/atm/uPD98401.h - NEC uPD98401 (SAR) declarations */ | 2 | /* drivers/atm/uPD98401.h - NEC uPD98401 (SAR) declarations */ |
| 2 | 3 | ||
| 3 | /* Written 1995 by Werner Almesberger, EPFL LRC */ | 4 | /* Written 1995 by Werner Almesberger, EPFL LRC */ |
diff --git a/drivers/atm/uPD98402.h b/drivers/atm/uPD98402.h index c947214db7e3..437cfaa20c96 100644 --- a/drivers/atm/uPD98402.h +++ b/drivers/atm/uPD98402.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* drivers/atm/uPD98402.h - NEC uPD98402 (PHY) declarations */ | 2 | /* drivers/atm/uPD98402.h - NEC uPD98402 (PHY) declarations */ |
| 2 | 3 | ||
| 3 | /* Written 1995 by Werner Almesberger, EPFL LRC */ | 4 | /* Written 1995 by Werner Almesberger, EPFL LRC */ |
diff --git a/drivers/atm/zatm.h b/drivers/atm/zatm.h index ae9165ce15a0..8204369fe825 100644 --- a/drivers/atm/zatm.h +++ b/drivers/atm/zatm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* drivers/atm/zatm.h - ZeitNet ZN122x device driver declarations */ | 2 | /* drivers/atm/zatm.h - ZeitNet ZN122x device driver declarations */ |
| 2 | 3 | ||
| 3 | /* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */ | 4 | /* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */ |
diff --git a/drivers/atm/zeprom.h b/drivers/atm/zeprom.h index 019bb82490e9..88e01f808a86 100644 --- a/drivers/atm/zeprom.h +++ b/drivers/atm/zeprom.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* drivers/atm/zeprom.h - ZeitNet ZN122x EEPROM (NM93C46) declarations */ | 2 | /* drivers/atm/zeprom.h - ZeitNet ZN122x EEPROM (NM93C46) declarations */ |
| 2 | 3 | ||
| 3 | /* Written 1995,1996 by Werner Almesberger, EPFL LRC */ | 4 | /* Written 1995,1996 by Werner Almesberger, EPFL LRC */ |
diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig index 9ae6681c90ad..d7d21118d3e0 100644 --- a/drivers/auxdisplay/Kconfig +++ b/drivers/auxdisplay/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # For a description of the syntax of this configuration file, | 3 | # For a description of the syntax of this configuration file, |
| 3 | # see Documentation/kbuild/kconfig-language.txt. | 4 | # see Documentation/kbuild/kconfig-language.txt. |
diff --git a/drivers/auxdisplay/Makefile b/drivers/auxdisplay/Makefile index 2b8af3dc5e42..7ac6776ca3f6 100644 --- a/drivers/auxdisplay/Makefile +++ b/drivers/auxdisplay/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel auxiliary displays device drivers. | 3 | # Makefile for the kernel auxiliary displays device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/auxdisplay/img-ascii-lcd.c b/drivers/auxdisplay/img-ascii-lcd.c index 25306fa27251..a9020f82eea7 100644 --- a/drivers/auxdisplay/img-ascii-lcd.c +++ b/drivers/auxdisplay/img-ascii-lcd.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2016 Imagination Technologies | 2 | * Copyright (C) 2016 Imagination Technologies |
| 3 | * Author: Paul Burton <paul.burton@imgtec.com> | 3 | * Author: Paul Burton <paul.burton@mips.com> |
| 4 | * | 4 | * |
| 5 | * This program is free software; you can redistribute it and/or modify it | 5 | * This program is free software; you can redistribute it and/or modify it |
| 6 | * under the terms of the GNU General Public License as published by the | 6 | * under the terms of the GNU General Public License as published by the |
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index 1a5f6a157a57..2f6614c9a229 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | menu "Generic Driver Options" | 2 | menu "Generic Driver Options" |
| 2 | 3 | ||
| 3 | config UEVENT_HELPER | 4 | config UEVENT_HELPER |
diff --git a/drivers/base/Makefile b/drivers/base/Makefile index 397e5c344e6a..e32a52490051 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for the Linux device tree | 2 | # Makefile for the Linux device tree |
| 2 | 3 | ||
| 3 | obj-y := component.o core.o bus.o dd.o syscore.o \ | 4 | obj-y := component.o core.o bus.o dd.o syscore.o \ |
diff --git a/drivers/base/base.h b/drivers/base/base.h index 539432a14b5c..d800de650fa5 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/notifier.h> | 2 | #include <linux/notifier.h> |
| 2 | 3 | ||
| 3 | /** | 4 | /** |
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index d2fb9c8ed205..50025d7959cb 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * devtmpfs - kernel-maintained tmpfs-based /dev | 3 | * devtmpfs - kernel-maintained tmpfs-based /dev |
| 3 | * | 4 | * |
diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c index 744f64f43454..1e6396bb807b 100644 --- a/drivers/base/dma-coherent.c +++ b/drivers/base/dma-coherent.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Coherent per-device memory handling. | 3 | * Coherent per-device memory handling. |
| 3 | * Borrowed from i386 | 4 | * Borrowed from i386 |
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 4e3b61cda520..1d60b58a8c19 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Memory subsystem support | 3 | * Memory subsystem support |
| 3 | * | 4 | * |
diff --git a/drivers/base/node.c b/drivers/base/node.c index aae2402f3791..ee090ab9171c 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Basic Node interface support | 3 | * Basic Node interface support |
| 3 | */ | 4 | */ |
diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile index 5998c53280f5..29cd71d8b360 100644 --- a/drivers/base/power/Makefile +++ b/drivers/base/power/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_PM) += sysfs.o generic_ops.o common.o qos.o runtime.o wakeirq.o | 2 | obj-$(CONFIG_PM) += sysfs.o generic_ops.o common.o qos.o runtime.o wakeirq.o |
| 2 | obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o | 3 | obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o |
| 3 | obj-$(CONFIG_PM_TRACE_RTC) += trace.o | 4 | obj-$(CONFIG_PM_TRACE_RTC) += trace.o |
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h index a46e97e515c5..7beee75399d4 100644 --- a/drivers/base/power/power.h +++ b/drivers/base/power/power.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/pm_qos.h> | 2 | #include <linux/pm_qos.h> |
| 2 | 3 | ||
| 3 | static inline void device_pm_init_common(struct device *dev) | 4 | static inline void device_pm_init_common(struct device *dev) |
diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig index 073c0b77e5b3..0368fd7b3a41 100644 --- a/drivers/base/regmap/Kconfig +++ b/drivers/base/regmap/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Generic register map support. There are no user servicable options here, | 2 | # Generic register map support. There are no user servicable options here, |
| 2 | # this is an API intended to be used by other kernel subsystems. These | 3 | # this is an API intended to be used by other kernel subsystems. These |
| 3 | # subsystems should select the appropriate symbols. | 4 | # subsystems should select the appropriate symbols. |
diff --git a/drivers/base/regmap/Makefile b/drivers/base/regmap/Makefile index 0cf4abc8fbf1..0d298c446108 100644 --- a/drivers/base/regmap/Makefile +++ b/drivers/base/regmap/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # For include/trace/define_trace.h to include trace.h | 2 | # For include/trace/define_trace.h to include trace.h |
| 2 | CFLAGS_regmap.o := -I$(src) | 3 | CFLAGS_regmap.o := -I$(src) |
| 3 | 4 | ||
diff --git a/drivers/base/regmap/trace.h b/drivers/base/regmap/trace.h index 64586a1c5a42..d4066fa079ab 100644 --- a/drivers/base/regmap/trace.h +++ b/drivers/base/regmap/trace.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #undef TRACE_SYSTEM | 2 | #undef TRACE_SYSTEM |
| 2 | #define TRACE_SYSTEM regmap | 3 | #define TRACE_SYSTEM regmap |
| 3 | 4 | ||
diff --git a/drivers/base/test/Kconfig b/drivers/base/test/Kconfig index 9aa0d45a60db..86e85daa80bf 100644 --- a/drivers/base/test/Kconfig +++ b/drivers/base/test/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | config TEST_ASYNC_DRIVER_PROBE | 2 | config TEST_ASYNC_DRIVER_PROBE |
| 2 | tristate "Build kernel module to test asynchronous driver probing" | 3 | tristate "Build kernel module to test asynchronous driver probing" |
| 3 | depends on m | 4 | depends on m |
diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig index 54f81c554815..a2df1ad03463 100644 --- a/drivers/bcma/Kconfig +++ b/drivers/bcma/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | config BCMA_POSSIBLE | 2 | config BCMA_POSSIBLE |
| 2 | bool | 3 | bool |
| 3 | depends on HAS_IOMEM && HAS_DMA | 4 | depends on HAS_IOMEM && HAS_DMA |
diff --git a/drivers/bcma/Makefile b/drivers/bcma/Makefile index 087948a1d20d..f8c37de35da2 100644 --- a/drivers/bcma/Makefile +++ b/drivers/bcma/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | bcma-y += main.o scan.o core.o sprom.o | 2 | bcma-y += main.o scan.o core.o sprom.o |
| 2 | bcma-y += driver_chipcommon.o driver_chipcommon_pmu.o | 3 | bcma-y += driver_chipcommon.o driver_chipcommon_pmu.o |
| 3 | bcma-y += driver_chipcommon_b.o | 4 | bcma-y += driver_chipcommon_b.o |
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h index 168fa175d65a..a4aac370f21f 100644 --- a/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef LINUX_BCMA_PRIVATE_H_ | 2 | #ifndef LINUX_BCMA_PRIVATE_H_ |
| 2 | #define LINUX_BCMA_PRIVATE_H_ | 3 | #define LINUX_BCMA_PRIVATE_H_ |
| 3 | 4 | ||
diff --git a/drivers/bcma/scan.h b/drivers/bcma/scan.h index 30eb475e4d19..e53079a3daf7 100644 --- a/drivers/bcma/scan.h +++ b/drivers/bcma/scan.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef BCMA_SCAN_H_ | 2 | #ifndef BCMA_SCAN_H_ |
| 2 | #define BCMA_SCAN_H_ | 3 | #define BCMA_SCAN_H_ |
| 3 | 4 | ||
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 2dfe99b328f8..7b2df7a54d87 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Block device driver configuration | 3 | # Block device driver configuration |
| 3 | # | 4 | # |
diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 1f456d86a190..dc061158b403 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel block device drivers. | 3 | # Makefile for the kernel block device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/block/drbd/Kconfig b/drivers/block/drbd/Kconfig index 7845bd6ee414..87aab6910d2d 100644 --- a/drivers/block/drbd/Kconfig +++ b/drivers/block/drbd/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # DRBD device driver configuration | 3 | # DRBD device driver configuration |
| 3 | # | 4 | # |
diff --git a/drivers/block/drbd/Makefile b/drivers/block/drbd/Makefile index 4464e353c1e8..8bd534697d1b 100644 --- a/drivers/block/drbd/Makefile +++ b/drivers/block/drbd/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | drbd-y := drbd_bitmap.o drbd_proc.o | 2 | drbd-y := drbd_bitmap.o drbd_proc.o |
| 2 | drbd-y += drbd_worker.o drbd_receiver.o drbd_req.o drbd_actlog.o | 3 | drbd-y += drbd_worker.o drbd_receiver.o drbd_req.o drbd_actlog.o |
| 3 | drbd-y += drbd_main.o drbd_strings.o drbd_nl.o | 4 | drbd-y += drbd_main.o drbd_strings.o drbd_nl.o |
diff --git a/drivers/block/drbd/drbd_debugfs.c b/drivers/block/drbd/drbd_debugfs.c index 494837e59f23..ab21976a87b2 100644 --- a/drivers/block/drbd/drbd_debugfs.c +++ b/drivers/block/drbd/drbd_debugfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #define pr_fmt(fmt) "drbd debugfs: " fmt | 2 | #define pr_fmt(fmt) "drbd debugfs: " fmt |
| 2 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 3 | #include <linux/module.h> | 4 | #include <linux/module.h> |
diff --git a/drivers/block/drbd/drbd_debugfs.h b/drivers/block/drbd/drbd_debugfs.h index 8bee21340dce..4ecfbb3358d7 100644 --- a/drivers/block/drbd/drbd_debugfs.h +++ b/drivers/block/drbd/drbd_debugfs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/module.h> | 3 | #include <linux/module.h> |
| 3 | #include <linux/debugfs.h> | 4 | #include <linux/debugfs.h> |
diff --git a/drivers/block/drbd/drbd_interval.c b/drivers/block/drbd/drbd_interval.c index 51b25ad85251..c58986556161 100644 --- a/drivers/block/drbd/drbd_interval.c +++ b/drivers/block/drbd/drbd_interval.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <asm/bug.h> | 2 | #include <asm/bug.h> |
| 2 | #include <linux/rbtree_augmented.h> | 3 | #include <linux/rbtree_augmented.h> |
| 3 | #include "drbd_interval.h" | 4 | #include "drbd_interval.h" |
diff --git a/drivers/block/drbd/drbd_interval.h b/drivers/block/drbd/drbd_interval.h index 23c5a94428d2..b8c2dee5edc8 100644 --- a/drivers/block/drbd/drbd_interval.h +++ b/drivers/block/drbd/drbd_interval.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __DRBD_INTERVAL_H | 2 | #ifndef __DRBD_INTERVAL_H |
| 2 | #define __DRBD_INTERVAL_H | 3 | #define __DRBD_INTERVAL_H |
| 3 | 4 | ||
diff --git a/drivers/block/drbd/drbd_nla.c b/drivers/block/drbd/drbd_nla.c index 6bf806df60dc..8e261cb5198b 100644 --- a/drivers/block/drbd/drbd_nla.c +++ b/drivers/block/drbd/drbd_nla.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <net/netlink.h> | 3 | #include <net/netlink.h> |
| 3 | #include <linux/drbd_genl_api.h> | 4 | #include <linux/drbd_genl_api.h> |
diff --git a/drivers/block/drbd/drbd_nla.h b/drivers/block/drbd/drbd_nla.h index 679c2d5b4535..f5eaffb6474e 100644 --- a/drivers/block/drbd/drbd_nla.h +++ b/drivers/block/drbd/drbd_nla.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __DRBD_NLA_H | 2 | #ifndef __DRBD_NLA_H |
| 2 | #define __DRBD_NLA_H | 3 | #define __DRBD_NLA_H |
| 3 | 4 | ||
diff --git a/drivers/block/drbd/drbd_protocol.h b/drivers/block/drbd/drbd_protocol.h index 4d296800f706..c3081f93051c 100644 --- a/drivers/block/drbd/drbd_protocol.h +++ b/drivers/block/drbd/drbd_protocol.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __DRBD_PROTOCOL_H | 2 | #ifndef __DRBD_PROTOCOL_H |
| 2 | #define __DRBD_PROTOCOL_H | 3 | #define __DRBD_PROTOCOL_H |
| 3 | 4 | ||
diff --git a/drivers/block/drbd/drbd_state.h b/drivers/block/drbd/drbd_state.h index 0276c98fbbdd..ea58301d0895 100644 --- a/drivers/block/drbd/drbd_state.h +++ b/drivers/block/drbd/drbd_state.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DRBD_STATE_H | 2 | #ifndef DRBD_STATE_H |
| 2 | #define DRBD_STATE_H | 3 | #define DRBD_STATE_H |
| 3 | 4 | ||
diff --git a/drivers/block/drbd/drbd_state_change.h b/drivers/block/drbd/drbd_state_change.h index 9e503a1a0bfb..ba80f612d6ab 100644 --- a/drivers/block/drbd/drbd_state_change.h +++ b/drivers/block/drbd/drbd_state_change.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DRBD_STATE_CHANGE_H | 2 | #ifndef DRBD_STATE_CHANGE_H |
| 2 | #define DRBD_STATE_CHANGE_H | 3 | #define DRBD_STATE_CHANGE_H |
| 3 | 4 | ||
diff --git a/drivers/block/drbd/drbd_strings.h b/drivers/block/drbd/drbd_strings.h index f9923cc88afb..87b94a27358a 100644 --- a/drivers/block/drbd/drbd_strings.h +++ b/drivers/block/drbd/drbd_strings.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __DRBD_STRINGS_H | 2 | #ifndef __DRBD_STRINGS_H |
| 2 | #define __DRBD_STRINGS_H | 3 | #define __DRBD_STRINGS_H |
| 3 | 4 | ||
diff --git a/drivers/block/mtip32xx/Kconfig b/drivers/block/mtip32xx/Kconfig index 0ba837fc62a8..bf221358567e 100644 --- a/drivers/block/mtip32xx/Kconfig +++ b/drivers/block/mtip32xx/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # mtip32xx device driver configuration | 3 | # mtip32xx device driver configuration |
| 3 | # | 4 | # |
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index baebbdfd74d5..9adfb5445f8d 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c | |||
| @@ -386,6 +386,15 @@ static int sock_xmit(struct nbd_device *nbd, int index, int send, | |||
| 386 | return result; | 386 | return result; |
| 387 | } | 387 | } |
| 388 | 388 | ||
| 389 | /* | ||
| 390 | * Different settings for sk->sk_sndtimeo can result in different return values | ||
| 391 | * if there is a signal pending when we enter sendmsg, because reasons? | ||
| 392 | */ | ||
| 393 | static inline int was_interrupted(int result) | ||
| 394 | { | ||
| 395 | return result == -ERESTARTSYS || result == -EINTR; | ||
| 396 | } | ||
| 397 | |||
| 389 | /* always call with the tx_lock held */ | 398 | /* always call with the tx_lock held */ |
| 390 | static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) | 399 | static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) |
| 391 | { | 400 | { |
| @@ -458,7 +467,7 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) | |||
| 458 | result = sock_xmit(nbd, index, 1, &from, | 467 | result = sock_xmit(nbd, index, 1, &from, |
| 459 | (type == NBD_CMD_WRITE) ? MSG_MORE : 0, &sent); | 468 | (type == NBD_CMD_WRITE) ? MSG_MORE : 0, &sent); |
| 460 | if (result <= 0) { | 469 | if (result <= 0) { |
| 461 | if (result == -ERESTARTSYS) { | 470 | if (was_interrupted(result)) { |
| 462 | /* If we havne't sent anything we can just return BUSY, | 471 | /* If we havne't sent anything we can just return BUSY, |
| 463 | * however if we have sent something we need to make | 472 | * however if we have sent something we need to make |
| 464 | * sure we only allow this req to be sent until we are | 473 | * sure we only allow this req to be sent until we are |
| @@ -502,7 +511,7 @@ send_pages: | |||
| 502 | } | 511 | } |
| 503 | result = sock_xmit(nbd, index, 1, &from, flags, &sent); | 512 | result = sock_xmit(nbd, index, 1, &from, flags, &sent); |
| 504 | if (result <= 0) { | 513 | if (result <= 0) { |
| 505 | if (result == -ERESTARTSYS) { | 514 | if (was_interrupted(result)) { |
| 506 | /* We've already sent the header, we | 515 | /* We've already sent the header, we |
| 507 | * have no choice but to set pending and | 516 | * have no choice but to set pending and |
| 508 | * return BUSY. | 517 | * return BUSY. |
diff --git a/drivers/block/paride/Kconfig b/drivers/block/paride/Kconfig index 3a15247942e4..b226835a909a 100644 --- a/drivers/block/paride/Kconfig +++ b/drivers/block/paride/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # PARIDE configuration | 3 | # PARIDE configuration |
| 3 | # | 4 | # |
diff --git a/drivers/block/paride/Makefile b/drivers/block/paride/Makefile index a539e004bb7a..cf1742a8475e 100644 --- a/drivers/block/paride/Makefile +++ b/drivers/block/paride/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for Parallel port IDE device drivers. | 3 | # Makefile for Parallel port IDE device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/block/paride/mkd b/drivers/block/paride/mkd index 971f099b40aa..6d0d802479ea 100644 --- a/drivers/block/paride/mkd +++ b/drivers/block/paride/mkd | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #!/bin/bash | 1 | #!/bin/bash |
| 2 | # SPDX-License-Identifier: GPL-2.0 | ||
| 2 | # | 3 | # |
| 3 | # mkd -- a script to create the device special files for the PARIDE subsystem | 4 | # mkd -- a script to create the device special files for the PARIDE subsystem |
| 4 | # | 5 | # |
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 34e17ee799be..68846897d213 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c | |||
| @@ -593,10 +593,22 @@ static int virtblk_map_queues(struct blk_mq_tag_set *set) | |||
| 593 | return blk_mq_virtio_map_queues(set, vblk->vdev, 0); | 593 | return blk_mq_virtio_map_queues(set, vblk->vdev, 0); |
| 594 | } | 594 | } |
| 595 | 595 | ||
| 596 | #ifdef CONFIG_VIRTIO_BLK_SCSI | ||
| 597 | static void virtblk_initialize_rq(struct request *req) | ||
| 598 | { | ||
| 599 | struct virtblk_req *vbr = blk_mq_rq_to_pdu(req); | ||
| 600 | |||
| 601 | scsi_req_init(&vbr->sreq); | ||
| 602 | } | ||
| 603 | #endif | ||
| 604 | |||
| 596 | static const struct blk_mq_ops virtio_mq_ops = { | 605 | static const struct blk_mq_ops virtio_mq_ops = { |
| 597 | .queue_rq = virtio_queue_rq, | 606 | .queue_rq = virtio_queue_rq, |
| 598 | .complete = virtblk_request_done, | 607 | .complete = virtblk_request_done, |
| 599 | .init_request = virtblk_init_request, | 608 | .init_request = virtblk_init_request, |
| 609 | #ifdef CONFIG_VIRTIO_BLK_SCSI | ||
| 610 | .initialize_rq_fn = virtblk_initialize_rq, | ||
| 611 | #endif | ||
| 600 | .map_queues = virtblk_map_queues, | 612 | .map_queues = virtblk_map_queues, |
| 601 | }; | 613 | }; |
| 602 | 614 | ||
diff --git a/drivers/block/zram/Kconfig b/drivers/block/zram/Kconfig index 7cd4a8ec3c8f..ac3a31d433b2 100644 --- a/drivers/block/zram/Kconfig +++ b/drivers/block/zram/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | config ZRAM | 2 | config ZRAM |
| 2 | tristate "Compressed RAM block device support" | 3 | tristate "Compressed RAM block device support" |
| 3 | depends on BLOCK && SYSFS && ZSMALLOC && CRYPTO | 4 | depends on BLOCK && SYSFS && ZSMALLOC && CRYPTO |
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig index fae5a74dc737..98a60db8e5d1 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | menu "Bluetooth device drivers" | 3 | menu "Bluetooth device drivers" |
| 3 | depends on BT | 4 | depends on BT |
diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile index e693ca6eeed9..4e4e44d09796 100644 --- a/drivers/bluetooth/Makefile +++ b/drivers/bluetooth/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux Bluetooth HCI device drivers. | 3 | # Makefile for the Linux Bluetooth HCI device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index ae3d8f3444b9..3e66f4cc1a59 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Bus Devices | 3 | # Bus Devices |
| 3 | # | 4 | # |
diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile index cc6364bec054..3ae96cffabd5 100644 --- a/drivers/bus/Makefile +++ b/drivers/bus/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the bus drivers. | 3 | # Makefile for the bus drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/cdrom/Makefile b/drivers/cdrom/Makefile index 8ffde4f8ab9a..a95566ff47d3 100644 --- a/drivers/cdrom/Makefile +++ b/drivers/cdrom/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for the kernel cdrom device drivers. | 2 | # Makefile for the kernel cdrom device drivers. |
| 2 | # | 3 | # |
| 3 | # 30 Jan 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net> | 4 | # 30 Jan 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net> |
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 623714344600..c28dca0c613d 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Character device configuration | 3 | # Character device configuration |
| 3 | # | 4 | # |
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 53e33720818c..7dc3abe66464 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel character device drivers. | 3 | # Makefile for the kernel character device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig index c528f96ee204..6231714ef3c8 100644 --- a/drivers/char/agp/Kconfig +++ b/drivers/char/agp/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | menuconfig AGP | 2 | menuconfig AGP |
| 2 | tristate "/dev/agpgart (AGP Support)" | 3 | tristate "/dev/agpgart (AGP Support)" |
| 3 | depends on ALPHA || IA64 || PARISC || PPC || X86 | 4 | depends on ALPHA || IA64 || PARISC || PPC || X86 |
diff --git a/drivers/char/agp/Makefile b/drivers/char/agp/Makefile index 604489bcdbf9..4a786ffd9dee 100644 --- a/drivers/char/agp/Makefile +++ b/drivers/char/agp/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | agpgart-y := backend.o frontend.o generic.o isoch.o | 2 | agpgart-y := backend.o frontend.o generic.o isoch.o |
| 2 | 3 | ||
| 3 | agpgart-$(CONFIG_COMPAT) += compat_ioctl.o | 4 | agpgart-$(CONFIG_COMPAT) += compat_ioctl.o |
diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h index fda073dcd967..164bf651953f 100644 --- a/drivers/char/agp/intel-agp.h +++ b/drivers/char/agp/intel-agp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Common Intel AGPGART and GTT definitions. | 3 | * Common Intel AGPGART and GTT definitions. |
| 3 | */ | 4 | */ |
diff --git a/drivers/char/agp/isoch.c b/drivers/char/agp/isoch.c index c73385cc4b8a..fc8e1bc3347d 100644 --- a/drivers/char/agp/isoch.c +++ b/drivers/char/agp/isoch.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Setup routines for AGP 3.5 compliant bridges. | 3 | * Setup routines for AGP 3.5 compliant bridges. |
| 3 | */ | 4 | */ |
diff --git a/drivers/char/applicom.h b/drivers/char/applicom.h index 35530b3d9bd6..282e08f159d5 100644 --- a/drivers/char/applicom.h +++ b/drivers/char/applicom.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: applicom.h,v 1.2 1999/08/28 15:09:49 dwmw2 Exp $ */ | 2 | /* $Id: applicom.h,v 1.2 1999/08/28 15:09:49 dwmw2 Exp $ */ |
| 2 | 3 | ||
| 3 | 4 | ||
diff --git a/drivers/char/ds1302.c b/drivers/char/ds1302.c index c614a56e68cc..8e16ad5d6d89 100644 --- a/drivers/char/ds1302.c +++ b/drivers/char/ds1302.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /*!*************************************************************************** | 2 | /*!*************************************************************************** |
| 2 | *! | 3 | *! |
| 3 | *! FILE NAME : ds1302.c | 4 | *! FILE NAME : ds1302.c |
diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile index 39a67defac67..f3728d008fff 100644 --- a/drivers/char/hw_random/Makefile +++ b/drivers/char/hw_random/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for HW Random Number Generator (RNG) device drivers. | 3 | # Makefile for HW Random Number Generator (RNG) device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/char/hw_random/n2-asm.S b/drivers/char/hw_random/n2-asm.S index 9b6eb5cd59f6..c205df43d5ae 100644 --- a/drivers/char/hw_random/n2-asm.S +++ b/drivers/char/hw_random/n2-asm.S | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* n2-asm.S: Niagara2 RNG hypervisor call assembler. | 2 | /* n2-asm.S: Niagara2 RNG hypervisor call assembler. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2008 David S. Miller <davem@davemloft.net> | 4 | * Copyright (C) 2008 David S. Miller <davem@davemloft.net> |
diff --git a/drivers/char/hw_random/n2rng.h b/drivers/char/hw_random/n2rng.h index 6bad6cc634e8..9a870f5dc371 100644 --- a/drivers/char/hw_random/n2rng.h +++ b/drivers/char/hw_random/n2rng.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* n2rng.h: Niagara2 RNG defines. | 2 | /* n2rng.h: Niagara2 RNG defines. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2008 David S. Miller <davem@davemloft.net> | 4 | * Copyright (C) 2008 David S. Miller <davem@davemloft.net> |
diff --git a/drivers/char/ipmi/Makefile b/drivers/char/ipmi/Makefile index eefb0b301e83..43b7d86cc5f2 100644 --- a/drivers/char/ipmi/Makefile +++ b/drivers/char/ipmi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the ipmi drivers. | 3 | # Makefile for the ipmi drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c index 2a84401dea05..2059f79d669a 100644 --- a/drivers/char/ipmi/ipmi_dmi.c +++ b/drivers/char/ipmi/ipmi_dmi.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * A hack to create a platform device from a DMI entry. This will | 3 | * A hack to create a platform device from a DMI entry. This will |
| 3 | * allow autoloading of the IPMI drive based on SMBIOS entries. | 4 | * allow autoloading of the IPMI drive based on SMBIOS entries. |
diff --git a/drivers/char/ipmi/ipmi_dmi.h b/drivers/char/ipmi/ipmi_dmi.h index 0a1afe5ceb1e..ea990a8e3b09 100644 --- a/drivers/char/ipmi/ipmi_dmi.h +++ b/drivers/char/ipmi/ipmi_dmi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * DMI defines for use by IPMI | 3 | * DMI defines for use by IPMI |
| 3 | */ | 4 | */ |
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 593a8818aca9..970e1242a282 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * linux/drivers/char/mem.c | 3 | * linux/drivers/char/mem.c |
| 3 | * | 4 | * |
diff --git a/drivers/char/misc.c b/drivers/char/misc.c index c9cd1ea6844a..1bb9e7cc82e3 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * linux/drivers/char/misc.c | 3 | * linux/drivers/char/misc.c |
| 3 | * | 4 | * |
diff --git a/drivers/char/nwbutton.h b/drivers/char/nwbutton.h index c3ebc16ce8a7..abee3ca74801 100644 --- a/drivers/char/nwbutton.h +++ b/drivers/char/nwbutton.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NWBUTTON_H | 2 | #ifndef __NWBUTTON_H |
| 2 | #define __NWBUTTON_H | 3 | #define __NWBUTTON_H |
| 3 | 4 | ||
diff --git a/drivers/char/pcmcia/cm4040_cs.h b/drivers/char/pcmcia/cm4040_cs.h index 9a8b805c5095..e2ffff995d51 100644 --- a/drivers/char/pcmcia/cm4040_cs.h +++ b/drivers/char/pcmcia/cm4040_cs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _CM4040_H_ | 2 | #ifndef _CM4040_H_ |
| 2 | #define _CM4040_H_ | 3 | #define _CM4040_H_ |
| 3 | 4 | ||
diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile index 23681f01f95a..34b4bcf46f43 100644 --- a/drivers/char/tpm/Makefile +++ b/drivers/char/tpm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel tpm device drivers. | 3 | # Makefile for the kernel tpm device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/char/tpm/st33zp24/Makefile b/drivers/char/tpm/st33zp24/Makefile index 74a722e5e068..649e41107de9 100644 --- a/drivers/char/tpm/st33zp24/Makefile +++ b/drivers/char/tpm/st33zp24/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for ST33ZP24 TPM 1.2 driver | 3 | # Makefile for ST33ZP24 TPM 1.2 driver |
| 3 | # | 4 | # |
diff --git a/drivers/char/tpm/tpm-dev.h b/drivers/char/tpm/tpm-dev.h index ff15cf719bad..ba3b6f9dacf7 100644 --- a/drivers/char/tpm/tpm-dev.h +++ b/drivers/char/tpm/tpm-dev.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _TPM_DEV_H | 2 | #ifndef _TPM_DEV_H |
| 2 | #define _TPM_DEV_H | 3 | #define _TPM_DEV_H |
| 3 | 4 | ||
diff --git a/drivers/char/tpm/tpm_eventlog.h b/drivers/char/tpm/tpm_eventlog.h index b4b549559203..204466cc4d05 100644 --- a/drivers/char/tpm/tpm_eventlog.h +++ b/drivers/char/tpm/tpm_eventlog.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #ifndef __TPM_EVENTLOG_H__ | 3 | #ifndef __TPM_EVENTLOG_H__ |
| 3 | #define __TPM_EVENTLOG_H__ | 4 | #define __TPM_EVENTLOG_H__ |
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index c99f363826f0..f7f761b02bed 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # common clock types | 2 | # common clock types |
| 2 | obj-$(CONFIG_HAVE_CLK) += clk-devres.o clk-bulk.o | 3 | obj-$(CONFIG_HAVE_CLK) += clk-devres.o clk-bulk.o |
| 3 | obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.o | 4 | obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.o |
diff --git a/drivers/clk/at91/Makefile b/drivers/clk/at91/Makefile index c68947b65a4c..082596f37c1d 100644 --- a/drivers/clk/at91/Makefile +++ b/drivers/clk/at91/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for at91 specific clk | 3 | # Makefile for at91 specific clk |
| 3 | # | 4 | # |
diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile index a0c14fa4aa1e..e3f0cb0d90f3 100644 --- a/drivers/clk/bcm/Makefile +++ b/drivers/clk/bcm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_CLK_BCM_63XX) += clk-bcm63xx.o | 2 | obj-$(CONFIG_CLK_BCM_63XX) += clk-bcm63xx.o |
| 2 | obj-$(CONFIG_CLK_BCM_KONA) += clk-kona.o | 3 | obj-$(CONFIG_CLK_BCM_KONA) += clk-kona.o |
| 3 | obj-$(CONFIG_CLK_BCM_KONA) += clk-kona-setup.o | 4 | obj-$(CONFIG_CLK_BCM_KONA) += clk-kona-setup.o |
diff --git a/drivers/clk/clk-gemini.c b/drivers/clk/clk-gemini.c index f940e5af845b..5e66e6c0205e 100644 --- a/drivers/clk/clk-gemini.c +++ b/drivers/clk/clk-gemini.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Cortina Gemini SoC Clock Controller driver | 3 | * Cortina Gemini SoC Clock Controller driver |
| 3 | * Copyright (c) 2017 Linus Walleij <linus.walleij@linaro.org> | 4 | * Copyright (c) 2017 Linus Walleij <linus.walleij@linaro.org> |
diff --git a/drivers/clk/clk-tango4.c b/drivers/clk/clk-tango4.c index eef75e305a59..34b22b7930fb 100644 --- a/drivers/clk/clk-tango4.c +++ b/drivers/clk/clk-tango4.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/clk-provider.h> | 3 | #include <linux/clk-provider.h> |
| 3 | #include <linux/of_address.h> | 4 | #include <linux/of_address.h> |
diff --git a/drivers/clk/h8300/clk-div.c b/drivers/clk/h8300/clk-div.c index 715b882205a8..4ae624425e9d 100644 --- a/drivers/clk/h8300/clk-div.c +++ b/drivers/clk/h8300/clk-div.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * H8/300 divide clock driver | 3 | * H8/300 divide clock driver |
| 3 | * | 4 | * |
diff --git a/drivers/clk/h8300/clk-h8s2678.c b/drivers/clk/h8300/clk-h8s2678.c index a26312460621..fc24b0b55a3d 100644 --- a/drivers/clk/h8300/clk-h8s2678.c +++ b/drivers/clk/h8300/clk-h8s2678.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * H8S2678 clock driver | 3 | * H8S2678 clock driver |
| 3 | * | 4 | * |
diff --git a/drivers/clk/hisilicon/Makefile b/drivers/clk/hisilicon/Makefile index 1e4c3ddbad84..0e55612112af 100644 --- a/drivers/clk/hisilicon/Makefile +++ b/drivers/clk/hisilicon/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Hisilicon Clock specific Makefile | 3 | # Hisilicon Clock specific Makefile |
| 3 | # | 4 | # |
diff --git a/drivers/clk/imgtec/clk-boston.c b/drivers/clk/imgtec/clk-boston.c index f18f10351785..15af423cc0c9 100644 --- a/drivers/clk/imgtec/clk-boston.c +++ b/drivers/clk/imgtec/clk-boston.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2016-2017 Imagination Technologies | 2 | * Copyright (C) 2016-2017 Imagination Technologies |
| 3 | * Author: Paul Burton <paul.burton@imgtec.com> | 3 | * Author: Paul Burton <paul.burton@mips.com> |
| 4 | * | 4 | * |
| 5 | * This program is free software; you can redistribute it and/or modify it | 5 | * This program is free software; you can redistribute it and/or modify it |
| 6 | * under the terms of the GNU General Public License as published by the | 6 | * under the terms of the GNU General Public License as published by the |
diff --git a/drivers/clk/imx/Makefile b/drivers/clk/imx/Makefile index 1ada68abb158..f91f2b2e11cd 100644 --- a/drivers/clk/imx/Makefile +++ b/drivers/clk/imx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | obj-y += \ | 3 | obj-y += \ |
| 3 | clk.o \ | 4 | clk.o \ |
diff --git a/drivers/clk/imx/clk-imx27.c b/drivers/clk/imx/clk-imx27.c index cf5cf75a4848..0a0ab95d16fe 100644 --- a/drivers/clk/imx/clk-imx27.c +++ b/drivers/clk/imx/clk-imx27.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/clk.h> | 2 | #include <linux/clk.h> |
| 2 | #include <linux/clk-provider.h> | 3 | #include <linux/clk-provider.h> |
| 3 | #include <linux/clkdev.h> | 4 | #include <linux/clkdev.h> |
diff --git a/drivers/clk/imx/clk-pllv1.c b/drivers/clk/imx/clk-pllv1.c index 82fe3662b5f6..e47a1c2fe8bd 100644 --- a/drivers/clk/imx/clk-pllv1.c +++ b/drivers/clk/imx/clk-pllv1.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/clk-provider.h> | 2 | #include <linux/clk-provider.h> |
| 2 | #include <linux/io.h> | 3 | #include <linux/io.h> |
| 3 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
diff --git a/drivers/clk/imx/clk-pllv2.c b/drivers/clk/imx/clk-pllv2.c index 4aeda56ce372..9842d657e974 100644 --- a/drivers/clk/imx/clk-pllv2.c +++ b/drivers/clk/imx/clk-pllv2.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/clk.h> | 3 | #include <linux/clk.h> |
| 3 | #include <linux/io.h> | 4 | #include <linux/io.h> |
diff --git a/drivers/clk/imx/clk.c b/drivers/clk/imx/clk.c index a634b1185be3..9074e6974b6d 100644 --- a/drivers/clk/imx/clk.c +++ b/drivers/clk/imx/clk.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/clk.h> | 2 | #include <linux/clk.h> |
| 2 | #include <linux/err.h> | 3 | #include <linux/err.h> |
| 3 | #include <linux/of.h> | 4 | #include <linux/of.h> |
diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h index d54f0720afba..d69c4bbf3597 100644 --- a/drivers/clk/imx/clk.h +++ b/drivers/clk/imx/clk.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MACH_IMX_CLK_H | 2 | #ifndef __MACH_IMX_CLK_H |
| 2 | #define __MACH_IMX_CLK_H | 3 | #define __MACH_IMX_CLK_H |
| 3 | 4 | ||
diff --git a/drivers/clk/ingenic/cgu.c b/drivers/clk/ingenic/cgu.c index e8248f9185f7..ab393637f7b0 100644 --- a/drivers/clk/ingenic/cgu.c +++ b/drivers/clk/ingenic/cgu.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * Ingenic SoC CGU driver | 2 | * Ingenic SoC CGU driver |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2013-2015 Imagination Technologies | 4 | * Copyright (c) 2013-2015 Imagination Technologies |
| 5 | * Author: Paul Burton <paul.burton@imgtec.com> | 5 | * Author: Paul Burton <paul.burton@mips.com> |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or | 7 | * This program is free software; you can redistribute it and/or |
| 8 | * modify it under the terms of the GNU General Public License as | 8 | * modify it under the terms of the GNU General Public License as |
diff --git a/drivers/clk/ingenic/cgu.h b/drivers/clk/ingenic/cgu.h index 09700b2c555d..e78b586536ea 100644 --- a/drivers/clk/ingenic/cgu.h +++ b/drivers/clk/ingenic/cgu.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * Ingenic SoC CGU driver | 2 | * Ingenic SoC CGU driver |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2013-2015 Imagination Technologies | 4 | * Copyright (c) 2013-2015 Imagination Technologies |
| 5 | * Author: Paul Burton <paul.burton@imgtec.com> | 5 | * Author: Paul Burton <paul.burton@mips.com> |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or | 7 | * This program is free software; you can redistribute it and/or |
| 8 | * modify it under the terms of the GNU General Public License as | 8 | * modify it under the terms of the GNU General Public License as |
diff --git a/drivers/clk/ingenic/jz4740-cgu.c b/drivers/clk/ingenic/jz4740-cgu.c index 510fe7e0c8f1..32fcc75f6f77 100644 --- a/drivers/clk/ingenic/jz4740-cgu.c +++ b/drivers/clk/ingenic/jz4740-cgu.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * Ingenic JZ4740 SoC CGU driver | 2 | * Ingenic JZ4740 SoC CGU driver |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2015 Imagination Technologies | 4 | * Copyright (c) 2015 Imagination Technologies |
| 5 | * Author: Paul Burton <paul.burton@imgtec.com> | 5 | * Author: Paul Burton <paul.burton@mips.com> |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or | 7 | * This program is free software; you can redistribute it and/or |
| 8 | * modify it under the terms of the GNU General Public License as | 8 | * modify it under the terms of the GNU General Public License as |
diff --git a/drivers/clk/ingenic/jz4780-cgu.c b/drivers/clk/ingenic/jz4780-cgu.c index b35d6d9dd5aa..ac3585ed8228 100644 --- a/drivers/clk/ingenic/jz4780-cgu.c +++ b/drivers/clk/ingenic/jz4780-cgu.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * Ingenic JZ4780 SoC CGU driver | 2 | * Ingenic JZ4780 SoC CGU driver |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2013-2015 Imagination Technologies | 4 | * Copyright (c) 2013-2015 Imagination Technologies |
| 5 | * Author: Paul Burton <paul.burton@imgtec.com> | 5 | * Author: Paul Burton <paul.burton@mips.com> |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or | 7 | * This program is free software; you can redistribute it and/or |
| 8 | * modify it under the terms of the GNU General Public License as | 8 | * modify it under the terms of the GNU General Public License as |
diff --git a/drivers/clk/mediatek/Makefile b/drivers/clk/mediatek/Makefile index 2a755b5fb51b..ba2a070765f0 100644 --- a/drivers/clk/mediatek/Makefile +++ b/drivers/clk/mediatek/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-gate.o clk-apmixed.o clk-cpumux.o | 2 | obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-gate.o clk-apmixed.o clk-cpumux.o |
| 2 | obj-$(CONFIG_RESET_CONTROLLER) += reset.o | 3 | obj-$(CONFIG_RESET_CONTROLLER) += reset.o |
| 3 | obj-$(CONFIG_COMMON_CLK_MT6797) += clk-mt6797.o | 4 | obj-$(CONFIG_COMMON_CLK_MT6797) += clk-mt6797.o |
diff --git a/drivers/clk/mmp/Makefile b/drivers/clk/mmp/Makefile index 9d4bc41e4239..7bc7ac69391e 100644 --- a/drivers/clk/mmp/Makefile +++ b/drivers/clk/mmp/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for mmp specific clk | 3 | # Makefile for mmp specific clk |
| 3 | # | 4 | # |
diff --git a/drivers/clk/mmp/clk.c b/drivers/clk/mmp/clk.c index 089927e4cda2..ad8d483a35cd 100644 --- a/drivers/clk/mmp/clk.c +++ b/drivers/clk/mmp/clk.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/io.h> | 2 | #include <linux/io.h> |
| 2 | #include <linux/clk-provider.h> | 3 | #include <linux/clk-provider.h> |
| 3 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
diff --git a/drivers/clk/mmp/clk.h b/drivers/clk/mmp/clk.h index adf9b711b037..70bb73257647 100644 --- a/drivers/clk/mmp/clk.h +++ b/drivers/clk/mmp/clk.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MACH_MMP_CLK_H | 2 | #ifndef __MACH_MMP_CLK_H |
| 2 | #define __MACH_MMP_CLK_H | 3 | #define __MACH_MMP_CLK_H |
| 3 | 4 | ||
diff --git a/drivers/clk/mmp/reset.c b/drivers/clk/mmp/reset.c index b4e4d6aa2631..ded7e391c737 100644 --- a/drivers/clk/mmp/reset.c +++ b/drivers/clk/mmp/reset.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/slab.h> | 2 | #include <linux/slab.h> |
| 2 | #include <linux/io.h> | 3 | #include <linux/io.h> |
| 3 | #include <linux/of.h> | 4 | #include <linux/of.h> |
diff --git a/drivers/clk/mmp/reset.h b/drivers/clk/mmp/reset.h index be8b1a7000f7..3d0470ca3fd9 100644 --- a/drivers/clk/mmp/reset.h +++ b/drivers/clk/mmp/reset.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MACH_MMP_CLK_RESET_H | 2 | #ifndef __MACH_MMP_CLK_RESET_H |
| 2 | #define __MACH_MMP_CLK_RESET_H | 3 | #define __MACH_MMP_CLK_RESET_H |
| 3 | 4 | ||
diff --git a/drivers/clk/mvebu/Makefile b/drivers/clk/mvebu/Makefile index d71c7fd5da16..93ac3685271f 100644 --- a/drivers/clk/mvebu/Makefile +++ b/drivers/clk/mvebu/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_MVEBU_CLK_COMMON) += common.o | 2 | obj-$(CONFIG_MVEBU_CLK_COMMON) += common.o |
| 2 | obj-$(CONFIG_MVEBU_CLK_CPU) += clk-cpu.o | 3 | obj-$(CONFIG_MVEBU_CLK_CPU) += clk-cpu.o |
| 3 | obj-$(CONFIG_MVEBU_CLK_COREDIV) += clk-corediv.o | 4 | obj-$(CONFIG_MVEBU_CLK_COREDIV) += clk-corediv.o |
diff --git a/drivers/clk/mvebu/dove-divider.c b/drivers/clk/mvebu/dove-divider.c index 4091f3cfee19..7e35c891e168 100644 --- a/drivers/clk/mvebu/dove-divider.c +++ b/drivers/clk/mvebu/dove-divider.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Marvell Dove PMU Core PLL divider driver | 3 | * Marvell Dove PMU Core PLL divider driver |
| 3 | * | 4 | * |
diff --git a/drivers/clk/mvebu/dove-divider.h b/drivers/clk/mvebu/dove-divider.h index 4f2f718deb8e..38ea373088ca 100644 --- a/drivers/clk/mvebu/dove-divider.h +++ b/drivers/clk/mvebu/dove-divider.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DOVE_DIVIDER_H | 2 | #ifndef DOVE_DIVIDER_H |
| 2 | #define DOVE_DIVIDER_H | 3 | #define DOVE_DIVIDER_H |
| 3 | 4 | ||
diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile index 3f3aff229fb7..26410d31446b 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_COMMON_CLK_QCOM) += clk-qcom.o | 2 | obj-$(CONFIG_COMMON_CLK_QCOM) += clk-qcom.o |
| 2 | 3 | ||
| 3 | clk-qcom-y += common.o | 4 | clk-qcom-y += common.o |
diff --git a/drivers/clk/renesas/Makefile b/drivers/clk/renesas/Makefile index 9bda3ec5b199..cbbb081e2145 100644 --- a/drivers/clk/renesas/Makefile +++ b/drivers/clk/renesas/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # SoC | 2 | # SoC |
| 2 | obj-$(CONFIG_CLK_EMEV2) += clk-emev2.o | 3 | obj-$(CONFIG_CLK_EMEV2) += clk-emev2.o |
| 3 | obj-$(CONFIG_CLK_RZA1) += clk-rz.o | 4 | obj-$(CONFIG_CLK_RZA1) += clk-rz.o |
diff --git a/drivers/clk/renesas/clk-div6.h b/drivers/clk/renesas/clk-div6.h index 567b31d2bfa5..065dfb49adf6 100644 --- a/drivers/clk/renesas/clk-div6.h +++ b/drivers/clk/renesas/clk-div6.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __RENESAS_CLK_DIV6_H__ | 2 | #ifndef __RENESAS_CLK_DIV6_H__ |
| 2 | #define __RENESAS_CLK_DIV6_H__ | 3 | #define __RENESAS_CLK_DIV6_H__ |
| 3 | 4 | ||
diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile index 6f19826cc447..59b8d320960a 100644 --- a/drivers/clk/rockchip/Makefile +++ b/drivers/clk/rockchip/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Rockchip Clock specific Makefile | 3 | # Rockchip Clock specific Makefile |
| 3 | # | 4 | # |
diff --git a/drivers/clk/samsung/Makefile b/drivers/clk/samsung/Makefile index 7afc21dc374e..23835001e8bd 100644 --- a/drivers/clk/samsung/Makefile +++ b/drivers/clk/samsung/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Samsung Clock specific Makefile | 3 | # Samsung Clock specific Makefile |
| 3 | # | 4 | # |
diff --git a/drivers/clk/sirf/atlas6.h b/drivers/clk/sirf/atlas6.h index 376217f3bf8f..cb871e30a175 100644 --- a/drivers/clk/sirf/atlas6.h +++ b/drivers/clk/sirf/atlas6.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #define SIRFSOC_CLKC_CLK_EN0 0x0000 | 2 | #define SIRFSOC_CLKC_CLK_EN0 0x0000 |
| 2 | #define SIRFSOC_CLKC_CLK_EN1 0x0004 | 3 | #define SIRFSOC_CLKC_CLK_EN1 0x0004 |
| 3 | #define SIRFSOC_CLKC_REF_CFG 0x0020 | 4 | #define SIRFSOC_CLKC_REF_CFG 0x0020 |
diff --git a/drivers/clk/sirf/prima2.h b/drivers/clk/sirf/prima2.h index 01bc3854a058..2fb56941795d 100644 --- a/drivers/clk/sirf/prima2.h +++ b/drivers/clk/sirf/prima2.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #define SIRFSOC_CLKC_CLK_EN0 0x0000 | 2 | #define SIRFSOC_CLKC_CLK_EN0 0x0000 |
| 2 | #define SIRFSOC_CLKC_CLK_EN1 0x0004 | 3 | #define SIRFSOC_CLKC_CLK_EN1 0x0004 |
| 3 | #define SIRFSOC_CLKC_REF_CFG 0x0014 | 4 | #define SIRFSOC_CLKC_REF_CFG 0x0014 |
diff --git a/drivers/clk/socfpga/Makefile b/drivers/clk/socfpga/Makefile index d8bb239753a4..9146c20fe21f 100644 --- a/drivers/clk/socfpga/Makefile +++ b/drivers/clk/socfpga/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-y += clk.o | 2 | obj-y += clk.o |
| 2 | obj-y += clk-gate.o | 3 | obj-y += clk-gate.o |
| 3 | obj-y += clk-pll.o | 4 | obj-y += clk-pll.o |
diff --git a/drivers/clk/spear/Makefile b/drivers/clk/spear/Makefile index cdb425d3b8ee..d7e75d2d42df 100644 --- a/drivers/clk/spear/Makefile +++ b/drivers/clk/spear/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # SPEAr Clock specific Makefile | 3 | # SPEAr Clock specific Makefile |
| 3 | # | 4 | # |
diff --git a/drivers/clk/st/clkgen.h b/drivers/clk/st/clkgen.h index f7ec2d9139d6..44302fc7ca96 100644 --- a/drivers/clk/st/clkgen.h +++ b/drivers/clk/st/clkgen.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /************************************************************************ | 2 | /************************************************************************ |
| 2 | File : Clock H/w specific Information | 3 | File : Clock H/w specific Information |
| 3 | 4 | ||
diff --git a/drivers/clk/sunxi-ng/Makefile b/drivers/clk/sunxi-ng/Makefile index 85a0633c1eac..d1c2fa93ddd9 100644 --- a/drivers/clk/sunxi-ng/Makefile +++ b/drivers/clk/sunxi-ng/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Common objects | 2 | # Common objects |
| 2 | lib-$(CONFIG_SUNXI_CCU) += ccu_common.o | 3 | lib-$(CONFIG_SUNXI_CCU) += ccu_common.o |
| 3 | lib-$(CONFIG_SUNXI_CCU) += ccu_mmc_timing.o | 4 | lib-$(CONFIG_SUNXI_CCU) += ccu_mmc_timing.o |
diff --git a/drivers/clk/sunxi-ng/ccu_mult.h b/drivers/clk/sunxi-ng/ccu_mult.h index f9c37b987d72..6b30b0c10807 100644 --- a/drivers/clk/sunxi-ng/ccu_mult.h +++ b/drivers/clk/sunxi-ng/ccu_mult.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _CCU_MULT_H_ | 2 | #ifndef _CCU_MULT_H_ |
| 2 | #define _CCU_MULT_H_ | 3 | #define _CCU_MULT_H_ |
| 3 | 4 | ||
diff --git a/drivers/clk/sunxi-ng/ccu_mux.h b/drivers/clk/sunxi-ng/ccu_mux.h index f20c0bd62a47..f165395effb5 100644 --- a/drivers/clk/sunxi-ng/ccu_mux.h +++ b/drivers/clk/sunxi-ng/ccu_mux.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _CCU_MUX_H_ | 2 | #ifndef _CCU_MUX_H_ |
| 2 | #define _CCU_MUX_H_ | 3 | #define _CCU_MUX_H_ |
| 3 | 4 | ||
diff --git a/drivers/clk/sunxi/Makefile b/drivers/clk/sunxi/Makefile index 39d2044a1f49..be88368b48a1 100644 --- a/drivers/clk/sunxi/Makefile +++ b/drivers/clk/sunxi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for sunxi specific clk | 3 | # Makefile for sunxi specific clk |
| 3 | # | 4 | # |
diff --git a/drivers/clk/sunxi/clk-factors.h b/drivers/clk/sunxi/clk-factors.h index 1e63c5b2d5f4..824f746b2567 100644 --- a/drivers/clk/sunxi/clk-factors.h +++ b/drivers/clk/sunxi/clk-factors.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MACH_SUNXI_CLK_FACTORS_H | 2 | #ifndef __MACH_SUNXI_CLK_FACTORS_H |
| 2 | #define __MACH_SUNXI_CLK_FACTORS_H | 3 | #define __MACH_SUNXI_CLK_FACTORS_H |
| 3 | 4 | ||
diff --git a/drivers/clk/sunxi/clk-sun9i-cpus.c b/drivers/clk/sunxi/clk-sun9i-cpus.c index 7626d2194b96..4d5e14142e15 100644 --- a/drivers/clk/sunxi/clk-sun9i-cpus.c +++ b/drivers/clk/sunxi/clk-sun9i-cpus.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 2015 Chen-Yu Tsai | 3 | * Copyright (C) 2015 Chen-Yu Tsai |
| 3 | * | 4 | * |
diff --git a/drivers/clk/tegra/Makefile b/drivers/clk/tegra/Makefile index 4be8af28ee61..b71692391bd6 100644 --- a/drivers/clk/tegra/Makefile +++ b/drivers/clk/tegra/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-y += clk.o | 2 | obj-y += clk.o |
| 2 | obj-y += clk-audio-sync.o | 3 | obj-y += clk-audio-sync.o |
| 3 | obj-y += clk-dfll.o | 4 | obj-y += clk-dfll.o |
diff --git a/drivers/clk/tegra/clk-id.h b/drivers/clk/tegra/clk-id.h index 689f344377a7..11ee5f9ce99e 100644 --- a/drivers/clk/tegra/clk-id.h +++ b/drivers/clk/tegra/clk-id.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * This header provides IDs for clocks common between several Tegra SoCs | 3 | * This header provides IDs for clocks common between several Tegra SoCs |
| 3 | */ | 4 | */ |
diff --git a/drivers/clk/ti/Makefile b/drivers/clk/ti/Makefile index edb9f471e525..a2293ee09440 100644 --- a/drivers/clk/ti/Makefile +++ b/drivers/clk/ti/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ifeq ($(CONFIG_ARCH_OMAP2PLUS), y) | 2 | ifeq ($(CONFIG_ARCH_OMAP2PLUS), y) |
| 2 | 3 | ||
| 3 | obj-y += clk.o autoidle.o clockdomain.o | 4 | obj-y += clk.o autoidle.o clockdomain.o |
diff --git a/drivers/clk/uniphier/Makefile b/drivers/clk/uniphier/Makefile index 665d1d65a90e..e5715abef180 100644 --- a/drivers/clk/uniphier/Makefile +++ b/drivers/clk/uniphier/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-y += clk-uniphier-core.o | 2 | obj-y += clk-uniphier-core.o |
| 2 | 3 | ||
| 3 | obj-y += clk-uniphier-cpugear.o | 4 | obj-y += clk-uniphier-cpugear.o |
diff --git a/drivers/clk/uniphier/clk-uniphier-sys.c b/drivers/clk/uniphier/clk-uniphier-sys.c index 0e396f3da526..07f3b91a7daf 100644 --- a/drivers/clk/uniphier/clk-uniphier-sys.c +++ b/drivers/clk/uniphier/clk-uniphier-sys.c | |||
| @@ -233,9 +233,9 @@ const struct uniphier_clk_data uniphier_pxs3_sys_clk_data[] = { | |||
| 233 | UNIPHIER_LD20_SYS_CLK_SD, | 233 | UNIPHIER_LD20_SYS_CLK_SD, |
| 234 | UNIPHIER_LD11_SYS_CLK_NAND(2), | 234 | UNIPHIER_LD11_SYS_CLK_NAND(2), |
| 235 | UNIPHIER_LD11_SYS_CLK_EMMC(4), | 235 | UNIPHIER_LD11_SYS_CLK_EMMC(4), |
| 236 | UNIPHIER_CLK_GATE("usb30", 12, NULL, 0x2104, 4), /* =GIO0 */ | 236 | UNIPHIER_CLK_GATE("usb30", 12, NULL, 0x210c, 4), /* =GIO0 */ |
| 237 | UNIPHIER_CLK_GATE("usb31-0", 13, NULL, 0x2104, 5), /* =GIO1 */ | 237 | UNIPHIER_CLK_GATE("usb31-0", 13, NULL, 0x210c, 5), /* =GIO1 */ |
| 238 | UNIPHIER_CLK_GATE("usb31-1", 14, NULL, 0x2104, 6), /* =GIO1-1 */ | 238 | UNIPHIER_CLK_GATE("usb31-1", 14, NULL, 0x210c, 6), /* =GIO1-1 */ |
| 239 | UNIPHIER_CLK_GATE("usb30-phy0", 16, NULL, 0x210c, 16), | 239 | UNIPHIER_CLK_GATE("usb30-phy0", 16, NULL, 0x210c, 16), |
| 240 | UNIPHIER_CLK_GATE("usb30-phy1", 17, NULL, 0x210c, 18), | 240 | UNIPHIER_CLK_GATE("usb30-phy1", 17, NULL, 0x210c, 18), |
| 241 | UNIPHIER_CLK_GATE("usb30-phy2", 18, NULL, 0x210c, 20), | 241 | UNIPHIER_CLK_GATE("usb30-phy2", 18, NULL, 0x210c, 20), |
diff --git a/drivers/clk/ux500/Makefile b/drivers/clk/ux500/Makefile index f3baef29859c..fedc083dc8be 100644 --- a/drivers/clk/ux500/Makefile +++ b/drivers/clk/ux500/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for ux500 clocks | 3 | # Makefile for ux500 clocks |
| 3 | # | 4 | # |
diff --git a/drivers/clk/versatile/clk-icst.h b/drivers/clk/versatile/clk-icst.h index 5add02ebec5d..e36ca1a20e90 100644 --- a/drivers/clk/versatile/clk-icst.h +++ b/drivers/clk/versatile/clk-icst.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /** | 2 | /** |
| 2 | * struct clk_icst_desc - descriptor for the ICST VCO | 3 | * struct clk_icst_desc - descriptor for the ICST VCO |
| 3 | * @params: ICST parameters | 4 | * @params: ICST parameters |
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index dbc1ad14515e..72711f1491e3 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_TIMER_OF) += timer-of.o | 2 | obj-$(CONFIG_TIMER_OF) += timer-of.o |
| 2 | obj-$(CONFIG_TIMER_PROBE) += timer-probe.o | 3 | obj-$(CONFIG_TIMER_PROBE) += timer-probe.o |
| 3 | obj-$(CONFIG_ATMEL_PIT) += timer-atmel-pit.o | 4 | obj-$(CONFIG_ATMEL_PIT) += timer-atmel-pit.o |
diff --git a/drivers/clocksource/h8300_timer16.c b/drivers/clocksource/h8300_timer16.c index dfbd4f8051cb..86ca91451b2e 100644 --- a/drivers/clocksource/h8300_timer16.c +++ b/drivers/clocksource/h8300_timer16.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * H8/300 16bit Timer driver | 3 | * H8/300 16bit Timer driver |
| 3 | * | 4 | * |
diff --git a/drivers/clocksource/h8300_timer8.c b/drivers/clocksource/h8300_timer8.c index f6ffb0cef091..1d740a8c42ab 100644 --- a/drivers/clocksource/h8300_timer8.c +++ b/drivers/clocksource/h8300_timer8.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * linux/arch/h8300/kernel/cpu/timer/timer8.c | 3 | * linux/arch/h8300/kernel/cpu/timer/timer8.c |
| 3 | * | 4 | * |
diff --git a/drivers/clocksource/h8300_tpu.c b/drivers/clocksource/h8300_tpu.c index 45a8d17dac1e..17d4ab0f6ad1 100644 --- a/drivers/clocksource/h8300_tpu.c +++ b/drivers/clocksource/h8300_tpu.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * H8S TPU Driver | 3 | * H8S TPU Driver |
| 3 | * | 4 | * |
diff --git a/drivers/clocksource/i8253.c b/drivers/clocksource/i8253.c index 64f6490740d7..9c38895542f4 100644 --- a/drivers/clocksource/i8253.c +++ b/drivers/clocksource/i8253.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * i8253 PIT clocksource | 3 | * i8253 PIT clocksource |
| 3 | */ | 4 | */ |
diff --git a/drivers/clocksource/tango_xtal.c b/drivers/clocksource/tango_xtal.c index 6a8d9838ce33..3f94e454ef99 100644 --- a/drivers/clocksource/tango_xtal.c +++ b/drivers/clocksource/tango_xtal.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/clocksource.h> | 2 | #include <linux/clocksource.h> |
| 2 | #include <linux/sched_clock.h> | 3 | #include <linux/sched_clock.h> |
| 3 | #include <linux/of_address.h> | 4 | #include <linux/of_address.h> |
diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c index 59e8aee0ec16..9de47d4d2d9e 100644 --- a/drivers/clocksource/tcb_clksrc.c +++ b/drivers/clocksource/tcb_clksrc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/init.h> | 2 | #include <linux/init.h> |
| 2 | #include <linux/clocksource.h> | 3 | #include <linux/clocksource.h> |
| 3 | #include <linux/clockchips.h> | 4 | #include <linux/clockchips.h> |
diff --git a/drivers/clocksource/timer-fttmr010.c b/drivers/clocksource/timer-fttmr010.c index 66dd909960c6..cdf23b628688 100644 --- a/drivers/clocksource/timer-fttmr010.c +++ b/drivers/clocksource/timer-fttmr010.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Faraday Technology FTTMR010 timer driver | 3 | * Faraday Technology FTTMR010 timer driver |
| 3 | * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org> | 4 | * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org> |
diff --git a/drivers/clocksource/timer-of.h b/drivers/clocksource/timer-of.h index e0d727255f72..c6d995ab93d5 100644 --- a/drivers/clocksource/timer-of.h +++ b/drivers/clocksource/timer-of.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __TIMER_OF_H__ | 2 | #ifndef __TIMER_OF_H__ |
| 2 | #define __TIMER_OF_H__ | 3 | #define __TIMER_OF_H__ |
| 3 | 4 | ||
diff --git a/drivers/clocksource/timer-sp.h b/drivers/clocksource/timer-sp.h index 050d88561e9c..b2037eb94a41 100644 --- a/drivers/clocksource/timer-sp.h +++ b/drivers/clocksource/timer-sp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * ARM timer implementation, found in Integrator, Versatile and Realview | 3 | * ARM timer implementation, found in Integrator, Versatile and Realview |
| 3 | * platforms. Not all platforms support all registers and bits in these | 4 | * platforms. Not all platforms support all registers and bits in these |
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index c7af9b2a255e..812f9e0d01a3 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # CPUfreq core | 2 | # CPUfreq core |
| 2 | obj-$(CONFIG_CPU_FREQ) += cpufreq.o freq_table.o | 3 | obj-$(CONFIG_CPU_FREQ) += cpufreq.o freq_table.o |
| 3 | 4 | ||
diff --git a/drivers/cpufreq/cris-artpec3-cpufreq.c b/drivers/cpufreq/cris-artpec3-cpufreq.c index 601b88c490cf..455b4fb78cba 100644 --- a/drivers/cpufreq/cris-artpec3-cpufreq.c +++ b/drivers/cpufreq/cris-artpec3-cpufreq.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/init.h> | 2 | #include <linux/init.h> |
| 2 | #include <linux/module.h> | 3 | #include <linux/module.h> |
| 3 | #include <linux/cpufreq.h> | 4 | #include <linux/cpufreq.h> |
diff --git a/drivers/cpufreq/cris-etraxfs-cpufreq.c b/drivers/cpufreq/cris-etraxfs-cpufreq.c index 22b2cdde74d9..4c4b5dd685e3 100644 --- a/drivers/cpufreq/cris-etraxfs-cpufreq.c +++ b/drivers/cpufreq/cris-etraxfs-cpufreq.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/init.h> | 2 | #include <linux/init.h> |
| 2 | #include <linux/module.h> | 3 | #include <linux/module.h> |
| 3 | #include <linux/cpufreq.h> | 4 | #include <linux/cpufreq.h> |
diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.h b/drivers/cpufreq/ppc_cbe_cpufreq.h index 3eace725ccd6..9d973519d669 100644 --- a/drivers/cpufreq/ppc_cbe_cpufreq.h +++ b/drivers/cpufreq/ppc_cbe_cpufreq.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * ppc_cbe_cpufreq.h | 3 | * ppc_cbe_cpufreq.h |
| 3 | * | 4 | * |
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile index 0b67a05a7aae..9d7176cee3d3 100644 --- a/drivers/cpuidle/Makefile +++ b/drivers/cpuidle/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for cpuidle. | 3 | # Makefile for cpuidle. |
| 3 | # | 4 | # |
diff --git a/drivers/cpuidle/cpuidle-cps.c b/drivers/cpuidle/cpuidle-cps.c index 72b5e47286b4..dac8ff6391fa 100644 --- a/drivers/cpuidle/cpuidle-cps.c +++ b/drivers/cpuidle/cpuidle-cps.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2014 Imagination Technologies | 2 | * Copyright (C) 2014 Imagination Technologies |
| 3 | * Author: Paul Burton <paul.burton@imgtec.com> | 3 | * Author: Paul Burton <paul.burton@mips.com> |
| 4 | * | 4 | * |
| 5 | * This program is free software; you can redistribute it and/or modify it | 5 | * This program is free software; you can redistribute it and/or modify it |
| 6 | * under the terms of the GNU General Public License as published by the | 6 | * under the terms of the GNU General Public License as published by the |
diff --git a/drivers/cpuidle/cpuidle-powernv.c b/drivers/cpuidle/cpuidle-powernv.c index 42896a67aeae..ed6531f075c6 100644 --- a/drivers/cpuidle/cpuidle-powernv.c +++ b/drivers/cpuidle/cpuidle-powernv.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * cpuidle-powernv - idle state cpuidle driver. | 3 | * cpuidle-powernv - idle state cpuidle driver. |
| 3 | * Adapted from drivers/cpuidle/cpuidle-pseries | 4 | * Adapted from drivers/cpuidle/cpuidle-pseries |
diff --git a/drivers/cpuidle/cpuidle-pseries.c b/drivers/cpuidle/cpuidle-pseries.c index e9b3853d93ea..a187a39fb866 100644 --- a/drivers/cpuidle/cpuidle-pseries.c +++ b/drivers/cpuidle/cpuidle-pseries.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * cpuidle-pseries - idle state cpuidle driver. | 3 | * cpuidle-pseries - idle state cpuidle driver. |
| 3 | * Adapted from drivers/idle/intel_idle.c and | 4 | * Adapted from drivers/idle/intel_idle.c and |
diff --git a/drivers/cpuidle/cpuidle.h b/drivers/cpuidle/cpuidle.h index f87f399b0540..2965ab32a583 100644 --- a/drivers/cpuidle/cpuidle.h +++ b/drivers/cpuidle/cpuidle.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * cpuidle.h - The internal header file | 3 | * cpuidle.h - The internal header file |
| 3 | */ | 4 | */ |
diff --git a/drivers/cpuidle/dt_idle_states.h b/drivers/cpuidle/dt_idle_states.h index 4818134bc65b..14ae88cef1de 100644 --- a/drivers/cpuidle/dt_idle_states.h +++ b/drivers/cpuidle/dt_idle_states.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __DT_IDLE_STATES | 2 | #ifndef __DT_IDLE_STATES |
| 2 | #define __DT_IDLE_STATES | 3 | #define __DT_IDLE_STATES |
| 3 | 4 | ||
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile index 808432b44c6b..c00708d04be6 100644 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_CRYPTO_DEV_ATMEL_AES) += atmel-aes.o | 2 | obj-$(CONFIG_CRYPTO_DEV_ATMEL_AES) += atmel-aes.o |
| 2 | obj-$(CONFIG_CRYPTO_DEV_ATMEL_SHA) += atmel-sha.o | 3 | obj-$(CONFIG_CRYPTO_DEV_ATMEL_SHA) += atmel-sha.o |
| 3 | obj-$(CONFIG_CRYPTO_DEV_ATMEL_TDES) += atmel-tdes.o | 4 | obj-$(CONFIG_CRYPTO_DEV_ATMEL_TDES) += atmel-tdes.o |
diff --git a/drivers/crypto/atmel-aes-regs.h b/drivers/crypto/atmel-aes-regs.h index 7694679802b3..62f9d3038757 100644 --- a/drivers/crypto/atmel-aes-regs.h +++ b/drivers/crypto/atmel-aes-regs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __ATMEL_AES_REGS_H__ | 2 | #ifndef __ATMEL_AES_REGS_H__ |
| 2 | #define __ATMEL_AES_REGS_H__ | 3 | #define __ATMEL_AES_REGS_H__ |
| 3 | 4 | ||
diff --git a/drivers/crypto/atmel-sha-regs.h b/drivers/crypto/atmel-sha-regs.h index 1b0eba4a2706..b2b5e634e80f 100644 --- a/drivers/crypto/atmel-sha-regs.h +++ b/drivers/crypto/atmel-sha-regs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __ATMEL_SHA_REGS_H__ | 2 | #ifndef __ATMEL_SHA_REGS_H__ |
| 2 | #define __ATMEL_SHA_REGS_H__ | 3 | #define __ATMEL_SHA_REGS_H__ |
| 3 | 4 | ||
diff --git a/drivers/crypto/atmel-tdes-regs.h b/drivers/crypto/atmel-tdes-regs.h index f86734d0fda4..fbd905720dfa 100644 --- a/drivers/crypto/atmel-tdes-regs.h +++ b/drivers/crypto/atmel-tdes-regs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __ATMEL_TDES_REGS_H__ | 2 | #ifndef __ATMEL_TDES_REGS_H__ |
| 2 | #define __ATMEL_TDES_REGS_H__ | 3 | #define __ATMEL_TDES_REGS_H__ |
| 3 | 4 | ||
diff --git a/drivers/crypto/caam/Makefile b/drivers/crypto/caam/Makefile index 9e2e98856b9b..cb652ee7dfc8 100644 --- a/drivers/crypto/caam/Makefile +++ b/drivers/crypto/caam/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the CAAM backend and dependent components | 3 | # Makefile for the CAAM backend and dependent components |
| 3 | # | 4 | # |
diff --git a/drivers/crypto/caam/caamalg_desc.h b/drivers/crypto/caam/caamalg_desc.h index 8731e4a7ff05..e412ec8f7005 100644 --- a/drivers/crypto/caam/caamalg_desc.h +++ b/drivers/crypto/caam/caamalg_desc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Shared descriptors for aead, ablkcipher algorithms | 3 | * Shared descriptors for aead, ablkcipher algorithms |
| 3 | * | 4 | * |
diff --git a/drivers/crypto/caam/caampkc.h b/drivers/crypto/caam/caampkc.h index 87ab75e9df43..fd145c46eae1 100644 --- a/drivers/crypto/caam/caampkc.h +++ b/drivers/crypto/caam/caampkc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * caam - Freescale FSL CAAM support for Public Key Cryptography descriptors | 3 | * caam - Freescale FSL CAAM support for Public Key Cryptography descriptors |
| 3 | * | 4 | * |
diff --git a/drivers/crypto/caam/compat.h b/drivers/crypto/caam/compat.h index 7149cd2492e0..5f2f1b288d37 100644 --- a/drivers/crypto/caam/compat.h +++ b/drivers/crypto/caam/compat.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright 2008-2011 Freescale Semiconductor, Inc. | 3 | * Copyright 2008-2011 Freescale Semiconductor, Inc. |
| 3 | */ | 4 | */ |
diff --git a/drivers/crypto/caam/ctrl.h b/drivers/crypto/caam/ctrl.h index 7e7bf68c9ef5..be693a2cc25e 100644 --- a/drivers/crypto/caam/ctrl.h +++ b/drivers/crypto/caam/ctrl.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * CAAM control-plane driver backend public-level include definitions | 3 | * CAAM control-plane driver backend public-level include definitions |
| 3 | * | 4 | * |
diff --git a/drivers/crypto/caam/desc.h b/drivers/crypto/caam/desc.h index 2e6766a1573f..6633fbb80e74 100644 --- a/drivers/crypto/caam/desc.h +++ b/drivers/crypto/caam/desc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * CAAM descriptor composition header | 3 | * CAAM descriptor composition header |
| 3 | * Definitions to support CAAM descriptor instruction generation | 4 | * Definitions to support CAAM descriptor instruction generation |
diff --git a/drivers/crypto/caam/desc_constr.h b/drivers/crypto/caam/desc_constr.h index d8e83ca104e0..ba1ca0806f0a 100644 --- a/drivers/crypto/caam/desc_constr.h +++ b/drivers/crypto/caam/desc_constr.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * caam descriptor construction helper functions | 3 | * caam descriptor construction helper functions |
| 3 | * | 4 | * |
diff --git a/drivers/crypto/caam/error.c b/drivers/crypto/caam/error.c index 3d639f3b45aa..8da88beb1abb 100644 --- a/drivers/crypto/caam/error.c +++ b/drivers/crypto/caam/error.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * CAAM Error Reporting | 3 | * CAAM Error Reporting |
| 3 | * | 4 | * |
diff --git a/drivers/crypto/caam/error.h b/drivers/crypto/caam/error.h index 250e1a21c473..5aa332bac4b0 100644 --- a/drivers/crypto/caam/error.h +++ b/drivers/crypto/caam/error.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * CAAM Error Reporting code header | 3 | * CAAM Error Reporting code header |
| 3 | * | 4 | * |
diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h index a52361258d3a..91f1107276e5 100644 --- a/drivers/crypto/caam/intern.h +++ b/drivers/crypto/caam/intern.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * CAAM/SEC 4.x driver backend | 3 | * CAAM/SEC 4.x driver backend |
| 3 | * Private/internal definitions between modules | 4 | * Private/internal definitions between modules |
diff --git a/drivers/crypto/caam/jr.h b/drivers/crypto/caam/jr.h index 97113a6d6c58..eab611530f36 100644 --- a/drivers/crypto/caam/jr.h +++ b/drivers/crypto/caam/jr.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * CAAM public-level include definitions for the JobR backend | 3 | * CAAM public-level include definitions for the JobR backend |
| 3 | * | 4 | * |
diff --git a/drivers/crypto/caam/key_gen.c b/drivers/crypto/caam/key_gen.c index c425d4adaf2a..8c79c3a153dc 100644 --- a/drivers/crypto/caam/key_gen.c +++ b/drivers/crypto/caam/key_gen.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * CAAM/SEC 4.x functions for handling key-generation jobs | 3 | * CAAM/SEC 4.x functions for handling key-generation jobs |
| 3 | * | 4 | * |
diff --git a/drivers/crypto/caam/key_gen.h b/drivers/crypto/caam/key_gen.h index 4628f389eb64..5db055c25bd2 100644 --- a/drivers/crypto/caam/key_gen.h +++ b/drivers/crypto/caam/key_gen.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * CAAM/SEC 4.x definitions for handling key-generation jobs | 3 | * CAAM/SEC 4.x definitions for handling key-generation jobs |
| 3 | * | 4 | * |
diff --git a/drivers/crypto/caam/pdb.h b/drivers/crypto/caam/pdb.h index 31e59963f4d2..810f0bef0652 100644 --- a/drivers/crypto/caam/pdb.h +++ b/drivers/crypto/caam/pdb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * CAAM Protocol Data Block (PDB) definition header file | 3 | * CAAM Protocol Data Block (PDB) definition header file |
| 3 | * | 4 | * |
diff --git a/drivers/crypto/caam/pkc_desc.c b/drivers/crypto/caam/pkc_desc.c index 9e2ce6fe2e43..2a8d87ea94bf 100644 --- a/drivers/crypto/caam/pkc_desc.c +++ b/drivers/crypto/caam/pkc_desc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * caam - Freescale FSL CAAM support for Public Key Cryptography descriptors | 3 | * caam - Freescale FSL CAAM support for Public Key Cryptography descriptors |
| 3 | * | 4 | * |
diff --git a/drivers/crypto/caam/qi.c b/drivers/crypto/caam/qi.c index e4cf00014233..f9a44f485aac 100644 --- a/drivers/crypto/caam/qi.c +++ b/drivers/crypto/caam/qi.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * CAAM/SEC 4.x QI transport/backend driver | 3 | * CAAM/SEC 4.x QI transport/backend driver |
| 3 | * Queue Interface backend functionality | 4 | * Queue Interface backend functionality |
diff --git a/drivers/crypto/caam/qi.h b/drivers/crypto/caam/qi.h index ecb21f207637..357b69f57072 100644 --- a/drivers/crypto/caam/qi.h +++ b/drivers/crypto/caam/qi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Public definitions for the CAAM/QI (Queue Interface) backend. | 3 | * Public definitions for the CAAM/QI (Queue Interface) backend. |
| 3 | * | 4 | * |
diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h index 17cfd23a38fa..fee363865d88 100644 --- a/drivers/crypto/caam/regs.h +++ b/drivers/crypto/caam/regs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * CAAM hardware register-level view | 3 | * CAAM hardware register-level view |
| 3 | * | 4 | * |
diff --git a/drivers/crypto/caam/sg_sw_sec4.h b/drivers/crypto/caam/sg_sw_sec4.h index 936b1b630058..e586ffab8358 100644 --- a/drivers/crypto/caam/sg_sw_sec4.h +++ b/drivers/crypto/caam/sg_sw_sec4.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * CAAM/SEC 4.x functions for using scatterlists in caam driver | 3 | * CAAM/SEC 4.x functions for using scatterlists in caam driver |
| 3 | * | 4 | * |
diff --git a/drivers/crypto/cavium/nitrox/Makefile b/drivers/crypto/cavium/nitrox/Makefile index 5af2e4368267..45b7379e8e30 100644 --- a/drivers/crypto/cavium/nitrox/Makefile +++ b/drivers/crypto/cavium/nitrox/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_CRYPTO_DEV_NITROX_CNN55XX) += n5pf.o | 2 | obj-$(CONFIG_CRYPTO_DEV_NITROX_CNN55XX) += n5pf.o |
| 2 | 3 | ||
| 3 | n5pf-objs := nitrox_main.o \ | 4 | n5pf-objs := nitrox_main.o \ |
diff --git a/drivers/crypto/cavium/nitrox/nitrox_algs.c b/drivers/crypto/cavium/nitrox/nitrox_algs.c index ce330278ef8a..2ae6124e5da6 100644 --- a/drivers/crypto/cavium/nitrox/nitrox_algs.c +++ b/drivers/crypto/cavium/nitrox/nitrox_algs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/crypto.h> | 2 | #include <linux/crypto.h> |
| 2 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 3 | #include <linux/module.h> | 4 | #include <linux/module.h> |
diff --git a/drivers/crypto/cavium/nitrox/nitrox_common.h b/drivers/crypto/cavium/nitrox/nitrox_common.h index 4888c7823a5f..312f72801af6 100644 --- a/drivers/crypto/cavium/nitrox/nitrox_common.h +++ b/drivers/crypto/cavium/nitrox/nitrox_common.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NITROX_COMMON_H | 2 | #ifndef __NITROX_COMMON_H |
| 2 | #define __NITROX_COMMON_H | 3 | #define __NITROX_COMMON_H |
| 3 | 4 | ||
diff --git a/drivers/crypto/cavium/nitrox/nitrox_csr.h b/drivers/crypto/cavium/nitrox/nitrox_csr.h index 30b04c4c6076..9dcb7fdbe0a7 100644 --- a/drivers/crypto/cavium/nitrox/nitrox_csr.h +++ b/drivers/crypto/cavium/nitrox/nitrox_csr.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NITROX_CSR_H | 2 | #ifndef __NITROX_CSR_H |
| 2 | #define __NITROX_CSR_H | 3 | #define __NITROX_CSR_H |
| 3 | 4 | ||
diff --git a/drivers/crypto/cavium/nitrox/nitrox_dev.h b/drivers/crypto/cavium/nitrox/nitrox_dev.h index 57858b04f165..9a476bb6d4c7 100644 --- a/drivers/crypto/cavium/nitrox/nitrox_dev.h +++ b/drivers/crypto/cavium/nitrox/nitrox_dev.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NITROX_DEV_H | 2 | #ifndef __NITROX_DEV_H |
| 2 | #define __NITROX_DEV_H | 3 | #define __NITROX_DEV_H |
| 3 | 4 | ||
diff --git a/drivers/crypto/cavium/nitrox/nitrox_hal.c b/drivers/crypto/cavium/nitrox/nitrox_hal.c index f0655f82fa7d..bf9900bc4804 100644 --- a/drivers/crypto/cavium/nitrox/nitrox_hal.c +++ b/drivers/crypto/cavium/nitrox/nitrox_hal.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/delay.h> | 2 | #include <linux/delay.h> |
| 2 | 3 | ||
| 3 | #include "nitrox_dev.h" | 4 | #include "nitrox_dev.h" |
diff --git a/drivers/crypto/cavium/nitrox/nitrox_isr.c b/drivers/crypto/cavium/nitrox/nitrox_isr.c index 71f934871a89..dbead5f45df3 100644 --- a/drivers/crypto/cavium/nitrox/nitrox_isr.c +++ b/drivers/crypto/cavium/nitrox/nitrox_isr.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/pci.h> | 2 | #include <linux/pci.h> |
| 2 | #include <linux/printk.h> | 3 | #include <linux/printk.h> |
| 3 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
diff --git a/drivers/crypto/cavium/nitrox/nitrox_lib.c b/drivers/crypto/cavium/nitrox/nitrox_lib.c index b4a391adb9b6..4fdc921ba611 100644 --- a/drivers/crypto/cavium/nitrox/nitrox_lib.c +++ b/drivers/crypto/cavium/nitrox/nitrox_lib.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/cpumask.h> | 2 | #include <linux/cpumask.h> |
| 2 | #include <linux/dma-mapping.h> | 3 | #include <linux/dma-mapping.h> |
| 3 | #include <linux/dmapool.h> | 4 | #include <linux/dmapool.h> |
diff --git a/drivers/crypto/cavium/nitrox/nitrox_req.h b/drivers/crypto/cavium/nitrox/nitrox_req.h index 74f4c20dc87d..d091b6f5f5dd 100644 --- a/drivers/crypto/cavium/nitrox/nitrox_req.h +++ b/drivers/crypto/cavium/nitrox/nitrox_req.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NITROX_REQ_H | 2 | #ifndef __NITROX_REQ_H |
| 2 | #define __NITROX_REQ_H | 3 | #define __NITROX_REQ_H |
| 3 | 4 | ||
diff --git a/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c b/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c index 4bb4377c5ac0..4addc238a6ef 100644 --- a/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c +++ b/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/gfp.h> | 2 | #include <linux/gfp.h> |
| 2 | #include <linux/workqueue.h> | 3 | #include <linux/workqueue.h> |
| 3 | #include <crypto/internal/skcipher.h> | 4 | #include <crypto/internal/skcipher.h> |
diff --git a/drivers/crypto/cavium/zip/Makefile b/drivers/crypto/cavium/zip/Makefile index b2f3baaff757..020d189d793d 100644 --- a/drivers/crypto/cavium/zip/Makefile +++ b/drivers/crypto/cavium/zip/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for Cavium's ZIP Driver. | 3 | # Makefile for Cavium's ZIP Driver. |
| 3 | # | 4 | # |
diff --git a/drivers/crypto/ccp/Makefile b/drivers/crypto/ccp/Makefile index 57f8debfcfb3..c4ce726b931e 100644 --- a/drivers/crypto/ccp/Makefile +++ b/drivers/crypto/ccp/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_CRYPTO_DEV_CCP_DD) += ccp.o | 2 | obj-$(CONFIG_CRYPTO_DEV_CCP_DD) += ccp.o |
| 2 | ccp-objs := sp-dev.o sp-platform.o | 3 | ccp-objs := sp-dev.o sp-platform.o |
| 3 | ccp-$(CONFIG_CRYPTO_DEV_SP_CCP) += ccp-dev.o \ | 4 | ccp-$(CONFIG_CRYPTO_DEV_SP_CCP) += ccp-dev.o \ |
diff --git a/drivers/crypto/marvell/cesa.h b/drivers/crypto/marvell/cesa.h index b7872f62f674..0032e3bf46ee 100644 --- a/drivers/crypto/marvell/cesa.h +++ b/drivers/crypto/marvell/cesa.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MARVELL_CESA_H__ | 2 | #ifndef __MARVELL_CESA_H__ |
| 2 | #define __MARVELL_CESA_H__ | 3 | #define __MARVELL_CESA_H__ |
| 3 | 4 | ||
diff --git a/drivers/crypto/mv_cesa.h b/drivers/crypto/mv_cesa.h index 9249d3ed184b..0be3f0aa4afd 100644 --- a/drivers/crypto/mv_cesa.h +++ b/drivers/crypto/mv_cesa.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MV_CRYPTO_H__ | 2 | #ifndef __MV_CRYPTO_H__ |
| 2 | #define __MV_CRYPTO_H__ | 3 | #define __MV_CRYPTO_H__ |
| 3 | 4 | ||
diff --git a/drivers/crypto/n2_asm.S b/drivers/crypto/n2_asm.S index f7c793745a1e..9a67dbf340f4 100644 --- a/drivers/crypto/n2_asm.S +++ b/drivers/crypto/n2_asm.S | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* n2_asm.S: Hypervisor calls for NCS support. | 2 | /* n2_asm.S: Hypervisor calls for NCS support. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2009 David S. Miller <davem@davemloft.net> | 4 | * Copyright (C) 2009 David S. Miller <davem@davemloft.net> |
diff --git a/drivers/crypto/n2_core.h b/drivers/crypto/n2_core.h index 4bcbbeae98f5..2406763b0306 100644 --- a/drivers/crypto/n2_core.h +++ b/drivers/crypto/n2_core.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _N2_CORE_H | 2 | #ifndef _N2_CORE_H |
| 2 | #define _N2_CORE_H | 3 | #define _N2_CORE_H |
| 3 | 4 | ||
diff --git a/drivers/crypto/nx/Makefile b/drivers/crypto/nx/Makefile index b727821c8ed4..015155da59c2 100644 --- a/drivers/crypto/nx/Makefile +++ b/drivers/crypto/nx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_CRYPTO_DEV_NX_ENCRYPT) += nx-crypto.o | 2 | obj-$(CONFIG_CRYPTO_DEV_NX_ENCRYPT) += nx-crypto.o |
| 2 | nx-crypto-objs := nx.o \ | 3 | nx-crypto-objs := nx.o \ |
| 3 | nx_debugfs.o \ | 4 | nx_debugfs.o \ |
diff --git a/drivers/crypto/nx/nx-842.h b/drivers/crypto/nx/nx-842.h index bb2f31792683..b66f19ac600f 100644 --- a/drivers/crypto/nx/nx-842.h +++ b/drivers/crypto/nx/nx-842.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #ifndef __NX_842_H__ | 3 | #ifndef __NX_842_H__ |
| 3 | #define __NX_842_H__ | 4 | #define __NX_842_H__ |
diff --git a/drivers/crypto/nx/nx.h b/drivers/crypto/nx/nx.h index 9347878d4f30..c3e54af18645 100644 --- a/drivers/crypto/nx/nx.h +++ b/drivers/crypto/nx/nx.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #ifndef __NX_H__ | 3 | #ifndef __NX_H__ |
| 3 | #define __NX_H__ | 4 | #define __NX_H__ |
diff --git a/drivers/crypto/nx/nx_csbcpb.h b/drivers/crypto/nx/nx_csbcpb.h index a304f956d6f8..493f8490ff94 100644 --- a/drivers/crypto/nx/nx_csbcpb.h +++ b/drivers/crypto/nx/nx_csbcpb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #ifndef __NX_CSBCPB_H__ | 3 | #ifndef __NX_CSBCPB_H__ |
| 3 | #define __NX_CSBCPB_H__ | 4 | #define __NX_CSBCPB_H__ |
diff --git a/drivers/crypto/qat/Makefile b/drivers/crypto/qat/Makefile index 8265106f1c8e..7dd15e751d02 100644 --- a/drivers/crypto/qat/Makefile +++ b/drivers/crypto/qat/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_CRYPTO_DEV_QAT) += qat_common/ | 2 | obj-$(CONFIG_CRYPTO_DEV_QAT) += qat_common/ |
| 2 | obj-$(CONFIG_CRYPTO_DEV_QAT_DH895xCC) += qat_dh895xcc/ | 3 | obj-$(CONFIG_CRYPTO_DEV_QAT_DH895xCC) += qat_dh895xcc/ |
| 3 | obj-$(CONFIG_CRYPTO_DEV_QAT_C3XXX) += qat_c3xxx/ | 4 | obj-$(CONFIG_CRYPTO_DEV_QAT_C3XXX) += qat_c3xxx/ |
diff --git a/drivers/crypto/qat/qat_common/Makefile b/drivers/crypto/qat/qat_common/Makefile index 92fb6ffdc062..47a8e3d8b81a 100644 --- a/drivers/crypto/qat/qat_common/Makefile +++ b/drivers/crypto/qat/qat_common/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_CRYPTO_DEV_QAT) += intel_qat.o | 2 | obj-$(CONFIG_CRYPTO_DEV_QAT) += intel_qat.o |
| 2 | intel_qat-objs := adf_cfg.o \ | 3 | intel_qat-objs := adf_cfg.o \ |
| 3 | adf_isr.o \ | 4 | adf_isr.o \ |
diff --git a/drivers/crypto/qce/Makefile b/drivers/crypto/qce/Makefile index 348dc3173afa..19a7f899acff 100644 --- a/drivers/crypto/qce/Makefile +++ b/drivers/crypto/qce/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_CRYPTO_DEV_QCE) += qcrypto.o | 2 | obj-$(CONFIG_CRYPTO_DEV_QCE) += qcrypto.o |
| 2 | qcrypto-objs := core.o \ | 3 | qcrypto-objs := core.o \ |
| 3 | common.o \ | 4 | common.o \ |
diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/rk3288_crypto.h index ab6a1b4c40f0..d5fb4013fb42 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __RK3288_CRYPTO_H__ | 2 | #ifndef __RK3288_CRYPTO_H__ |
| 2 | #define __RK3288_CRYPTO_H__ | 3 | #define __RK3288_CRYPTO_H__ |
| 3 | 4 | ||
diff --git a/drivers/crypto/virtio/Makefile b/drivers/crypto/virtio/Makefile index dd342c947ff9..cbfccccfa135 100644 --- a/drivers/crypto/virtio/Makefile +++ b/drivers/crypto/virtio/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_CRYPTO_DEV_VIRTIO) += virtio_crypto.o | 2 | obj-$(CONFIG_CRYPTO_DEV_VIRTIO) += virtio_crypto.o |
| 2 | virtio_crypto-objs := \ | 3 | virtio_crypto-objs := \ |
| 3 | virtio_crypto_algs.o \ | 4 | virtio_crypto_algs.o \ |
diff --git a/drivers/crypto/vmx/Makefile b/drivers/crypto/vmx/Makefile index 55f7c392582f..cab32cfec9c4 100644 --- a/drivers/crypto/vmx/Makefile +++ b/drivers/crypto/vmx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_CRYPTO_DEV_VMX_ENCRYPT) += vmx-crypto.o | 2 | obj-$(CONFIG_CRYPTO_DEV_VMX_ENCRYPT) += vmx-crypto.o |
| 2 | vmx-crypto-objs := vmx.o aesp8-ppc.o ghashp8-ppc.o aes.o aes_cbc.o aes_ctr.o aes_xts.o ghash.o | 3 | vmx-crypto-objs := vmx.o aesp8-ppc.o ghashp8-ppc.o aes.o aes_cbc.o aes_ctr.o aes_xts.o ghash.o |
| 3 | 4 | ||
diff --git a/drivers/crypto/vmx/aesp8-ppc.h b/drivers/crypto/vmx/aesp8-ppc.h index 01972e16a6c0..349646b73754 100644 --- a/drivers/crypto/vmx/aesp8-ppc.h +++ b/drivers/crypto/vmx/aesp8-ppc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/types.h> | 2 | #include <linux/types.h> |
| 2 | #include <crypto/aes.h> | 3 | #include <crypto/aes.h> |
| 3 | 4 | ||
diff --git a/drivers/crypto/vmx/ppc-xlate.pl b/drivers/crypto/vmx/ppc-xlate.pl index b18e67d0e065..36db2ef09e5b 100644 --- a/drivers/crypto/vmx/ppc-xlate.pl +++ b/drivers/crypto/vmx/ppc-xlate.pl | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #!/usr/bin/env perl | 1 | #!/usr/bin/env perl |
| 2 | # SPDX-License-Identifier: GPL-2.0 | ||
| 2 | 3 | ||
| 3 | # PowerPC assembler distiller by <appro>. | 4 | # PowerPC assembler distiller by <appro>. |
| 4 | 5 | ||
diff --git a/drivers/dax/Makefile b/drivers/dax/Makefile index dc7422530462..574286fac87c 100644 --- a/drivers/dax/Makefile +++ b/drivers/dax/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_DAX) += dax.o | 2 | obj-$(CONFIG_DAX) += dax.o |
| 2 | obj-$(CONFIG_DEV_DAX) += device_dax.o | 3 | obj-$(CONFIG_DEV_DAX) += device_dax.o |
| 3 | obj-$(CONFIG_DEV_DAX_PMEM) += dax_pmem.o | 4 | obj-$(CONFIG_DEV_DAX_PMEM) += dax_pmem.o |
diff --git a/drivers/devfreq/Makefile b/drivers/devfreq/Makefile index fbff40a508a4..32b8d4d3f12c 100644 --- a/drivers/devfreq/Makefile +++ b/drivers/devfreq/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_PM_DEVFREQ) += devfreq.o | 2 | obj-$(CONFIG_PM_DEVFREQ) += devfreq.o |
| 2 | obj-$(CONFIG_PM_DEVFREQ_EVENT) += devfreq-event.o | 3 | obj-$(CONFIG_PM_DEVFREQ_EVENT) += devfreq-event.o |
| 3 | obj-$(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND) += governor_simpleondemand.o | 4 | obj-$(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND) += governor_simpleondemand.o |
diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c index 0d0677f23916..92e78d16b476 100644 --- a/drivers/dio/dio.c +++ b/drivers/dio/dio.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* Code to support devices on the DIO and DIO-II bus | 2 | /* Code to support devices on the DIO and DIO-II bus |
| 2 | * Copyright (C) 05/1998 Peter Maydell <pmaydell@chiark.greenend.org.uk> | 3 | * Copyright (C) 05/1998 Peter Maydell <pmaydell@chiark.greenend.org.uk> |
| 3 | * Copyright (C) 2004 Jochen Friedrich <jochen@scram.de> | 4 | * Copyright (C) 2004 Jochen Friedrich <jochen@scram.de> |
diff --git a/drivers/dma-buf/sync_trace.h b/drivers/dma-buf/sync_trace.h index d13d59ff1b85..06e468a218ff 100644 --- a/drivers/dma-buf/sync_trace.h +++ b/drivers/dma-buf/sync_trace.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #undef TRACE_SYSTEM | 2 | #undef TRACE_SYSTEM |
| 2 | #define TRACE_INCLUDE_PATH ../../drivers/dma-buf | 3 | #define TRACE_INCLUDE_PATH ../../drivers/dma-buf |
| 3 | #define TRACE_SYSTEM sync_trace | 4 | #define TRACE_SYSTEM sync_trace |
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index f08f8de1b567..9d0156b50294 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #dmaengine debug flags | 2 | #dmaengine debug flags |
| 2 | subdir-ccflags-$(CONFIG_DMADEVICES_DEBUG) := -DDEBUG | 3 | subdir-ccflags-$(CONFIG_DMADEVICES_DEBUG) := -DDEBUG |
| 3 | subdir-ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG | 4 | subdir-ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG |
diff --git a/drivers/dma/bestcomm/Makefile b/drivers/dma/bestcomm/Makefile index aed2df2a6580..8d1b33a2f0a1 100644 --- a/drivers/dma/bestcomm/Makefile +++ b/drivers/dma/bestcomm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for BestComm & co | 3 | # Makefile for BestComm & co |
| 3 | # | 4 | # |
diff --git a/drivers/dma/dmaengine.h b/drivers/dma/dmaengine.h index 882ff9448c3b..501c0b063f85 100644 --- a/drivers/dma/dmaengine.h +++ b/drivers/dma/dmaengine.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * The contents of this file are private to DMA engine drivers, and is not | 3 | * The contents of this file are private to DMA engine drivers, and is not |
| 3 | * part of the API to be used by DMA engine users. | 4 | * part of the API to be used by DMA engine users. |
diff --git a/drivers/dma/dw/Makefile b/drivers/dma/dw/Makefile index 3eebd1ce2c6b..2b949c2e4504 100644 --- a/drivers/dma/dw/Makefile +++ b/drivers/dma/dw/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_DW_DMAC_CORE) += dw_dmac_core.o | 2 | obj-$(CONFIG_DW_DMAC_CORE) += dw_dmac_core.o |
| 2 | dw_dmac_core-objs := core.o | 3 | dw_dmac_core-objs := core.o |
| 3 | 4 | ||
diff --git a/drivers/dma/qcom/Makefile b/drivers/dma/qcom/Makefile index 4bfc38b45220..1ae92da88b0c 100644 --- a/drivers/dma/qcom/Makefile +++ b/drivers/dma/qcom/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_QCOM_BAM_DMA) += bam_dma.o | 2 | obj-$(CONFIG_QCOM_BAM_DMA) += bam_dma.o |
| 2 | obj-$(CONFIG_QCOM_HIDMA_MGMT) += hdma_mgmt.o | 3 | obj-$(CONFIG_QCOM_HIDMA_MGMT) += hdma_mgmt.o |
| 3 | hdma_mgmt-objs := hidma_mgmt.o hidma_mgmt_sys.o | 4 | hdma_mgmt-objs := hidma_mgmt.o hidma_mgmt_sys.o |
diff --git a/drivers/dma/sh/Makefile b/drivers/dma/sh/Makefile index f1e2fd64f279..7d7c9491ade1 100644 --- a/drivers/dma/sh/Makefile +++ b/drivers/dma/sh/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # DMA Engine Helpers | 3 | # DMA Engine Helpers |
| 3 | # | 4 | # |
diff --git a/drivers/edac/amd64_edac_dbg.c b/drivers/edac/amd64_edac_dbg.c index 4709c6079848..393be3351493 100644 --- a/drivers/edac/amd64_edac_dbg.c +++ b/drivers/edac/amd64_edac_dbg.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "amd64_edac.h" | 2 | #include "amd64_edac.h" |
| 2 | 3 | ||
| 3 | #define EDAC_DCT_ATTR_SHOW(reg) \ | 4 | #define EDAC_DCT_ATTR_SHOW(reg) \ |
diff --git a/drivers/edac/amd64_edac_inj.c b/drivers/edac/amd64_edac_inj.c index e14977ff95db..d96d6116f0fb 100644 --- a/drivers/edac/amd64_edac_inj.c +++ b/drivers/edac/amd64_edac_inj.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "amd64_edac.h" | 2 | #include "amd64_edac.h" |
| 2 | 3 | ||
| 3 | static ssize_t amd64_inject_section_show(struct device *dev, | 4 | static ssize_t amd64_inject_section_show(struct device *dev, |
diff --git a/drivers/edac/edac_module.h b/drivers/edac/edac_module.h index 014871e169cc..dec88dcea036 100644 --- a/drivers/edac/edac_module.h +++ b/drivers/edac/edac_module.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | /* | 3 | /* |
| 3 | * edac_module.h | 4 | * edac_module.h |
diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h index 0b6a68673e0e..4e9c5e596c6c 100644 --- a/drivers/edac/mce_amd.h +++ b/drivers/edac/mce_amd.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _EDAC_MCE_AMD_H | 2 | #ifndef _EDAC_MCE_AMD_H |
| 2 | #define _EDAC_MCE_AMD_H | 3 | #define _EDAC_MCE_AMD_H |
| 3 | 4 | ||
diff --git a/drivers/eisa/Makefile b/drivers/eisa/Makefile index 5369ce957c6d..a1dd0eaec2d4 100644 --- a/drivers/eisa/Makefile +++ b/drivers/eisa/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for the Linux device tree | 2 | # Makefile for the Linux device tree |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_EISA) += eisa-bus.o | 4 | obj-$(CONFIG_EISA) += eisa-bus.o |
diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile index a73624e76193..0888fdeded72 100644 --- a/drivers/extcon/Makefile +++ b/drivers/extcon/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | # Makefile for external connector class (extcon) devices | 3 | # Makefile for external connector class (extcon) devices |
| 3 | # | 4 | # |
diff --git a/drivers/extcon/extcon.h b/drivers/extcon/extcon.h index dddddcfa0587..61358479bfcc 100644 --- a/drivers/extcon/extcon.h +++ b/drivers/extcon/extcon.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __LINUX_EXTCON_INTERNAL_H__ | 2 | #ifndef __LINUX_EXTCON_INTERNAL_H__ |
| 2 | #define __LINUX_EXTCON_INTERNAL_H__ | 3 | #define __LINUX_EXTCON_INTERNAL_H__ |
| 3 | 4 | ||
diff --git a/drivers/firewire/Makefile b/drivers/firewire/Makefile index e3870d5c43dd..e58c8c794778 100644 --- a/drivers/firewire/Makefile +++ b/drivers/firewire/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux IEEE 1394 implementation | 3 | # Makefile for the Linux IEEE 1394 implementation |
| 3 | # | 4 | # |
diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h index c07962ead5e4..0f0bed3a4bbb 100644 --- a/drivers/firewire/core.h +++ b/drivers/firewire/core.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _FIREWIRE_CORE_H | 2 | #ifndef _FIREWIRE_CORE_H |
| 2 | #define _FIREWIRE_CORE_H | 3 | #define _FIREWIRE_CORE_H |
| 3 | 4 | ||
diff --git a/drivers/firewire/nosy-user.h b/drivers/firewire/nosy-user.h index e48aa6200c72..3446c5b772e5 100644 --- a/drivers/firewire/nosy-user.h +++ b/drivers/firewire/nosy-user.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __nosy_user_h | 2 | #ifndef __nosy_user_h |
| 2 | #define __nosy_user_h | 3 | #define __nosy_user_h |
| 3 | 4 | ||
diff --git a/drivers/firewire/nosy.h b/drivers/firewire/nosy.h index 078ff27f4756..4078d69e93f8 100644 --- a/drivers/firewire/nosy.h +++ b/drivers/firewire/nosy.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Chip register definitions for PCILynx chipset. Based on pcilynx.h | 3 | * Chip register definitions for PCILynx chipset. Based on pcilynx.h |
| 3 | * from the Linux 1394 drivers, but modified a bit so the names here | 4 | * from the Linux 1394 drivers, but modified a bit so the names here |
diff --git a/drivers/firewire/ohci.h b/drivers/firewire/ohci.h index ef5e7336da68..c4d005a9901a 100644 --- a/drivers/firewire/ohci.h +++ b/drivers/firewire/ohci.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _FIREWIRE_OHCI_H | 2 | #ifndef _FIREWIRE_OHCI_H |
| 2 | #define _FIREWIRE_OHCI_H | 3 | #define _FIREWIRE_OHCI_H |
| 3 | 4 | ||
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index a37f12e8d137..feaa890197f3 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the linux kernel. | 3 | # Makefile for the linux kernel. |
| 3 | # | 4 | # |
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile index 0329d319d89a..269501dfba53 100644 --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for linux kernel | 3 | # Makefile for linux kernel |
| 3 | # | 4 | # |
diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile index dedf9bde44db..adaa4a964f0c 100644 --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # The stub may be linked into the kernel proper or into a separate boot binary, | 3 | # The stub may be linked into the kernel proper or into a separate boot binary, |
| 3 | # but in either case, it executes before the kernel does (with MMU disabled) so | 4 | # but in either case, it executes before the kernel does (with MMU disabled) so |
| @@ -33,13 +34,14 @@ lib-y := efi-stub-helper.o gop.o secureboot.o | |||
| 33 | lib-$(CONFIG_RESET_ATTACK_MITIGATION) += tpm.o | 34 | lib-$(CONFIG_RESET_ATTACK_MITIGATION) += tpm.o |
| 34 | 35 | ||
| 35 | # include the stub's generic dependencies from lib/ when building for ARM/arm64 | 36 | # include the stub's generic dependencies from lib/ when building for ARM/arm64 |
| 36 | arm-deps := fdt_rw.c fdt_ro.c fdt_wip.c fdt.c fdt_empty_tree.c fdt_sw.c sort.c | 37 | arm-deps-y := fdt_rw.c fdt_ro.c fdt_wip.c fdt.c fdt_empty_tree.c fdt_sw.c |
| 38 | arm-deps-$(CONFIG_ARM64) += sort.c | ||
| 37 | 39 | ||
| 38 | $(obj)/lib-%.o: $(srctree)/lib/%.c FORCE | 40 | $(obj)/lib-%.o: $(srctree)/lib/%.c FORCE |
| 39 | $(call if_changed_rule,cc_o_c) | 41 | $(call if_changed_rule,cc_o_c) |
| 40 | 42 | ||
| 41 | lib-$(CONFIG_EFI_ARMSTUB) += arm-stub.o fdt.o string.o random.o \ | 43 | lib-$(CONFIG_EFI_ARMSTUB) += arm-stub.o fdt.o string.o random.o \ |
| 42 | $(patsubst %.c,lib-%.o,$(arm-deps)) | 44 | $(patsubst %.c,lib-%.o,$(arm-deps-y)) |
| 43 | 45 | ||
| 44 | lib-$(CONFIG_ARM) += arm32-stub.o | 46 | lib-$(CONFIG_ARM) += arm32-stub.o |
| 45 | lib-$(CONFIG_ARM64) += arm64-stub.o | 47 | lib-$(CONFIG_ARM64) += arm64-stub.o |
| @@ -90,5 +92,4 @@ quiet_cmd_stubcopy = STUBCPY $@ | |||
| 90 | # explicitly by the decompressor linker script. | 92 | # explicitly by the decompressor linker script. |
| 91 | # | 93 | # |
| 92 | STUBCOPY_FLAGS-$(CONFIG_ARM) += --rename-section .data=.data.efistub | 94 | STUBCOPY_FLAGS-$(CONFIG_ARM) += --rename-section .data=.data.efistub |
| 93 | STUBCOPY_RM-$(CONFIG_ARM) += -R ___ksymtab+sort -R ___kcrctab+sort | ||
| 94 | STUBCOPY_RELOC-$(CONFIG_ARM) := R_ARM_ABS | 95 | STUBCOPY_RELOC-$(CONFIG_ARM) := R_ARM_ABS |
diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c index 1cb2d1c070c3..01a9d78ee415 100644 --- a/drivers/firmware/efi/libstub/arm-stub.c +++ b/drivers/firmware/efi/libstub/arm-stub.c | |||
| @@ -238,7 +238,8 @@ unsigned long efi_entry(void *handle, efi_system_table_t *sys_table, | |||
| 238 | 238 | ||
| 239 | efi_random_get_seed(sys_table); | 239 | efi_random_get_seed(sys_table); |
| 240 | 240 | ||
| 241 | if (!nokaslr()) { | 241 | /* hibernation expects the runtime regions to stay in the same place */ |
| 242 | if (!IS_ENABLED(CONFIG_HIBERNATION) && !nokaslr()) { | ||
| 242 | /* | 243 | /* |
| 243 | * Randomize the base of the UEFI runtime services region. | 244 | * Randomize the base of the UEFI runtime services region. |
| 244 | * Preserve the 2 MB alignment of the region by taking a | 245 | * Preserve the 2 MB alignment of the region by taking a |
| @@ -349,7 +350,9 @@ void efi_get_virtmap(efi_memory_desc_t *memory_map, unsigned long map_size, | |||
| 349 | * The easiest way to find adjacent regions is to sort the memory map | 350 | * The easiest way to find adjacent regions is to sort the memory map |
| 350 | * before traversing it. | 351 | * before traversing it. |
| 351 | */ | 352 | */ |
| 352 | sort(memory_map, map_size / desc_size, desc_size, cmp_mem_desc, NULL); | 353 | if (IS_ENABLED(CONFIG_ARM64)) |
| 354 | sort(memory_map, map_size / desc_size, desc_size, cmp_mem_desc, | ||
| 355 | NULL); | ||
| 353 | 356 | ||
| 354 | for (l = 0; l < map_size; l += desc_size, prev = in) { | 357 | for (l = 0; l < map_size; l += desc_size, prev = in) { |
| 355 | u64 paddr, size; | 358 | u64 paddr, size; |
| @@ -366,7 +369,8 @@ void efi_get_virtmap(efi_memory_desc_t *memory_map, unsigned long map_size, | |||
| 366 | * a 4k page size kernel to kexec a 64k page size kernel and | 369 | * a 4k page size kernel to kexec a 64k page size kernel and |
| 367 | * vice versa. | 370 | * vice versa. |
| 368 | */ | 371 | */ |
| 369 | if (!regions_are_adjacent(prev, in) || | 372 | if ((IS_ENABLED(CONFIG_ARM64) && |
| 373 | !regions_are_adjacent(prev, in)) || | ||
| 370 | !regions_have_compatible_memory_type_attrs(prev, in)) { | 374 | !regions_have_compatible_memory_type_attrs(prev, in)) { |
| 371 | 375 | ||
| 372 | paddr = round_down(in->phys_addr, SZ_64K); | 376 | paddr = round_down(in->phys_addr, SZ_64K); |
diff --git a/drivers/firmware/efi/libstub/efistub.h b/drivers/firmware/efi/libstub/efistub.h index 83f268c05007..f59564b72ddc 100644 --- a/drivers/firmware/efi/libstub/efistub.h +++ b/drivers/firmware/efi/libstub/efistub.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #ifndef _DRIVERS_FIRMWARE_EFI_EFISTUB_H | 3 | #ifndef _DRIVERS_FIRMWARE_EFI_EFISTUB_H |
| 3 | #define _DRIVERS_FIRMWARE_EFI_EFISTUB_H | 4 | #define _DRIVERS_FIRMWARE_EFI_EFISTUB_H |
diff --git a/drivers/firmware/efi/libstub/string.c b/drivers/firmware/efi/libstub/string.c index 09d5a0894343..ed10e3f602c5 100644 --- a/drivers/firmware/efi/libstub/string.c +++ b/drivers/firmware/efi/libstub/string.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Taken from: | 3 | * Taken from: |
| 3 | * linux/lib/string.c | 4 | * linux/lib/string.c |
diff --git a/drivers/firmware/efi/memmap.c b/drivers/firmware/efi/memmap.c index 78686443cb37..5fc70520e04c 100644 --- a/drivers/firmware/efi/memmap.c +++ b/drivers/firmware/efi/memmap.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Common EFI memory map functions. | 3 | * Common EFI memory map functions. |
| 3 | */ | 4 | */ |
diff --git a/drivers/firmware/efi/reboot.c b/drivers/firmware/efi/reboot.c index 22874544d301..7effff969eb9 100644 --- a/drivers/firmware/efi/reboot.c +++ b/drivers/firmware/efi/reboot.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 2014 Intel Corporation; author Matt Fleming | 3 | * Copyright (C) 2014 Intel Corporation; author Matt Fleming |
| 3 | * Copyright (c) 2014 Red Hat, Inc., Mark Salter <msalter@redhat.com> | 4 | * Copyright (c) 2014 Red Hat, Inc., Mark Salter <msalter@redhat.com> |
diff --git a/drivers/firmware/efi/test/efi_test.c b/drivers/firmware/efi/test/efi_test.c index 08129b7b80ab..41c48a1e8baa 100644 --- a/drivers/firmware/efi/test/efi_test.c +++ b/drivers/firmware/efi/test/efi_test.c | |||
| @@ -593,6 +593,9 @@ static long efi_runtime_query_capsulecaps(unsigned long arg) | |||
| 593 | if (copy_from_user(&qcaps, qcaps_user, sizeof(qcaps))) | 593 | if (copy_from_user(&qcaps, qcaps_user, sizeof(qcaps))) |
| 594 | return -EFAULT; | 594 | return -EFAULT; |
| 595 | 595 | ||
| 596 | if (qcaps.capsule_count == ULONG_MAX) | ||
| 597 | return -EINVAL; | ||
| 598 | |||
| 596 | capsules = kcalloc(qcaps.capsule_count + 1, | 599 | capsules = kcalloc(qcaps.capsule_count + 1, |
| 597 | sizeof(efi_capsule_header_t), GFP_KERNEL); | 600 | sizeof(efi_capsule_header_t), GFP_KERNEL); |
| 598 | if (!capsules) | 601 | if (!capsules) |
diff --git a/drivers/firmware/efi/test/efi_test.h b/drivers/firmware/efi/test/efi_test.h index a33a6c633852..9812c6a02b40 100644 --- a/drivers/firmware/efi/test/efi_test.h +++ b/drivers/firmware/efi/test/efi_test.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * EFI Test driver Header | 3 | * EFI Test driver Header |
| 3 | * | 4 | * |
diff --git a/drivers/firmware/google/Makefile b/drivers/firmware/google/Makefile index bc4de02202ad..dcd3675efcfc 100644 --- a/drivers/firmware/google/Makefile +++ b/drivers/firmware/google/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | obj-$(CONFIG_GOOGLE_SMI) += gsmi.o | 3 | obj-$(CONFIG_GOOGLE_SMI) += gsmi.o |
| 3 | obj-$(CONFIG_GOOGLE_COREBOOT_TABLE) += coreboot_table.o | 4 | obj-$(CONFIG_GOOGLE_COREBOOT_TABLE) += coreboot_table.o |
diff --git a/drivers/fmc/Makefile b/drivers/fmc/Makefile index e809322e1bac..e3da6192cf39 100644 --- a/drivers/fmc/Makefile +++ b/drivers/fmc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | obj-$(CONFIG_FMC) += fmc.o | 3 | obj-$(CONFIG_FMC) += fmc.o |
| 3 | 4 | ||
diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile index e09895f0525b..f98dcf1d89e1 100644 --- a/drivers/fpga/Makefile +++ b/drivers/fpga/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the fpga framework and fpga manager drivers. | 3 | # Makefile for the fpga framework and fpga manager drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index aeb70e9de6f2..8a2dfba3b231 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # generic gpio support: platform drivers, dedicated expander chips, etc | 2 | # generic gpio support: platform drivers, dedicated expander chips, etc |
| 2 | 3 | ||
| 3 | ccflags-$(CONFIG_DEBUG_GPIO) += -DDEBUG | 4 | ccflags-$(CONFIG_DEBUG_GPIO) += -DDEBUG |
diff --git a/drivers/gpio/gpio-etraxfs.c b/drivers/gpio/gpio-etraxfs.c index 14c6aac26780..94db1bf4bfdb 100644 --- a/drivers/gpio/gpio-etraxfs.c +++ b/drivers/gpio/gpio-etraxfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/init.h> | 3 | #include <linux/init.h> |
| 3 | #include <linux/gpio/driver.h> | 4 | #include <linux/gpio/driver.h> |
diff --git a/drivers/gpio/gpio-ftgpio010.c b/drivers/gpio/gpio-ftgpio010.c index e9386f8b67f5..139f73d3f4ba 100644 --- a/drivers/gpio/gpio-ftgpio010.c +++ b/drivers/gpio/gpio-ftgpio010.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Faraday Technolog FTGPIO010 gpiochip and interrupt routines | 3 | * Faraday Technolog FTGPIO010 gpiochip and interrupt routines |
| 3 | * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org> | 4 | * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org> |
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index a8acc197dec3..8ce07039bb89 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | # Makefile for the drm device driver. This driver provides support for the | 3 | # Makefile for the drm device driver. This driver provides support for the |
| 3 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. | 4 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. |
diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile index 658bac0cdc5e..567b0377e1e2 100644 --- a/drivers/gpu/drm/amd/amdgpu/Makefile +++ b/drivers/gpu/drm/amd/amdgpu/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the drm device driver. This driver provides support for the | 3 | # Makefile for the drm device driver. This driver provides support for the |
| 3 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. | 4 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h index 1c88bd5e29ad..34c99a3c8d2d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #if !defined(_AMDGPU_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) | 2 | #if !defined(_AMDGPU_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) |
| 2 | #define _AMDGPU_TRACE_H_ | 3 | #define _AMDGPU_TRACE_H_ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c index 385b7e1d72f9..89680d554ed8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* Copyright Red Hat Inc 2010. | 2 | /* Copyright Red Hat Inc 2010. |
| 2 | * Author : Dave Airlie <airlied@redhat.com> | 3 | * Author : Dave Airlie <airlied@redhat.com> |
| 3 | */ | 4 | */ |
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c index 31db356476f8..62cd16a23921 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | |||
| @@ -93,6 +93,10 @@ static int uvd_v6_0_early_init(void *handle) | |||
| 93 | { | 93 | { |
| 94 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; | 94 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; |
| 95 | 95 | ||
| 96 | if (!(adev->flags & AMD_IS_APU) && | ||
| 97 | (RREG32_SMC(ixCC_HARVEST_FUSES) & CC_HARVEST_FUSES__UVD_DISABLE_MASK)) | ||
| 98 | return -ENOENT; | ||
| 99 | |||
| 96 | uvd_v6_0_set_ring_funcs(adev); | 100 | uvd_v6_0_set_ring_funcs(adev); |
| 97 | uvd_v6_0_set_irq_funcs(adev); | 101 | uvd_v6_0_set_irq_funcs(adev); |
| 98 | 102 | ||
| @@ -225,11 +229,7 @@ static int uvd_v6_0_suspend(void *handle) | |||
| 225 | if (r) | 229 | if (r) |
| 226 | return r; | 230 | return r; |
| 227 | 231 | ||
| 228 | /* Skip this for APU for now */ | 232 | return amdgpu_uvd_suspend(adev); |
| 229 | if (!(adev->flags & AMD_IS_APU)) | ||
| 230 | r = amdgpu_uvd_suspend(adev); | ||
| 231 | |||
| 232 | return r; | ||
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | static int uvd_v6_0_resume(void *handle) | 235 | static int uvd_v6_0_resume(void *handle) |
| @@ -237,12 +237,10 @@ static int uvd_v6_0_resume(void *handle) | |||
| 237 | int r; | 237 | int r; |
| 238 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; | 238 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; |
| 239 | 239 | ||
| 240 | /* Skip this for APU for now */ | 240 | r = amdgpu_uvd_resume(adev); |
| 241 | if (!(adev->flags & AMD_IS_APU)) { | 241 | if (r) |
| 242 | r = amdgpu_uvd_resume(adev); | 242 | return r; |
| 243 | if (r) | 243 | |
| 244 | return r; | ||
| 245 | } | ||
| 246 | return uvd_v6_0_hw_init(adev); | 244 | return uvd_v6_0_hw_init(adev); |
| 247 | } | 245 | } |
| 248 | 246 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c index 90332f55cfba..cf81065e3c5a 100644 --- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | |||
| @@ -365,15 +365,10 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev) | |||
| 365 | { | 365 | { |
| 366 | u32 tmp; | 366 | u32 tmp; |
| 367 | 367 | ||
| 368 | /* Fiji, Stoney, Polaris10, Polaris11, Polaris12 are single pipe */ | ||
| 369 | if ((adev->asic_type == CHIP_FIJI) || | 368 | if ((adev->asic_type == CHIP_FIJI) || |
| 370 | (adev->asic_type == CHIP_STONEY) || | 369 | (adev->asic_type == CHIP_STONEY)) |
| 371 | (adev->asic_type == CHIP_POLARIS10) || | ||
| 372 | (adev->asic_type == CHIP_POLARIS11) || | ||
| 373 | (adev->asic_type == CHIP_POLARIS12)) | ||
| 374 | return AMDGPU_VCE_HARVEST_VCE1; | 370 | return AMDGPU_VCE_HARVEST_VCE1; |
| 375 | 371 | ||
| 376 | /* Tonga and CZ are dual or single pipe */ | ||
| 377 | if (adev->flags & AMD_IS_APU) | 372 | if (adev->flags & AMD_IS_APU) |
| 378 | tmp = (RREG32_SMC(ixVCE_HARVEST_FUSE_MACRO__ADDRESS) & | 373 | tmp = (RREG32_SMC(ixVCE_HARVEST_FUSE_MACRO__ADDRESS) & |
| 379 | VCE_HARVEST_FUSE_MACRO__MASK) >> | 374 | VCE_HARVEST_FUSE_MACRO__MASK) >> |
| @@ -391,6 +386,11 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev) | |||
| 391 | case 3: | 386 | case 3: |
| 392 | return AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1; | 387 | return AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1; |
| 393 | default: | 388 | default: |
| 389 | if ((adev->asic_type == CHIP_POLARIS10) || | ||
| 390 | (adev->asic_type == CHIP_POLARIS11) || | ||
| 391 | (adev->asic_type == CHIP_POLARIS12)) | ||
| 392 | return AMDGPU_VCE_HARVEST_VCE1; | ||
| 393 | |||
| 394 | return 0; | 394 | return 0; |
| 395 | } | 395 | } |
| 396 | } | 396 | } |
diff --git a/drivers/gpu/drm/amd/amdkfd/Makefile b/drivers/gpu/drm/amd/amdkfd/Makefile index b400d5664252..7bb0bc0ca3d6 100644 --- a/drivers/gpu/drm/amd/amdkfd/Makefile +++ b/drivers/gpu/drm/amd/amdkfd/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for Heterogenous System Architecture support for AMD GPU devices | 3 | # Makefile for Heterogenous System Architecture support for AMD GPU devices |
| 3 | # | 4 | # |
diff --git a/drivers/gpu/drm/amd/powerplay/Makefile b/drivers/gpu/drm/amd/powerplay/Makefile index 4e132b936e3d..72d5f50508b6 100644 --- a/drivers/gpu/drm/amd/powerplay/Makefile +++ b/drivers/gpu/drm/amd/powerplay/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | subdir-ccflags-y += \ | 3 | subdir-ccflags-y += \ |
| 3 | -I$(FULL_AMD_PATH)/powerplay/inc/ \ | 4 | -I$(FULL_AMD_PATH)/powerplay/inc/ \ |
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile b/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile index f0277c16c2bf..d13fdadbbf9e 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the 'hw manager' sub-component of powerplay. | 3 | # Makefile for the 'hw manager' sub-component of powerplay. |
| 3 | # It provides the hardware management services for the driver. | 4 | # It provides the hardware management services for the driver. |
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c index d09f25485844..e0766c5e3d74 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "pp_overdriver.h" | 2 | #include "pp_overdriver.h" |
| 2 | #include <linux/errno.h> | 3 | #include <linux/errno.h> |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c index c2743233ba10..b526f49be65d 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | |||
| @@ -830,7 +830,7 @@ uint32_t smu7_get_xclk(struct pp_hwmgr *hwmgr) | |||
| 830 | { | 830 | { |
| 831 | uint32_t reference_clock, tmp; | 831 | uint32_t reference_clock, tmp; |
| 832 | struct cgs_display_info info = {0}; | 832 | struct cgs_display_info info = {0}; |
| 833 | struct cgs_mode_info mode_info; | 833 | struct cgs_mode_info mode_info = {0}; |
| 834 | 834 | ||
| 835 | info.mode_info = &mode_info; | 835 | info.mode_info = &mode_info; |
| 836 | 836 | ||
| @@ -3948,10 +3948,9 @@ static int smu7_program_display_gap(struct pp_hwmgr *hwmgr) | |||
| 3948 | uint32_t ref_clock; | 3948 | uint32_t ref_clock; |
| 3949 | uint32_t refresh_rate = 0; | 3949 | uint32_t refresh_rate = 0; |
| 3950 | struct cgs_display_info info = {0}; | 3950 | struct cgs_display_info info = {0}; |
| 3951 | struct cgs_mode_info mode_info; | 3951 | struct cgs_mode_info mode_info = {0}; |
| 3952 | 3952 | ||
| 3953 | info.mode_info = &mode_info; | 3953 | info.mode_info = &mode_info; |
| 3954 | |||
| 3955 | cgs_get_active_displays_info(hwmgr->device, &info); | 3954 | cgs_get_active_displays_info(hwmgr->device, &info); |
| 3956 | num_active_displays = info.display_count; | 3955 | num_active_displays = info.display_count; |
| 3957 | 3956 | ||
| @@ -3967,6 +3966,7 @@ static int smu7_program_display_gap(struct pp_hwmgr *hwmgr) | |||
| 3967 | frame_time_in_us = 1000000 / refresh_rate; | 3966 | frame_time_in_us = 1000000 / refresh_rate; |
| 3968 | 3967 | ||
| 3969 | pre_vbi_time_in_us = frame_time_in_us - 200 - mode_info.vblank_time_us; | 3968 | pre_vbi_time_in_us = frame_time_in_us - 200 - mode_info.vblank_time_us; |
| 3969 | |||
| 3970 | data->frame_time_x2 = frame_time_in_us * 2 / 100; | 3970 | data->frame_time_x2 = frame_time_in_us * 2 / 100; |
| 3971 | 3971 | ||
| 3972 | display_gap2 = pre_vbi_time_in_us * (ref_clock / 100); | 3972 | display_gap2 = pre_vbi_time_in_us * (ref_clock / 100); |
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu72.h b/drivers/gpu/drm/amd/powerplay/inc/smu72.h index b73d6b59ac32..08cd70c75d8b 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/smu72.h +++ b/drivers/gpu/drm/amd/powerplay/inc/smu72.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef SMU72_H | 2 | #ifndef SMU72_H |
| 2 | #define SMU72_H | 3 | #define SMU72_H |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu72_discrete.h b/drivers/gpu/drm/amd/powerplay/inc/smu72_discrete.h index 98f76e925e65..b2edbc0c3c4d 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/smu72_discrete.h +++ b/drivers/gpu/drm/amd/powerplay/inc/smu72_discrete.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef SMU72_DISCRETE_H | 2 | #ifndef SMU72_DISCRETE_H |
| 2 | #define SMU72_DISCRETE_H | 3 | #define SMU72_DISCRETE_H |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/Makefile b/drivers/gpu/drm/amd/powerplay/smumgr/Makefile index 1703bbefbfd5..e7ad45297b1d 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/Makefile +++ b/drivers/gpu/drm/amd/powerplay/smumgr/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the 'smu manager' sub-component of powerplay. | 3 | # Makefile for the 'smu manager' sub-component of powerplay. |
| 3 | # It provides the smu management services for the driver. | 4 | # It provides the smu management services for the driver. |
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h b/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h index 8bd38102b58e..283a0dc25e84 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h +++ b/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #if !defined(_GPU_SCHED_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) | 2 | #if !defined(_GPU_SCHED_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) |
| 2 | #define _GPU_SCHED_TRACE_H_ | 3 | #define _GPU_SCHED_TRACE_H_ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/arm/hdlcd_drv.h b/drivers/gpu/drm/arm/hdlcd_drv.h index e3950a071152..56f34dfff640 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.h +++ b/drivers/gpu/drm/arm/hdlcd_drv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * ARM HDLCD Controller register definition | 3 | * ARM HDLCD Controller register definition |
| 3 | */ | 4 | */ |
diff --git a/drivers/gpu/drm/armada/Makefile b/drivers/gpu/drm/armada/Makefile index 64c0b4546fb2..1ab4cf863bf7 100644 --- a/drivers/gpu/drm/armada/Makefile +++ b/drivers/gpu/drm/armada/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | armada-y := armada_crtc.o armada_drv.o armada_fb.o armada_fbdev.o \ | 2 | armada-y := armada_crtc.o armada_drv.o armada_fb.o armada_fbdev.o \ |
| 2 | armada_gem.o armada_overlay.o armada_trace.o | 3 | armada_gem.o armada_overlay.o armada_trace.o |
| 3 | armada-y += armada_510.o | 4 | armada-y += armada_510.o |
diff --git a/drivers/gpu/drm/armada/armada_trace.c b/drivers/gpu/drm/armada/armada_trace.c index 068b336ba75f..c64cce325cdf 100644 --- a/drivers/gpu/drm/armada/armada_trace.c +++ b/drivers/gpu/drm/armada/armada_trace.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #ifndef __CHECKER__ | 2 | #ifndef __CHECKER__ |
| 2 | #define CREATE_TRACE_POINTS | 3 | #define CREATE_TRACE_POINTS |
| 3 | #include "armada_trace.h" | 4 | #include "armada_trace.h" |
diff --git a/drivers/gpu/drm/armada/armada_trace.h b/drivers/gpu/drm/armada/armada_trace.h index dc0cba70fd1a..1e9f55fc8735 100644 --- a/drivers/gpu/drm/armada/armada_trace.h +++ b/drivers/gpu/drm/armada/armada_trace.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #if !defined(ARMADA_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) | 2 | #if !defined(ARMADA_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) |
| 2 | #define ARMADA_TRACE_H | 3 | #define ARMADA_TRACE_H |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/ast/ast_dp501.c b/drivers/gpu/drm/ast/ast_dp501.c index 749646ae365f..4c7375b45281 100644 --- a/drivers/gpu/drm/ast/ast_dp501.c +++ b/drivers/gpu/drm/ast/ast_dp501.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | #include <linux/firmware.h> | 3 | #include <linux/firmware.h> |
| 3 | #include <drm/drmP.h> | 4 | #include <drm/drmP.h> |
diff --git a/drivers/gpu/drm/ast/ast_dram_tables.h b/drivers/gpu/drm/ast/ast_dram_tables.h index 1d9c4e75d303..1e9ac9d6d26c 100644 --- a/drivers/gpu/drm/ast/ast_dram_tables.h +++ b/drivers/gpu/drm/ast/ast_dram_tables.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef AST_DRAM_TABLES_H | 2 | #ifndef AST_DRAM_TABLES_H |
| 2 | #define AST_DRAM_TABLES_H | 3 | #define AST_DRAM_TABLES_H |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/atmel-hlcdc/Makefile b/drivers/gpu/drm/atmel-hlcdc/Makefile index bb5f8507a8ce..49dc89f36b73 100644 --- a/drivers/gpu/drm/atmel-hlcdc/Makefile +++ b/drivers/gpu/drm/atmel-hlcdc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | atmel-hlcdc-dc-y := atmel_hlcdc_crtc.o \ | 2 | atmel-hlcdc-dc-y := atmel_hlcdc_crtc.o \ |
| 2 | atmel_hlcdc_dc.o \ | 3 | atmel_hlcdc_dc.o \ |
| 3 | atmel_hlcdc_output.o \ | 4 | atmel_hlcdc_output.o \ |
diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h index 76c490c3cdbc..375bf92cd04f 100644 --- a/drivers/gpu/drm/bochs/bochs.h +++ b/drivers/gpu/drm/bochs/bochs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/io.h> | 2 | #include <linux/io.h> |
| 2 | #include <linux/console.h> | 3 | #include <linux/console.h> |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile index defcf1e7ca1c..60dab87e4783 100644 --- a/drivers/gpu/drm/bridge/Makefile +++ b/drivers/gpu/drm/bridge/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o | 2 | obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o |
| 2 | obj-$(CONFIG_DRM_DUMB_VGA_DAC) += dumb-vga-dac.o | 3 | obj-$(CONFIG_DRM_DUMB_VGA_DAC) += dumb-vga-dac.o |
| 3 | obj-$(CONFIG_DRM_LVDS_ENCODER) += lvds-encoder.o | 4 | obj-$(CONFIG_DRM_LVDS_ENCODER) += lvds-encoder.o |
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h index fd1f745c6073..63b5756f463b 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DW_HDMI_AUDIO_H | 2 | #ifndef DW_HDMI_AUDIO_H |
| 2 | #define DW_HDMI_AUDIO_H | 3 | #define DW_HDMI_AUDIO_H |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/drm_trace.h b/drivers/gpu/drm/drm_trace.h index 14c5a777682e..a8370775ed50 100644 --- a/drivers/gpu/drm/drm_trace.h +++ b/drivers/gpu/drm/drm_trace.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #if !defined(_DRM_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ) | 2 | #if !defined(_DRM_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ) |
| 2 | #define _DRM_TRACE_H_ | 3 | #define _DRM_TRACE_H_ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/etnaviv/Makefile b/drivers/gpu/drm/etnaviv/Makefile index 4f76c992043f..ab3f551831d7 100644 --- a/drivers/gpu/drm/etnaviv/Makefile +++ b/drivers/gpu/drm/etnaviv/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | etnaviv-y := \ | 2 | etnaviv-y := \ |
| 2 | etnaviv_buffer.o \ | 3 | etnaviv_buffer.o \ |
| 3 | etnaviv_cmd_parser.o \ | 4 | etnaviv_cmd_parser.o \ |
diff --git a/drivers/gpu/drm/etnaviv/state.xml.h b/drivers/gpu/drm/etnaviv/state.xml.h index 368218304566..c27c1484cfa9 100644 --- a/drivers/gpu/drm/etnaviv/state.xml.h +++ b/drivers/gpu/drm/etnaviv/state.xml.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef STATE_XML | 2 | #ifndef STATE_XML |
| 2 | #define STATE_XML | 3 | #define STATE_XML |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/etnaviv/state_3d.xml.h b/drivers/gpu/drm/etnaviv/state_3d.xml.h index d7146fd13943..73a97d35c51b 100644 --- a/drivers/gpu/drm/etnaviv/state_3d.xml.h +++ b/drivers/gpu/drm/etnaviv/state_3d.xml.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef STATE_3D_XML | 2 | #ifndef STATE_3D_XML |
| 2 | #define STATE_3D_XML | 3 | #define STATE_3D_XML |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/etnaviv/state_hi.xml.h b/drivers/gpu/drm/etnaviv/state_hi.xml.h index 43c73e2ed34f..60808daf7e8d 100644 --- a/drivers/gpu/drm/etnaviv/state_hi.xml.h +++ b/drivers/gpu/drm/etnaviv/state_hi.xml.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef STATE_HI_XML | 2 | #ifndef STATE_HI_XML |
| 2 | #define STATE_HI_XML | 3 | #define STATE_HI_XML |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/exynos/Makefile b/drivers/gpu/drm/exynos/Makefile index f663490e949d..bdf4212dde7b 100644 --- a/drivers/gpu/drm/exynos/Makefile +++ b/drivers/gpu/drm/exynos/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the drm device driver. This driver provides support for the | 3 | # Makefile for the drm device driver. This driver provides support for the |
| 3 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. | 4 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. |
diff --git a/drivers/gpu/drm/fsl-dcu/Makefile b/drivers/gpu/drm/fsl-dcu/Makefile index aca34f656bea..b55c4482d0f9 100644 --- a/drivers/gpu/drm/fsl-dcu/Makefile +++ b/drivers/gpu/drm/fsl-dcu/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | fsl-dcu-drm-y := fsl_dcu_drm_drv.o \ | 2 | fsl-dcu-drm-y := fsl_dcu_drm_drv.o \ |
| 2 | fsl_dcu_drm_kms.o \ | 3 | fsl_dcu_drm_kms.o \ |
| 3 | fsl_dcu_drm_rgb.o \ | 4 | fsl_dcu_drm_rgb.o \ |
diff --git a/drivers/gpu/drm/gma500/Makefile b/drivers/gpu/drm/gma500/Makefile index c1c8dc18aa53..c8f2c89be99d 100644 --- a/drivers/gpu/drm/gma500/Makefile +++ b/drivers/gpu/drm/gma500/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # KMS driver for the GMA500 | 3 | # KMS driver for the GMA500 |
| 3 | # | 4 | # |
diff --git a/drivers/gpu/drm/i2c/Makefile b/drivers/gpu/drm/i2c/Makefile index a77acfc1852e..b20100c18ffb 100644 --- a/drivers/gpu/drm/i2c/Makefile +++ b/drivers/gpu/drm/i2c/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ch7006-y := ch7006_drv.o ch7006_mode.o | 2 | ch7006-y := ch7006_drv.o ch7006_mode.o |
| 2 | obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o | 3 | obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 892f52b53060..2e034efc4d6d 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the drm device driver. This driver provides support for the | 3 | # Makefile for the drm device driver. This driver provides support for the |
| 3 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. | 4 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. |
diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile index f5486cb94818..2641ba510a61 100644 --- a/drivers/gpu/drm/i915/gvt/Makefile +++ b/drivers/gpu/drm/i915/gvt/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | GVT_DIR := gvt | 2 | GVT_DIR := gvt |
| 2 | GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ | 3 | GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ |
| 3 | interrupt.o gtt.o cfg_space.o opregion.o mmio.o display.o edid.o \ | 4 | interrupt.o gtt.o cfg_space.o opregion.o mmio.o display.o edid.o \ |
diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index 21c36e256884..d4726a3358a4 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c | |||
| @@ -2723,6 +2723,9 @@ static int combine_wa_ctx(struct intel_shadow_wa_ctx *wa_ctx) | |||
| 2723 | uint32_t per_ctx_start[CACHELINE_DWORDS] = {0}; | 2723 | uint32_t per_ctx_start[CACHELINE_DWORDS] = {0}; |
| 2724 | unsigned char *bb_start_sva; | 2724 | unsigned char *bb_start_sva; |
| 2725 | 2725 | ||
| 2726 | if (!wa_ctx->per_ctx.valid) | ||
| 2727 | return 0; | ||
| 2728 | |||
| 2726 | per_ctx_start[0] = 0x18800001; | 2729 | per_ctx_start[0] = 0x18800001; |
| 2727 | per_ctx_start[1] = wa_ctx->per_ctx.guest_gma; | 2730 | per_ctx_start[1] = wa_ctx->per_ctx.guest_gma; |
| 2728 | 2731 | ||
diff --git a/drivers/gpu/drm/i915/gvt/execlist.c b/drivers/gpu/drm/i915/gvt/execlist.c index 91b4300f3b39..e5320b4eb698 100644 --- a/drivers/gpu/drm/i915/gvt/execlist.c +++ b/drivers/gpu/drm/i915/gvt/execlist.c | |||
| @@ -701,8 +701,7 @@ static int submit_context(struct intel_vgpu *vgpu, int ring_id, | |||
| 701 | CACHELINE_BYTES; | 701 | CACHELINE_BYTES; |
| 702 | workload->wa_ctx.per_ctx.guest_gma = | 702 | workload->wa_ctx.per_ctx.guest_gma = |
| 703 | per_ctx & PER_CTX_ADDR_MASK; | 703 | per_ctx & PER_CTX_ADDR_MASK; |
| 704 | 704 | workload->wa_ctx.per_ctx.valid = per_ctx & 1; | |
| 705 | WARN_ON(workload->wa_ctx.indirect_ctx.size && !(per_ctx & 0x1)); | ||
| 706 | } | 705 | } |
| 707 | 706 | ||
| 708 | if (emulate_schedule_in) | 707 | if (emulate_schedule_in) |
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c index 2294466dd415..a5bed2e71b92 100644 --- a/drivers/gpu/drm/i915/gvt/handlers.c +++ b/drivers/gpu/drm/i915/gvt/handlers.c | |||
| @@ -1429,18 +1429,7 @@ static int skl_lcpll_write(struct intel_vgpu *vgpu, unsigned int offset, | |||
| 1429 | return 0; | 1429 | return 0; |
| 1430 | } | 1430 | } |
| 1431 | 1431 | ||
| 1432 | static int ring_timestamp_mmio_read(struct intel_vgpu *vgpu, | 1432 | static int mmio_read_from_hw(struct intel_vgpu *vgpu, |
| 1433 | unsigned int offset, void *p_data, unsigned int bytes) | ||
| 1434 | { | ||
| 1435 | struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv; | ||
| 1436 | |||
| 1437 | mmio_hw_access_pre(dev_priv); | ||
| 1438 | vgpu_vreg(vgpu, offset) = I915_READ(_MMIO(offset)); | ||
| 1439 | mmio_hw_access_post(dev_priv); | ||
| 1440 | return intel_vgpu_default_mmio_read(vgpu, offset, p_data, bytes); | ||
| 1441 | } | ||
| 1442 | |||
| 1443 | static int instdone_mmio_read(struct intel_vgpu *vgpu, | ||
| 1444 | unsigned int offset, void *p_data, unsigned int bytes) | 1433 | unsigned int offset, void *p_data, unsigned int bytes) |
| 1445 | { | 1434 | { |
| 1446 | struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv; | 1435 | struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv; |
| @@ -1589,6 +1578,8 @@ static int ring_reset_ctl_write(struct intel_vgpu *vgpu, | |||
| 1589 | MMIO_F(prefix(BLT_RING_BASE), s, f, am, rm, d, r, w); \ | 1578 | MMIO_F(prefix(BLT_RING_BASE), s, f, am, rm, d, r, w); \ |
| 1590 | MMIO_F(prefix(GEN6_BSD_RING_BASE), s, f, am, rm, d, r, w); \ | 1579 | MMIO_F(prefix(GEN6_BSD_RING_BASE), s, f, am, rm, d, r, w); \ |
| 1591 | MMIO_F(prefix(VEBOX_RING_BASE), s, f, am, rm, d, r, w); \ | 1580 | MMIO_F(prefix(VEBOX_RING_BASE), s, f, am, rm, d, r, w); \ |
| 1581 | if (HAS_BSD2(dev_priv)) \ | ||
| 1582 | MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, f, am, rm, d, r, w); \ | ||
| 1592 | } while (0) | 1583 | } while (0) |
| 1593 | 1584 | ||
| 1594 | #define MMIO_RING_D(prefix, d) \ | 1585 | #define MMIO_RING_D(prefix, d) \ |
| @@ -1635,10 +1626,9 @@ static int init_generic_mmio_info(struct intel_gvt *gvt) | |||
| 1635 | #undef RING_REG | 1626 | #undef RING_REG |
| 1636 | 1627 | ||
| 1637 | #define RING_REG(base) (base + 0x6c) | 1628 | #define RING_REG(base) (base + 0x6c) |
| 1638 | MMIO_RING_DFH(RING_REG, D_ALL, 0, instdone_mmio_read, NULL); | 1629 | MMIO_RING_DFH(RING_REG, D_ALL, 0, mmio_read_from_hw, NULL); |
| 1639 | MMIO_DH(RING_REG(GEN8_BSD2_RING_BASE), D_ALL, instdone_mmio_read, NULL); | ||
| 1640 | #undef RING_REG | 1630 | #undef RING_REG |
| 1641 | MMIO_DH(GEN7_SC_INSTDONE, D_BDW_PLUS, instdone_mmio_read, NULL); | 1631 | MMIO_DH(GEN7_SC_INSTDONE, D_BDW_PLUS, mmio_read_from_hw, NULL); |
| 1642 | 1632 | ||
| 1643 | MMIO_GM_RDR(0x2148, D_ALL, NULL, NULL); | 1633 | MMIO_GM_RDR(0x2148, D_ALL, NULL, NULL); |
| 1644 | MMIO_GM_RDR(CCID, D_ALL, NULL, NULL); | 1634 | MMIO_GM_RDR(CCID, D_ALL, NULL, NULL); |
| @@ -1648,7 +1638,7 @@ static int init_generic_mmio_info(struct intel_gvt *gvt) | |||
| 1648 | MMIO_RING_DFH(RING_TAIL, D_ALL, F_CMD_ACCESS, NULL, NULL); | 1638 | MMIO_RING_DFH(RING_TAIL, D_ALL, F_CMD_ACCESS, NULL, NULL); |
| 1649 | MMIO_RING_DFH(RING_HEAD, D_ALL, F_CMD_ACCESS, NULL, NULL); | 1639 | MMIO_RING_DFH(RING_HEAD, D_ALL, F_CMD_ACCESS, NULL, NULL); |
| 1650 | MMIO_RING_DFH(RING_CTL, D_ALL, F_CMD_ACCESS, NULL, NULL); | 1640 | MMIO_RING_DFH(RING_CTL, D_ALL, F_CMD_ACCESS, NULL, NULL); |
| 1651 | MMIO_RING_DFH(RING_ACTHD, D_ALL, F_CMD_ACCESS, NULL, NULL); | 1641 | MMIO_RING_DFH(RING_ACTHD, D_ALL, F_CMD_ACCESS, mmio_read_from_hw, NULL); |
| 1652 | MMIO_RING_GM_RDR(RING_START, D_ALL, NULL, NULL); | 1642 | MMIO_RING_GM_RDR(RING_START, D_ALL, NULL, NULL); |
| 1653 | 1643 | ||
| 1654 | /* RING MODE */ | 1644 | /* RING MODE */ |
| @@ -1662,9 +1652,9 @@ static int init_generic_mmio_info(struct intel_gvt *gvt) | |||
| 1662 | MMIO_RING_DFH(RING_INSTPM, D_ALL, F_MODE_MASK | F_CMD_ACCESS, | 1652 | MMIO_RING_DFH(RING_INSTPM, D_ALL, F_MODE_MASK | F_CMD_ACCESS, |
| 1663 | NULL, NULL); | 1653 | NULL, NULL); |
| 1664 | MMIO_RING_DFH(RING_TIMESTAMP, D_ALL, F_CMD_ACCESS, | 1654 | MMIO_RING_DFH(RING_TIMESTAMP, D_ALL, F_CMD_ACCESS, |
| 1665 | ring_timestamp_mmio_read, NULL); | 1655 | mmio_read_from_hw, NULL); |
| 1666 | MMIO_RING_DFH(RING_TIMESTAMP_UDW, D_ALL, F_CMD_ACCESS, | 1656 | MMIO_RING_DFH(RING_TIMESTAMP_UDW, D_ALL, F_CMD_ACCESS, |
| 1667 | ring_timestamp_mmio_read, NULL); | 1657 | mmio_read_from_hw, NULL); |
| 1668 | 1658 | ||
| 1669 | MMIO_DFH(GEN7_GT_MODE, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL); | 1659 | MMIO_DFH(GEN7_GT_MODE, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL); |
| 1670 | MMIO_DFH(CACHE_MODE_0_GEN7, D_ALL, F_MODE_MASK | F_CMD_ACCESS, | 1660 | MMIO_DFH(CACHE_MODE_0_GEN7, D_ALL, F_MODE_MASK | F_CMD_ACCESS, |
| @@ -2411,9 +2401,6 @@ static int init_broadwell_mmio_info(struct intel_gvt *gvt) | |||
| 2411 | struct drm_i915_private *dev_priv = gvt->dev_priv; | 2401 | struct drm_i915_private *dev_priv = gvt->dev_priv; |
| 2412 | int ret; | 2402 | int ret; |
| 2413 | 2403 | ||
| 2414 | MMIO_DFH(RING_IMR(GEN8_BSD2_RING_BASE), D_BDW_PLUS, F_CMD_ACCESS, NULL, | ||
| 2415 | intel_vgpu_reg_imr_handler); | ||
| 2416 | |||
| 2417 | MMIO_DH(GEN8_GT_IMR(0), D_BDW_PLUS, NULL, intel_vgpu_reg_imr_handler); | 2404 | MMIO_DH(GEN8_GT_IMR(0), D_BDW_PLUS, NULL, intel_vgpu_reg_imr_handler); |
| 2418 | MMIO_DH(GEN8_GT_IER(0), D_BDW_PLUS, NULL, intel_vgpu_reg_ier_handler); | 2405 | MMIO_DH(GEN8_GT_IER(0), D_BDW_PLUS, NULL, intel_vgpu_reg_ier_handler); |
| 2419 | MMIO_DH(GEN8_GT_IIR(0), D_BDW_PLUS, NULL, intel_vgpu_reg_iir_handler); | 2406 | MMIO_DH(GEN8_GT_IIR(0), D_BDW_PLUS, NULL, intel_vgpu_reg_iir_handler); |
| @@ -2476,68 +2463,34 @@ static int init_broadwell_mmio_info(struct intel_gvt *gvt) | |||
| 2476 | MMIO_DH(GEN8_MASTER_IRQ, D_BDW_PLUS, NULL, | 2463 | MMIO_DH(GEN8_MASTER_IRQ, D_BDW_PLUS, NULL, |
| 2477 | intel_vgpu_reg_master_irq_handler); | 2464 | intel_vgpu_reg_master_irq_handler); |
| 2478 | 2465 | ||
| 2479 | MMIO_DFH(RING_HWSTAM(GEN8_BSD2_RING_BASE), D_BDW_PLUS, | 2466 | MMIO_RING_DFH(RING_ACTHD_UDW, D_BDW_PLUS, F_CMD_ACCESS, |
| 2480 | F_CMD_ACCESS, NULL, NULL); | 2467 | mmio_read_from_hw, NULL); |
| 2481 | MMIO_DFH(0x1c134, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL); | ||
| 2482 | |||
| 2483 | MMIO_DFH(RING_TAIL(GEN8_BSD2_RING_BASE), D_BDW_PLUS, F_CMD_ACCESS, | ||
| 2484 | NULL, NULL); | ||
| 2485 | MMIO_DFH(RING_HEAD(GEN8_BSD2_RING_BASE), D_BDW_PLUS, | ||
| 2486 | F_CMD_ACCESS, NULL, NULL); | ||
| 2487 | MMIO_GM_RDR(RING_START(GEN8_BSD2_RING_BASE), D_BDW_PLUS, NULL, NULL); | ||
| 2488 | MMIO_DFH(RING_CTL(GEN8_BSD2_RING_BASE), D_BDW_PLUS, F_CMD_ACCESS, | ||
| 2489 | NULL, NULL); | ||
| 2490 | MMIO_DFH(RING_ACTHD(GEN8_BSD2_RING_BASE), D_BDW_PLUS, | ||
| 2491 | F_CMD_ACCESS, NULL, NULL); | ||
| 2492 | MMIO_DFH(RING_ACTHD_UDW(GEN8_BSD2_RING_BASE), D_BDW_PLUS, | ||
| 2493 | F_CMD_ACCESS, NULL, NULL); | ||
| 2494 | MMIO_DFH(0x1c29c, D_BDW_PLUS, F_MODE_MASK | F_CMD_ACCESS, NULL, | ||
| 2495 | ring_mode_mmio_write); | ||
| 2496 | MMIO_DFH(RING_MI_MODE(GEN8_BSD2_RING_BASE), D_BDW_PLUS, | ||
| 2497 | F_MODE_MASK | F_CMD_ACCESS, NULL, NULL); | ||
| 2498 | MMIO_DFH(RING_INSTPM(GEN8_BSD2_RING_BASE), D_BDW_PLUS, | ||
| 2499 | F_MODE_MASK | F_CMD_ACCESS, NULL, NULL); | ||
| 2500 | MMIO_DFH(RING_TIMESTAMP(GEN8_BSD2_RING_BASE), D_BDW_PLUS, F_CMD_ACCESS, | ||
| 2501 | ring_timestamp_mmio_read, NULL); | ||
| 2502 | |||
| 2503 | MMIO_RING_DFH(RING_ACTHD_UDW, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL); | ||
| 2504 | 2468 | ||
| 2505 | #define RING_REG(base) (base + 0xd0) | 2469 | #define RING_REG(base) (base + 0xd0) |
| 2506 | MMIO_RING_F(RING_REG, 4, F_RO, 0, | 2470 | MMIO_RING_F(RING_REG, 4, F_RO, 0, |
| 2507 | ~_MASKED_BIT_ENABLE(RESET_CTL_REQUEST_RESET), D_BDW_PLUS, NULL, | 2471 | ~_MASKED_BIT_ENABLE(RESET_CTL_REQUEST_RESET), D_BDW_PLUS, NULL, |
| 2508 | ring_reset_ctl_write); | 2472 | ring_reset_ctl_write); |
| 2509 | MMIO_F(RING_REG(GEN8_BSD2_RING_BASE), 4, F_RO, 0, | ||
| 2510 | ~_MASKED_BIT_ENABLE(RESET_CTL_REQUEST_RESET), D_BDW_PLUS, NULL, | ||
| 2511 | ring_reset_ctl_write); | ||
| 2512 | #undef RING_REG | 2473 | #undef RING_REG |
| 2513 | 2474 | ||
| 2514 | #define RING_REG(base) (base + 0x230) | 2475 | #define RING_REG(base) (base + 0x230) |
| 2515 | MMIO_RING_DFH(RING_REG, D_BDW_PLUS, 0, NULL, elsp_mmio_write); | 2476 | MMIO_RING_DFH(RING_REG, D_BDW_PLUS, 0, NULL, elsp_mmio_write); |
| 2516 | MMIO_DH(RING_REG(GEN8_BSD2_RING_BASE), D_BDW_PLUS, NULL, elsp_mmio_write); | ||
| 2517 | #undef RING_REG | 2477 | #undef RING_REG |
| 2518 | 2478 | ||
| 2519 | #define RING_REG(base) (base + 0x234) | 2479 | #define RING_REG(base) (base + 0x234) |
| 2520 | MMIO_RING_F(RING_REG, 8, F_RO | F_CMD_ACCESS, 0, ~0, D_BDW_PLUS, | 2480 | MMIO_RING_F(RING_REG, 8, F_RO | F_CMD_ACCESS, 0, ~0, D_BDW_PLUS, |
| 2521 | NULL, NULL); | 2481 | NULL, NULL); |
| 2522 | MMIO_F(RING_REG(GEN8_BSD2_RING_BASE), 4, F_RO | F_CMD_ACCESS, 0, | ||
| 2523 | ~0LL, D_BDW_PLUS, NULL, NULL); | ||
| 2524 | #undef RING_REG | 2482 | #undef RING_REG |
| 2525 | 2483 | ||
| 2526 | #define RING_REG(base) (base + 0x244) | 2484 | #define RING_REG(base) (base + 0x244) |
| 2527 | MMIO_RING_DFH(RING_REG, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL); | 2485 | MMIO_RING_DFH(RING_REG, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL); |
| 2528 | MMIO_DFH(RING_REG(GEN8_BSD2_RING_BASE), D_BDW_PLUS, F_CMD_ACCESS, | ||
| 2529 | NULL, NULL); | ||
| 2530 | #undef RING_REG | 2486 | #undef RING_REG |
| 2531 | 2487 | ||
| 2532 | #define RING_REG(base) (base + 0x370) | 2488 | #define RING_REG(base) (base + 0x370) |
| 2533 | MMIO_RING_F(RING_REG, 48, F_RO, 0, ~0, D_BDW_PLUS, NULL, NULL); | 2489 | MMIO_RING_F(RING_REG, 48, F_RO, 0, ~0, D_BDW_PLUS, NULL, NULL); |
| 2534 | MMIO_F(RING_REG(GEN8_BSD2_RING_BASE), 48, F_RO, 0, ~0, D_BDW_PLUS, | ||
| 2535 | NULL, NULL); | ||
| 2536 | #undef RING_REG | 2490 | #undef RING_REG |
| 2537 | 2491 | ||
| 2538 | #define RING_REG(base) (base + 0x3a0) | 2492 | #define RING_REG(base) (base + 0x3a0) |
| 2539 | MMIO_RING_DFH(RING_REG, D_BDW_PLUS, F_MODE_MASK, NULL, NULL); | 2493 | MMIO_RING_DFH(RING_REG, D_BDW_PLUS, F_MODE_MASK, NULL, NULL); |
| 2540 | MMIO_DFH(RING_REG(GEN8_BSD2_RING_BASE), D_BDW_PLUS, F_MODE_MASK, NULL, NULL); | ||
| 2541 | #undef RING_REG | 2494 | #undef RING_REG |
| 2542 | 2495 | ||
| 2543 | MMIO_D(PIPEMISC(PIPE_A), D_BDW_PLUS); | 2496 | MMIO_D(PIPEMISC(PIPE_A), D_BDW_PLUS); |
| @@ -2557,11 +2510,9 @@ static int init_broadwell_mmio_info(struct intel_gvt *gvt) | |||
| 2557 | 2510 | ||
| 2558 | #define RING_REG(base) (base + 0x270) | 2511 | #define RING_REG(base) (base + 0x270) |
| 2559 | MMIO_RING_F(RING_REG, 32, 0, 0, 0, D_BDW_PLUS, NULL, NULL); | 2512 | MMIO_RING_F(RING_REG, 32, 0, 0, 0, D_BDW_PLUS, NULL, NULL); |
| 2560 | MMIO_F(RING_REG(GEN8_BSD2_RING_BASE), 32, 0, 0, 0, D_BDW_PLUS, NULL, NULL); | ||
| 2561 | #undef RING_REG | 2513 | #undef RING_REG |
| 2562 | 2514 | ||
| 2563 | MMIO_RING_GM_RDR(RING_HWS_PGA, D_BDW_PLUS, NULL, NULL); | 2515 | MMIO_RING_GM_RDR(RING_HWS_PGA, D_BDW_PLUS, NULL, NULL); |
| 2564 | MMIO_GM_RDR(RING_HWS_PGA(GEN8_BSD2_RING_BASE), D_BDW_PLUS, NULL, NULL); | ||
| 2565 | 2516 | ||
| 2566 | MMIO_DFH(HDC_CHICKEN0, D_BDW_PLUS, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL); | 2517 | MMIO_DFH(HDC_CHICKEN0, D_BDW_PLUS, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL); |
| 2567 | 2518 | ||
| @@ -2849,7 +2800,6 @@ static int init_skl_mmio_info(struct intel_gvt *gvt) | |||
| 2849 | MMIO_D(0x65f08, D_SKL | D_KBL); | 2800 | MMIO_D(0x65f08, D_SKL | D_KBL); |
| 2850 | MMIO_D(0x320f0, D_SKL | D_KBL); | 2801 | MMIO_D(0x320f0, D_SKL | D_KBL); |
| 2851 | 2802 | ||
| 2852 | MMIO_DFH(_REG_VCS2_EXCC, D_SKL_PLUS, F_CMD_ACCESS, NULL, NULL); | ||
| 2853 | MMIO_D(0x70034, D_SKL_PLUS); | 2803 | MMIO_D(0x70034, D_SKL_PLUS); |
| 2854 | MMIO_D(0x71034, D_SKL_PLUS); | 2804 | MMIO_D(0x71034, D_SKL_PLUS); |
| 2855 | MMIO_D(0x72034, D_SKL_PLUS); | 2805 | MMIO_D(0x72034, D_SKL_PLUS); |
diff --git a/drivers/gpu/drm/i915/gvt/reg.h b/drivers/gpu/drm/i915/gvt/reg.h index fbd023a16f18..7d01c77a0f7a 100644 --- a/drivers/gpu/drm/i915/gvt/reg.h +++ b/drivers/gpu/drm/i915/gvt/reg.h | |||
| @@ -54,9 +54,6 @@ | |||
| 54 | 54 | ||
| 55 | #define VGT_SPRSTRIDE(pipe) _PIPE(pipe, _SPRA_STRIDE, _PLANE_STRIDE_2_B) | 55 | #define VGT_SPRSTRIDE(pipe) _PIPE(pipe, _SPRA_STRIDE, _PLANE_STRIDE_2_B) |
| 56 | 56 | ||
| 57 | #define _REG_VECS_EXCC 0x1A028 | ||
| 58 | #define _REG_VCS2_EXCC 0x1c028 | ||
| 59 | |||
| 60 | #define _REG_701C0(pipe, plane) (0x701c0 + pipe * 0x1000 + (plane - 1) * 0x100) | 57 | #define _REG_701C0(pipe, plane) (0x701c0 + pipe * 0x1000 + (plane - 1) * 0x100) |
| 61 | #define _REG_701C4(pipe, plane) (0x701c4 + pipe * 0x1000 + (plane - 1) * 0x100) | 58 | #define _REG_701C4(pipe, plane) (0x701c4 + pipe * 0x1000 + (plane - 1) * 0x100) |
| 62 | 59 | ||
diff --git a/drivers/gpu/drm/i915/gvt/scheduler.h b/drivers/gpu/drm/i915/gvt/scheduler.h index 0d431a968a32..93a49eb0209e 100644 --- a/drivers/gpu/drm/i915/gvt/scheduler.h +++ b/drivers/gpu/drm/i915/gvt/scheduler.h | |||
| @@ -68,6 +68,7 @@ struct shadow_indirect_ctx { | |||
| 68 | struct shadow_per_ctx { | 68 | struct shadow_per_ctx { |
| 69 | unsigned long guest_gma; | 69 | unsigned long guest_gma; |
| 70 | unsigned long shadow_gma; | 70 | unsigned long shadow_gma; |
| 71 | unsigned valid; | ||
| 71 | }; | 72 | }; |
| 72 | 73 | ||
| 73 | struct intel_shadow_wa_ctx { | 74 | struct intel_shadow_wa_ctx { |
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 32e857dc507c..dc1faa49687d 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -2214,8 +2214,10 @@ static void __i915_gem_object_reset_page_iter(struct drm_i915_gem_object *obj) | |||
| 2214 | struct radix_tree_iter iter; | 2214 | struct radix_tree_iter iter; |
| 2215 | void __rcu **slot; | 2215 | void __rcu **slot; |
| 2216 | 2216 | ||
| 2217 | rcu_read_lock(); | ||
| 2217 | radix_tree_for_each_slot(slot, &obj->mm.get_page.radix, &iter, 0) | 2218 | radix_tree_for_each_slot(slot, &obj->mm.get_page.radix, &iter, 0) |
| 2218 | radix_tree_delete(&obj->mm.get_page.radix, iter.index); | 2219 | radix_tree_delete(&obj->mm.get_page.radix, iter.index); |
| 2220 | rcu_read_unlock(); | ||
| 2219 | } | 2221 | } |
| 2220 | 2222 | ||
| 2221 | void __i915_gem_object_put_pages(struct drm_i915_gem_object *obj, | 2223 | void __i915_gem_object_put_pages(struct drm_i915_gem_object *obj, |
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 58a2a44f88bd..8afd2ce59b8d 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c | |||
| @@ -104,6 +104,7 @@ static void lut_close(struct i915_gem_context *ctx) | |||
| 104 | kmem_cache_free(ctx->i915->luts, lut); | 104 | kmem_cache_free(ctx->i915->luts, lut); |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | rcu_read_lock(); | ||
| 107 | radix_tree_for_each_slot(slot, &ctx->handles_vma, &iter, 0) { | 108 | radix_tree_for_each_slot(slot, &ctx->handles_vma, &iter, 0) { |
| 108 | struct i915_vma *vma = rcu_dereference_raw(*slot); | 109 | struct i915_vma *vma = rcu_dereference_raw(*slot); |
| 109 | struct drm_i915_gem_object *obj = vma->obj; | 110 | struct drm_i915_gem_object *obj = vma->obj; |
| @@ -115,6 +116,7 @@ static void lut_close(struct i915_gem_context *ctx) | |||
| 115 | 116 | ||
| 116 | __i915_gem_object_release_unless_active(obj); | 117 | __i915_gem_object_release_unless_active(obj); |
| 117 | } | 118 | } |
| 119 | rcu_read_unlock(); | ||
| 118 | } | 120 | } |
| 119 | 121 | ||
| 120 | static void i915_gem_context_free(struct i915_gem_context *ctx) | 122 | static void i915_gem_context_free(struct i915_gem_context *ctx) |
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 92437f455b43..4ac454ae54d7 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c | |||
| @@ -337,6 +337,10 @@ eb_vma_misplaced(const struct drm_i915_gem_exec_object2 *entry, | |||
| 337 | (vma->node.start + vma->node.size - 1) >> 32) | 337 | (vma->node.start + vma->node.size - 1) >> 32) |
| 338 | return true; | 338 | return true; |
| 339 | 339 | ||
| 340 | if (flags & __EXEC_OBJECT_NEEDS_MAP && | ||
| 341 | !i915_vma_is_map_and_fenceable(vma)) | ||
| 342 | return true; | ||
| 343 | |||
| 340 | return false; | 344 | return false; |
| 341 | } | 345 | } |
| 342 | 346 | ||
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index 94185d610673..370b9d248fed 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c | |||
| @@ -2537,6 +2537,10 @@ static const struct file_operations fops = { | |||
| 2537 | .poll = i915_perf_poll, | 2537 | .poll = i915_perf_poll, |
| 2538 | .read = i915_perf_read, | 2538 | .read = i915_perf_read, |
| 2539 | .unlocked_ioctl = i915_perf_ioctl, | 2539 | .unlocked_ioctl = i915_perf_ioctl, |
| 2540 | /* Our ioctl have no arguments, so it's safe to use the same function | ||
| 2541 | * to handle 32bits compatibility. | ||
| 2542 | */ | ||
| 2543 | .compat_ioctl = i915_perf_ioctl, | ||
| 2540 | }; | 2544 | }; |
| 2541 | 2545 | ||
| 2542 | 2546 | ||
diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h index 6fd5c57e21f6..ef72da74b87f 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #if !defined(_I915_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ) | 2 | #if !defined(_I915_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ) |
| 2 | #define _I915_TRACE_H_ | 3 | #define _I915_TRACE_H_ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/i915/i915_trace_points.c b/drivers/gpu/drm/i915/i915_trace_points.c index f1df2bd4ecf4..463a7177997c 100644 --- a/drivers/gpu/drm/i915/i915_trace_points.c +++ b/drivers/gpu/drm/i915/i915_trace_points.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright © 2009 Intel Corporation | 3 | * Copyright © 2009 Intel Corporation |
| 3 | * | 4 | * |
diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c index 42fb436f6cdc..d1abf4bb7c81 100644 --- a/drivers/gpu/drm/i915/intel_acpi.c +++ b/drivers/gpu/drm/i915/intel_acpi.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Intel ACPI functions | 3 | * Intel ACPI functions |
| 3 | * | 4 | * |
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5c7828c52d12..5ebdb63330dd 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
| @@ -15227,6 +15227,23 @@ void intel_connector_unregister(struct drm_connector *connector) | |||
| 15227 | intel_panel_destroy_backlight(connector); | 15227 | intel_panel_destroy_backlight(connector); |
| 15228 | } | 15228 | } |
| 15229 | 15229 | ||
| 15230 | static void intel_hpd_poll_fini(struct drm_device *dev) | ||
| 15231 | { | ||
| 15232 | struct intel_connector *connector; | ||
| 15233 | struct drm_connector_list_iter conn_iter; | ||
| 15234 | |||
| 15235 | /* First disable polling... */ | ||
| 15236 | drm_kms_helper_poll_fini(dev); | ||
| 15237 | |||
| 15238 | /* Then kill the work that may have been queued by hpd. */ | ||
| 15239 | drm_connector_list_iter_begin(dev, &conn_iter); | ||
| 15240 | for_each_intel_connector_iter(connector, &conn_iter) { | ||
| 15241 | if (connector->modeset_retry_work.func) | ||
| 15242 | cancel_work_sync(&connector->modeset_retry_work); | ||
| 15243 | } | ||
| 15244 | drm_connector_list_iter_end(&conn_iter); | ||
| 15245 | } | ||
| 15246 | |||
| 15230 | void intel_modeset_cleanup(struct drm_device *dev) | 15247 | void intel_modeset_cleanup(struct drm_device *dev) |
| 15231 | { | 15248 | { |
| 15232 | struct drm_i915_private *dev_priv = to_i915(dev); | 15249 | struct drm_i915_private *dev_priv = to_i915(dev); |
| @@ -15247,7 +15264,7 @@ void intel_modeset_cleanup(struct drm_device *dev) | |||
| 15247 | * Due to the hpd irq storm handling the hotplug work can re-arm the | 15264 | * Due to the hpd irq storm handling the hotplug work can re-arm the |
| 15248 | * poll handlers. Hence disable polling after hpd handling is shut down. | 15265 | * poll handlers. Hence disable polling after hpd handling is shut down. |
| 15249 | */ | 15266 | */ |
| 15250 | drm_kms_helper_poll_fini(dev); | 15267 | intel_hpd_poll_fini(dev); |
| 15251 | 15268 | ||
| 15252 | /* poll work can call into fbdev, hence clean that up afterwards */ | 15269 | /* poll work can call into fbdev, hence clean that up afterwards */ |
| 15253 | intel_fbdev_fini(dev_priv); | 15270 | intel_fbdev_fini(dev_priv); |
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 203198659ab2..09f274419eea 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
| @@ -3731,9 +3731,16 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp) | |||
| 3731 | 3731 | ||
| 3732 | } | 3732 | } |
| 3733 | 3733 | ||
| 3734 | /* Read the eDP Display control capabilities registers */ | 3734 | /* |
| 3735 | if ((intel_dp->dpcd[DP_EDP_CONFIGURATION_CAP] & DP_DPCD_DISPLAY_CONTROL_CAPABLE) && | 3735 | * Read the eDP display control registers. |
| 3736 | drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_DPCD_REV, | 3736 | * |
| 3737 | * Do this independent of DP_DPCD_DISPLAY_CONTROL_CAPABLE bit in | ||
| 3738 | * DP_EDP_CONFIGURATION_CAP, because some buggy displays do not have it | ||
| 3739 | * set, but require eDP 1.4+ detection (e.g. for supported link rates | ||
| 3740 | * method). The display control registers should read zero if they're | ||
| 3741 | * not supported anyway. | ||
| 3742 | */ | ||
| 3743 | if (drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_DPCD_REV, | ||
| 3737 | intel_dp->edp_dpcd, sizeof(intel_dp->edp_dpcd)) == | 3744 | intel_dp->edp_dpcd, sizeof(intel_dp->edp_dpcd)) == |
| 3738 | sizeof(intel_dp->edp_dpcd)) | 3745 | sizeof(intel_dp->edp_dpcd)) |
| 3739 | DRM_DEBUG_KMS("EDP DPCD : %*ph\n", (int) sizeof(intel_dp->edp_dpcd), | 3746 | DRM_DEBUG_KMS("EDP DPCD : %*ph\n", (int) sizeof(intel_dp->edp_dpcd), |
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index fa47285918f4..79fbaf78f604 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
| @@ -496,7 +496,6 @@ struct intel_crtc_scaler_state { | |||
| 496 | 496 | ||
| 497 | struct intel_pipe_wm { | 497 | struct intel_pipe_wm { |
| 498 | struct intel_wm_level wm[5]; | 498 | struct intel_wm_level wm[5]; |
| 499 | struct intel_wm_level raw_wm[5]; | ||
| 500 | uint32_t linetime; | 499 | uint32_t linetime; |
| 501 | bool fbc_wm_enabled; | 500 | bool fbc_wm_enabled; |
| 502 | bool pipe_enabled; | 501 | bool pipe_enabled; |
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 0a09f8ff6aff..cb950752c346 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
| @@ -2716,9 +2716,9 @@ static void ilk_compute_wm_level(const struct drm_i915_private *dev_priv, | |||
| 2716 | const struct intel_crtc *intel_crtc, | 2716 | const struct intel_crtc *intel_crtc, |
| 2717 | int level, | 2717 | int level, |
| 2718 | struct intel_crtc_state *cstate, | 2718 | struct intel_crtc_state *cstate, |
| 2719 | struct intel_plane_state *pristate, | 2719 | const struct intel_plane_state *pristate, |
| 2720 | struct intel_plane_state *sprstate, | 2720 | const struct intel_plane_state *sprstate, |
| 2721 | struct intel_plane_state *curstate, | 2721 | const struct intel_plane_state *curstate, |
| 2722 | struct intel_wm_level *result) | 2722 | struct intel_wm_level *result) |
| 2723 | { | 2723 | { |
| 2724 | uint16_t pri_latency = dev_priv->wm.pri_latency[level]; | 2724 | uint16_t pri_latency = dev_priv->wm.pri_latency[level]; |
| @@ -3038,28 +3038,24 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate) | |||
| 3038 | struct intel_pipe_wm *pipe_wm; | 3038 | struct intel_pipe_wm *pipe_wm; |
| 3039 | struct drm_device *dev = state->dev; | 3039 | struct drm_device *dev = state->dev; |
| 3040 | const struct drm_i915_private *dev_priv = to_i915(dev); | 3040 | const struct drm_i915_private *dev_priv = to_i915(dev); |
| 3041 | struct intel_plane *intel_plane; | 3041 | struct drm_plane *plane; |
| 3042 | struct intel_plane_state *pristate = NULL; | 3042 | const struct drm_plane_state *plane_state; |
| 3043 | struct intel_plane_state *sprstate = NULL; | 3043 | const struct intel_plane_state *pristate = NULL; |
| 3044 | struct intel_plane_state *curstate = NULL; | 3044 | const struct intel_plane_state *sprstate = NULL; |
| 3045 | const struct intel_plane_state *curstate = NULL; | ||
| 3045 | int level, max_level = ilk_wm_max_level(dev_priv), usable_level; | 3046 | int level, max_level = ilk_wm_max_level(dev_priv), usable_level; |
| 3046 | struct ilk_wm_maximums max; | 3047 | struct ilk_wm_maximums max; |
| 3047 | 3048 | ||
| 3048 | pipe_wm = &cstate->wm.ilk.optimal; | 3049 | pipe_wm = &cstate->wm.ilk.optimal; |
| 3049 | 3050 | ||
| 3050 | for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) { | 3051 | drm_atomic_crtc_state_for_each_plane_state(plane, plane_state, &cstate->base) { |
| 3051 | struct intel_plane_state *ps; | 3052 | const struct intel_plane_state *ps = to_intel_plane_state(plane_state); |
| 3052 | |||
| 3053 | ps = intel_atomic_get_existing_plane_state(state, | ||
| 3054 | intel_plane); | ||
| 3055 | if (!ps) | ||
| 3056 | continue; | ||
| 3057 | 3053 | ||
| 3058 | if (intel_plane->base.type == DRM_PLANE_TYPE_PRIMARY) | 3054 | if (plane->type == DRM_PLANE_TYPE_PRIMARY) |
| 3059 | pristate = ps; | 3055 | pristate = ps; |
| 3060 | else if (intel_plane->base.type == DRM_PLANE_TYPE_OVERLAY) | 3056 | else if (plane->type == DRM_PLANE_TYPE_OVERLAY) |
| 3061 | sprstate = ps; | 3057 | sprstate = ps; |
| 3062 | else if (intel_plane->base.type == DRM_PLANE_TYPE_CURSOR) | 3058 | else if (plane->type == DRM_PLANE_TYPE_CURSOR) |
| 3063 | curstate = ps; | 3059 | curstate = ps; |
| 3064 | } | 3060 | } |
| 3065 | 3061 | ||
| @@ -3081,11 +3077,9 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate) | |||
| 3081 | if (pipe_wm->sprites_scaled) | 3077 | if (pipe_wm->sprites_scaled) |
| 3082 | usable_level = 0; | 3078 | usable_level = 0; |
| 3083 | 3079 | ||
| 3084 | ilk_compute_wm_level(dev_priv, intel_crtc, 0, cstate, | ||
| 3085 | pristate, sprstate, curstate, &pipe_wm->raw_wm[0]); | ||
| 3086 | |||
| 3087 | memset(&pipe_wm->wm, 0, sizeof(pipe_wm->wm)); | 3080 | memset(&pipe_wm->wm, 0, sizeof(pipe_wm->wm)); |
| 3088 | pipe_wm->wm[0] = pipe_wm->raw_wm[0]; | 3081 | ilk_compute_wm_level(dev_priv, intel_crtc, 0, cstate, |
| 3082 | pristate, sprstate, curstate, &pipe_wm->wm[0]); | ||
| 3089 | 3083 | ||
| 3090 | if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) | 3084 | if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) |
| 3091 | pipe_wm->linetime = hsw_compute_linetime_wm(cstate); | 3085 | pipe_wm->linetime = hsw_compute_linetime_wm(cstate); |
| @@ -3095,8 +3089,8 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate) | |||
| 3095 | 3089 | ||
| 3096 | ilk_compute_wm_reg_maximums(dev_priv, 1, &max); | 3090 | ilk_compute_wm_reg_maximums(dev_priv, 1, &max); |
| 3097 | 3091 | ||
| 3098 | for (level = 1; level <= max_level; level++) { | 3092 | for (level = 1; level <= usable_level; level++) { |
| 3099 | struct intel_wm_level *wm = &pipe_wm->raw_wm[level]; | 3093 | struct intel_wm_level *wm = &pipe_wm->wm[level]; |
| 3100 | 3094 | ||
| 3101 | ilk_compute_wm_level(dev_priv, intel_crtc, level, cstate, | 3095 | ilk_compute_wm_level(dev_priv, intel_crtc, level, cstate, |
| 3102 | pristate, sprstate, curstate, wm); | 3096 | pristate, sprstate, curstate, wm); |
| @@ -3106,13 +3100,10 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate) | |||
| 3106 | * register maximums since such watermarks are | 3100 | * register maximums since such watermarks are |
| 3107 | * always invalid. | 3101 | * always invalid. |
| 3108 | */ | 3102 | */ |
| 3109 | if (level > usable_level) | 3103 | if (!ilk_validate_wm_level(level, &max, wm)) { |
| 3110 | continue; | 3104 | memset(wm, 0, sizeof(*wm)); |
| 3111 | 3105 | break; | |
| 3112 | if (ilk_validate_wm_level(level, &max, wm)) | 3106 | } |
| 3113 | pipe_wm->wm[level] = *wm; | ||
| 3114 | else | ||
| 3115 | usable_level = level; | ||
| 3116 | } | 3107 | } |
| 3117 | 3108 | ||
| 3118 | return 0; | 3109 | return 0; |
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 02d8974bf9ab..6b2067f10824 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _INTEL_RINGBUFFER_H_ | 2 | #ifndef _INTEL_RINGBUFFER_H_ |
| 2 | #define _INTEL_RINGBUFFER_H_ | 3 | #define _INTEL_RINGBUFFER_H_ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/i915/selftests/i915_live_selftests.h b/drivers/gpu/drm/i915/selftests/i915_live_selftests.h index 18b174d855ca..1519f1b7841b 100644 --- a/drivers/gpu/drm/i915/selftests/i915_live_selftests.h +++ b/drivers/gpu/drm/i915/selftests/i915_live_selftests.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* List each unit test as selftest(name, function) | 2 | /* List each unit test as selftest(name, function) |
| 2 | * | 3 | * |
| 3 | * The name is used as both an enum and expanded as subtest__name to create | 4 | * The name is used as both an enum and expanded as subtest__name to create |
diff --git a/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h b/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h index fc74687501ba..e5a9e5dcf2f3 100644 --- a/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h +++ b/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* List each unit test as selftest(name, function) | 2 | /* List each unit test as selftest(name, function) |
| 2 | * | 3 | * |
| 3 | * The name is used as both an enum and expanded as subtest__name to create | 4 | * The name is used as both an enum and expanded as subtest__name to create |
diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.h b/drivers/gpu/drm/i915/selftests/mock_gem_device.h index 4cca4d57f52c..b5dc4e394555 100644 --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.h +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MOCK_GEM_DEVICE_H__ | 2 | #ifndef __MOCK_GEM_DEVICE_H__ |
| 2 | #define __MOCK_GEM_DEVICE_H__ | 3 | #define __MOCK_GEM_DEVICE_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_object.h b/drivers/gpu/drm/i915/selftests/mock_gem_object.h index 9fbf67321662..20acdbee7bd0 100644 --- a/drivers/gpu/drm/i915/selftests/mock_gem_object.h +++ b/drivers/gpu/drm/i915/selftests/mock_gem_object.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MOCK_GEM_OBJECT_H__ | 2 | #ifndef __MOCK_GEM_OBJECT_H__ |
| 2 | #define __MOCK_GEM_OBJECT_H__ | 3 | #define __MOCK_GEM_OBJECT_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/imx/Makefile b/drivers/gpu/drm/imx/Makefile index 16ecef33e008..ab6c83caceb7 100644 --- a/drivers/gpu/drm/imx/Makefile +++ b/drivers/gpu/drm/imx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | imxdrm-objs := imx-drm-core.o ipuv3-crtc.o ipuv3-plane.o | 3 | imxdrm-objs := imx-drm-core.o ipuv3-crtc.o ipuv3-plane.o |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/imx/imx-drm.h b/drivers/gpu/drm/imx/imx-drm.h index f6dd64be9cd5..f0b7556c0857 100644 --- a/drivers/gpu/drm/imx/imx-drm.h +++ b/drivers/gpu/drm/imx/imx-drm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _IMX_DRM_H_ | 2 | #ifndef _IMX_DRM_H_ |
| 2 | #define _IMX_DRM_H_ | 3 | #define _IMX_DRM_H_ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.h b/drivers/gpu/drm/imx/ipuv3-plane.h index 596b24ddbf65..e563ea17a827 100644 --- a/drivers/gpu/drm/imx/ipuv3-plane.h +++ b/drivers/gpu/drm/imx/ipuv3-plane.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __IPUV3_PLANE_H__ | 2 | #ifndef __IPUV3_PLANE_H__ |
| 2 | #define __IPUV3_PLANE_H__ | 3 | #define __IPUV3_PLANE_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/lib/drm_random.c b/drivers/gpu/drm/lib/drm_random.c index a78c4b483e8d..eeb155826d27 100644 --- a/drivers/gpu/drm/lib/drm_random.c +++ b/drivers/gpu/drm/lib/drm_random.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/bitops.h> | 2 | #include <linux/bitops.h> |
| 2 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 3 | #include <linux/random.h> | 4 | #include <linux/random.h> |
diff --git a/drivers/gpu/drm/lib/drm_random.h b/drivers/gpu/drm/lib/drm_random.h index a78644bea7f9..4a3e94dfa0c0 100644 --- a/drivers/gpu/drm/lib/drm_random.h +++ b/drivers/gpu/drm/lib/drm_random.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __DRM_RANDOM_H__ | 2 | #ifndef __DRM_RANDOM_H__ |
| 2 | #define __DRM_RANDOM_H__ | 3 | #define __DRM_RANDOM_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile index e37b55a23a65..ce83c396a742 100644 --- a/drivers/gpu/drm/mediatek/Makefile +++ b/drivers/gpu/drm/mediatek/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | mediatek-drm-y := mtk_disp_color.o \ | 2 | mediatek-drm-y := mtk_disp_color.o \ |
| 2 | mtk_disp_ovl.o \ | 3 | mtk_disp_ovl.o \ |
| 3 | mtk_disp_rdma.o \ | 4 | mtk_disp_rdma.o \ |
diff --git a/drivers/gpu/drm/mgag200/mgag200_reg.h b/drivers/gpu/drm/mgag200/mgag200_reg.h index 3ae442a64bd6..c096a9d6bcbc 100644 --- a/drivers/gpu/drm/mgag200/mgag200_reg.h +++ b/drivers/gpu/drm/mgag200/mgag200_reg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * MGA Millennium (MGA2064W) functions | 3 | * MGA Millennium (MGA2064W) functions |
| 3 | * MGA Mystique (MGA1064SG) functions | 4 | * MGA Mystique (MGA1064SG) functions |
diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index 33008fa1be9b..ced70783b44e 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ccflags-y := -Idrivers/gpu/drm/msm | 2 | ccflags-y := -Idrivers/gpu/drm/msm |
| 2 | ccflags-$(CONFIG_DRM_MSM_DSI) += -Idrivers/gpu/drm/msm/dsi | 3 | ccflags-$(CONFIG_DRM_MSM_DSI) += -Idrivers/gpu/drm/msm/dsi |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/dispnv04/cursor.c b/drivers/gpu/drm/nouveau/dispnv04/cursor.c index f26e44ea7389..ebf860bd59af 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/cursor.c +++ b/drivers/gpu/drm/nouveau/dispnv04/cursor.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <drm/drmP.h> | 2 | #include <drm/drmP.h> |
| 2 | #include <drm/drm_mode.h> | 3 | #include <drm/drm_mode.h> |
| 3 | #include "nouveau_drv.h" | 4 | #include "nouveau_drv.h" |
diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.h b/drivers/gpu/drm/nouveau/dispnv04/disp.h index 74a8795c2c2b..f74f1f2b186e 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/disp.h +++ b/drivers/gpu/drm/nouveau/dispnv04/disp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV04_DISPLAY_H__ | 2 | #ifndef __NV04_DISPLAY_H__ |
| 2 | #define __NV04_DISPLAY_H__ | 3 | #define __NV04_DISPLAY_H__ |
| 3 | #include <subdev/bios.h> | 4 | #include <subdev/bios.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl0002.h b/drivers/gpu/drm/nouveau/include/nvif/cl0002.h index 6d72ed38da32..1a8b45b4631f 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl0002.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl0002.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL0002_H__ | 2 | #ifndef __NVIF_CL0002_H__ |
| 2 | #define __NVIF_CL0002_H__ | 3 | #define __NVIF_CL0002_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl0046.h b/drivers/gpu/drm/nouveau/include/nvif/cl0046.h index a6a71f4ad91e..c0d5eba4f8fc 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl0046.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl0046.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL0046_H__ | 2 | #ifndef __NVIF_CL0046_H__ |
| 2 | #define __NVIF_CL0046_H__ | 3 | #define __NVIF_CL0046_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl006b.h b/drivers/gpu/drm/nouveau/include/nvif/cl006b.h index 309ab8a3d9e8..d0e8f35d9e92 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl006b.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl006b.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL006B_H__ | 2 | #ifndef __NVIF_CL006B_H__ |
| 2 | #define __NVIF_CL006B_H__ | 3 | #define __NVIF_CL006B_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl0080.h b/drivers/gpu/drm/nouveau/include/nvif/cl0080.h index 287a7d6fa480..2740278d226b 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl0080.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl0080.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL0080_H__ | 2 | #ifndef __NVIF_CL0080_H__ |
| 2 | #define __NVIF_CL0080_H__ | 3 | #define __NVIF_CL0080_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl506e.h b/drivers/gpu/drm/nouveau/include/nvif/cl506e.h index aa94b8cf9679..b4cd58093300 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl506e.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl506e.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL506E_H__ | 2 | #ifndef __NVIF_CL506E_H__ |
| 2 | #define __NVIF_CL506E_H__ | 3 | #define __NVIF_CL506E_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl506f.h b/drivers/gpu/drm/nouveau/include/nvif/cl506f.h index 3b7101966de4..14d20c813cdb 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl506f.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl506f.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL506F_H__ | 2 | #ifndef __NVIF_CL506F_H__ |
| 2 | #define __NVIF_CL506F_H__ | 3 | #define __NVIF_CL506F_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl5070.h b/drivers/gpu/drm/nouveau/include/nvif/cl5070.h index 542d95145a67..7cdf53615d7b 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl5070.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl5070.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL5070_H__ | 2 | #ifndef __NVIF_CL5070_H__ |
| 2 | #define __NVIF_CL5070_H__ | 3 | #define __NVIF_CL5070_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl507a.h b/drivers/gpu/drm/nouveau/include/nvif/cl507a.h index 12e0643b78bd..36e537218596 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl507a.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl507a.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL507A_H__ | 2 | #ifndef __NVIF_CL507A_H__ |
| 2 | #define __NVIF_CL507A_H__ | 3 | #define __NVIF_CL507A_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl507b.h b/drivers/gpu/drm/nouveau/include/nvif/cl507b.h index 99e9d8c47f60..3e643b752bfc 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl507b.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl507b.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL507B_H__ | 2 | #ifndef __NVIF_CL507B_H__ |
| 2 | #define __NVIF_CL507B_H__ | 3 | #define __NVIF_CL507B_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl507c.h b/drivers/gpu/drm/nouveau/include/nvif/cl507c.h index 6af70dbdfd9f..fd9e336d0a24 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl507c.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl507c.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL507C_H__ | 2 | #ifndef __NVIF_CL507C_H__ |
| 2 | #define __NVIF_CL507C_H__ | 3 | #define __NVIF_CL507C_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl507d.h b/drivers/gpu/drm/nouveau/include/nvif/cl507d.h index 5ab0c9e4c6a3..e994c6894e3e 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl507d.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl507d.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL507D_H__ | 2 | #ifndef __NVIF_CL507D_H__ |
| 2 | #define __NVIF_CL507D_H__ | 3 | #define __NVIF_CL507D_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl507e.h b/drivers/gpu/drm/nouveau/include/nvif/cl507e.h index c06209f3cac4..8082d2fde248 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl507e.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl507e.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL507E_H__ | 2 | #ifndef __NVIF_CL507E_H__ |
| 2 | #define __NVIF_CL507E_H__ | 3 | #define __NVIF_CL507E_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl826e.h b/drivers/gpu/drm/nouveau/include/nvif/cl826e.h index 91e33db21a2f..36944ff09e3c 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl826e.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl826e.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL826E_H__ | 2 | #ifndef __NVIF_CL826E_H__ |
| 2 | #define __NVIF_CL826E_H__ | 3 | #define __NVIF_CL826E_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl826f.h b/drivers/gpu/drm/nouveau/include/nvif/cl826f.h index e34efd4ec537..df09a50817eb 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl826f.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl826f.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL826F_H__ | 2 | #ifndef __NVIF_CL826F_H__ |
| 2 | #define __NVIF_CL826F_H__ | 3 | #define __NVIF_CL826F_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl906f.h b/drivers/gpu/drm/nouveau/include/nvif/cl906f.h index a2d5410a491b..6d16a3a2ec02 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl906f.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl906f.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL906F_H__ | 2 | #ifndef __NVIF_CL906F_H__ |
| 2 | #define __NVIF_CL906F_H__ | 3 | #define __NVIF_CL906F_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl9097.h b/drivers/gpu/drm/nouveau/include/nvif/cl9097.h index 4057676d2981..e4c8de6d00b7 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl9097.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl9097.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CL9097_H__ | 2 | #ifndef __NVIF_CL9097_H__ |
| 2 | #define __NVIF_CL9097_H__ | 3 | #define __NVIF_CL9097_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cla06f.h b/drivers/gpu/drm/nouveau/include/nvif/cla06f.h index 2efa3d048bb9..597ebb52d5f9 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cla06f.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cla06f.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CLA06F_H__ | 2 | #ifndef __NVIF_CLA06F_H__ |
| 2 | #define __NVIF_CLA06F_H__ | 3 | #define __NVIF_CLA06F_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/class.h b/drivers/gpu/drm/nouveau/include/nvif/class.h index d08da82ba7ed..e3a2ea8bde70 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/class.h +++ b/drivers/gpu/drm/nouveau/include/nvif/class.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CLASS_H__ | 2 | #ifndef __NVIF_CLASS_H__ |
| 2 | #define __NVIF_CLASS_H__ | 3 | #define __NVIF_CLASS_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/client.h b/drivers/gpu/drm/nouveau/include/nvif/client.h index b52a8eadce01..f5df8b30c599 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/client.h +++ b/drivers/gpu/drm/nouveau/include/nvif/client.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_CLIENT_H__ | 2 | #ifndef __NVIF_CLIENT_H__ |
| 2 | #define __NVIF_CLIENT_H__ | 3 | #define __NVIF_CLIENT_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/device.h b/drivers/gpu/drm/nouveau/include/nvif/device.h index bcb981711617..09439b037870 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/device.h +++ b/drivers/gpu/drm/nouveau/include/nvif/device.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_DEVICE_H__ | 2 | #ifndef __NVIF_DEVICE_H__ |
| 2 | #define __NVIF_DEVICE_H__ | 3 | #define __NVIF_DEVICE_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/driver.h b/drivers/gpu/drm/nouveau/include/nvif/driver.h index 0c6f48d8140a..93bccd45a042 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/driver.h +++ b/drivers/gpu/drm/nouveau/include/nvif/driver.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_DRIVER_H__ | 2 | #ifndef __NVIF_DRIVER_H__ |
| 2 | #define __NVIF_DRIVER_H__ | 3 | #define __NVIF_DRIVER_H__ |
| 3 | #include <nvif/os.h> | 4 | #include <nvif/os.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvif/event.h b/drivers/gpu/drm/nouveau/include/nvif/event.h index 21764499b4be..ec5c924f576a 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/event.h +++ b/drivers/gpu/drm/nouveau/include/nvif/event.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_EVENT_H__ | 2 | #ifndef __NVIF_EVENT_H__ |
| 2 | #define __NVIF_EVENT_H__ | 3 | #define __NVIF_EVENT_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/if0000.h b/drivers/gpu/drm/nouveau/include/nvif/if0000.h index c2c0fc41e017..30ecd31db5df 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/if0000.h +++ b/drivers/gpu/drm/nouveau/include/nvif/if0000.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_IF0000_H__ | 2 | #ifndef __NVIF_IF0000_H__ |
| 2 | #define __NVIF_IF0000_H__ | 3 | #define __NVIF_IF0000_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/if0001.h b/drivers/gpu/drm/nouveau/include/nvif/if0001.h index bd5b64125eed..ca9215262215 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/if0001.h +++ b/drivers/gpu/drm/nouveau/include/nvif/if0001.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_IF0001_H__ | 2 | #ifndef __NVIF_IF0001_H__ |
| 2 | #define __NVIF_IF0001_H__ | 3 | #define __NVIF_IF0001_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/if0002.h b/drivers/gpu/drm/nouveau/include/nvif/if0002.h index c04c91d0b818..d9235c011196 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/if0002.h +++ b/drivers/gpu/drm/nouveau/include/nvif/if0002.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_IF0002_H__ | 2 | #ifndef __NVIF_IF0002_H__ |
| 2 | #define __NVIF_IF0002_H__ | 3 | #define __NVIF_IF0002_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/if0003.h b/drivers/gpu/drm/nouveau/include/nvif/if0003.h index 0cd03efb80a1..ae30b8261b88 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/if0003.h +++ b/drivers/gpu/drm/nouveau/include/nvif/if0003.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_IF0003_H__ | 2 | #ifndef __NVIF_IF0003_H__ |
| 2 | #define __NVIF_IF0003_H__ | 3 | #define __NVIF_IF0003_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/if0004.h b/drivers/gpu/drm/nouveau/include/nvif/if0004.h index bd5cd428cfd7..b35547c8ea36 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/if0004.h +++ b/drivers/gpu/drm/nouveau/include/nvif/if0004.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_IF0004_H__ | 2 | #ifndef __NVIF_IF0004_H__ |
| 2 | #define __NVIF_IF0004_H__ | 3 | #define __NVIF_IF0004_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/if0005.h b/drivers/gpu/drm/nouveau/include/nvif/if0005.h index abfd373bb68b..8ed0ae101715 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/if0005.h +++ b/drivers/gpu/drm/nouveau/include/nvif/if0005.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_IF0005_H__ | 2 | #ifndef __NVIF_IF0005_H__ |
| 2 | #define __NVIF_IF0005_H__ | 3 | #define __NVIF_IF0005_H__ |
| 3 | #define NV10_NVSW_NTFY_UEVENT 0x00 | 4 | #define NV10_NVSW_NTFY_UEVENT 0x00 |
diff --git a/drivers/gpu/drm/nouveau/include/nvif/ioctl.h b/drivers/gpu/drm/nouveau/include/nvif/ioctl.h index c5f5eb83a594..688c4bcd9c64 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/ioctl.h +++ b/drivers/gpu/drm/nouveau/include/nvif/ioctl.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_IOCTL_H__ | 2 | #ifndef __NVIF_IOCTL_H__ |
| 2 | #define __NVIF_IOCTL_H__ | 3 | #define __NVIF_IOCTL_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/notify.h b/drivers/gpu/drm/nouveau/include/nvif/notify.h index 51e2eb580809..4ed169230657 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/notify.h +++ b/drivers/gpu/drm/nouveau/include/nvif/notify.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_NOTIFY_H__ | 2 | #ifndef __NVIF_NOTIFY_H__ |
| 2 | #define __NVIF_NOTIFY_H__ | 3 | #define __NVIF_NOTIFY_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/object.h b/drivers/gpu/drm/nouveau/include/nvif/object.h index 9e58b305b020..6912b8cffc98 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/object.h +++ b/drivers/gpu/drm/nouveau/include/nvif/object.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_OBJECT_H__ | 2 | #ifndef __NVIF_OBJECT_H__ |
| 2 | #define __NVIF_OBJECT_H__ | 3 | #define __NVIF_OBJECT_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/os.h b/drivers/gpu/drm/nouveau/include/nvif/os.h index 9fcab67c8557..6b16ab6b26d5 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/os.h +++ b/drivers/gpu/drm/nouveau/include/nvif/os.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NOUVEAU_OS_H__ | 2 | #ifndef __NOUVEAU_OS_H__ |
| 2 | #define __NOUVEAU_OS_H__ | 3 | #define __NOUVEAU_OS_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvif/unpack.h b/drivers/gpu/drm/nouveau/include/nvif/unpack.h index 751bcf4930a7..7f0d9f6cc1e7 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/unpack.h +++ b/drivers/gpu/drm/nouveau/include/nvif/unpack.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVIF_UNPACK_H__ | 2 | #ifndef __NVIF_UNPACK_H__ |
| 2 | #define __NVIF_UNPACK_H__ | 3 | #define __NVIF_UNPACK_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/client.h b/drivers/gpu/drm/nouveau/include/nvkm/core/client.h index e876634da10a..ca23230d5743 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/client.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/client.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_CLIENT_H__ | 2 | #ifndef __NVKM_CLIENT_H__ |
| 2 | #define __NVKM_CLIENT_H__ | 3 | #define __NVKM_CLIENT_H__ |
| 3 | #define nvkm_client(p) container_of((p), struct nvkm_client, object) | 4 | #define nvkm_client(p) container_of((p), struct nvkm_client, object) |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/debug.h b/drivers/gpu/drm/nouveau/include/nvkm/core/debug.h index c59fd4e2ad5e..966d1822dd80 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/debug.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/debug.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DEBUG_H__ | 2 | #ifndef __NVKM_DEBUG_H__ |
| 2 | #define __NVKM_DEBUG_H__ | 3 | #define __NVKM_DEBUG_H__ |
| 3 | #define NV_DBG_FATAL 0 | 4 | #define NV_DBG_FATAL 0 |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h index bb4c214f1046..d7ecb65ba19f 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DEVICE_H__ | 2 | #ifndef __NVKM_DEVICE_H__ |
| 2 | #define __NVKM_DEVICE_H__ | 3 | #define __NVKM_DEVICE_H__ |
| 3 | #include <core/event.h> | 4 | #include <core/event.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h b/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h index d4cd2fbfde88..c6bcd8a64cae 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_ENGINE_H__ | 2 | #ifndef __NVKM_ENGINE_H__ |
| 2 | #define __NVKM_ENGINE_H__ | 3 | #define __NVKM_ENGINE_H__ |
| 3 | #define nvkm_engine(p) container_of((p), struct nvkm_engine, subdev) | 4 | #define nvkm_engine(p) container_of((p), struct nvkm_engine, subdev) |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/enum.h b/drivers/gpu/drm/nouveau/include/nvkm/core/enum.h index 40429a82f792..38acbde2de4f 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/enum.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/enum.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_ENUM_H__ | 2 | #ifndef __NVKM_ENUM_H__ |
| 2 | #define __NVKM_ENUM_H__ | 3 | #define __NVKM_ENUM_H__ |
| 3 | #include <core/os.h> | 4 | #include <core/os.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/event.h b/drivers/gpu/drm/nouveau/include/nvkm/core/event.h index b98fe2de546a..d3c45e90a1c1 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/event.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/event.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_EVENT_H__ | 2 | #ifndef __NVKM_EVENT_H__ |
| 2 | #define __NVKM_EVENT_H__ | 3 | #define __NVKM_EVENT_H__ |
| 3 | #include <core/os.h> | 4 | #include <core/os.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h b/drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h index a626ce378f04..ff0fa38aee72 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_FIRMWARE_H__ | 2 | #ifndef __NVKM_FIRMWARE_H__ |
| 2 | #define __NVKM_FIRMWARE_H__ | 3 | #define __NVKM_FIRMWARE_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h b/drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h index c23da4f05929..473ba0b9a368 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_GPUOBJ_H__ | 2 | #ifndef __NVKM_GPUOBJ_H__ |
| 2 | #define __NVKM_GPUOBJ_H__ | 3 | #define __NVKM_GPUOBJ_H__ |
| 3 | #include <core/object.h> | 4 | #include <core/object.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/ioctl.h b/drivers/gpu/drm/nouveau/include/nvkm/core/ioctl.h index 88971eb37afa..e2d39192fa26 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/ioctl.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/ioctl.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_IOCTL_H__ | 2 | #ifndef __NVKM_IOCTL_H__ |
| 2 | #define __NVKM_IOCTL_H__ | 3 | #define __NVKM_IOCTL_H__ |
| 3 | #include <core/os.h> | 4 | #include <core/os.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/memory.h b/drivers/gpu/drm/nouveau/include/nvkm/core/memory.h index 33ca6769266a..affba21fcbad 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/memory.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/memory.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MEMORY_H__ | 2 | #ifndef __NVKM_MEMORY_H__ |
| 2 | #define __NVKM_MEMORY_H__ | 3 | #define __NVKM_MEMORY_H__ |
| 3 | #include <core/os.h> | 4 | #include <core/os.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/mm.h b/drivers/gpu/drm/nouveau/include/nvkm/core/mm.h index 7bd4897a8a2a..2002a4da9999 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/mm.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/mm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MM_H__ | 2 | #ifndef __NVKM_MM_H__ |
| 2 | #define __NVKM_MM_H__ | 3 | #define __NVKM_MM_H__ |
| 3 | #include <core/os.h> | 4 | #include <core/os.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/notify.h b/drivers/gpu/drm/nouveau/include/nvkm/core/notify.h index 753d08c1767b..4eb82bc563f3 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/notify.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/notify.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_NOTIFY_H__ | 2 | #ifndef __NVKM_NOTIFY_H__ |
| 2 | #define __NVKM_NOTIFY_H__ | 3 | #define __NVKM_NOTIFY_H__ |
| 3 | #include <core/os.h> | 4 | #include <core/os.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/object.h b/drivers/gpu/drm/nouveau/include/nvkm/core/object.h index 96dda350ada3..3f13ff1d4ee4 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/object.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/object.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_OBJECT_H__ | 2 | #ifndef __NVKM_OBJECT_H__ |
| 2 | #define __NVKM_OBJECT_H__ | 3 | #define __NVKM_OBJECT_H__ |
| 3 | #include <core/os.h> | 4 | #include <core/os.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/oproxy.h b/drivers/gpu/drm/nouveau/include/nvkm/core/oproxy.h index bd52236cc2f4..d950d5ee188b 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/oproxy.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/oproxy.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_OPROXY_H__ | 2 | #ifndef __NVKM_OPROXY_H__ |
| 2 | #define __NVKM_OPROXY_H__ | 3 | #define __NVKM_OPROXY_H__ |
| 3 | #define nvkm_oproxy(p) container_of((p), struct nvkm_oproxy, base) | 4 | #define nvkm_oproxy(p) container_of((p), struct nvkm_oproxy, base) |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/option.h b/drivers/gpu/drm/nouveau/include/nvkm/core/option.h index 80fdc146e816..a34a79bacbd0 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/option.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/option.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_OPTION_H__ | 2 | #ifndef __NVKM_OPTION_H__ |
| 2 | #define __NVKM_OPTION_H__ | 3 | #define __NVKM_OPTION_H__ |
| 3 | #include <core/os.h> | 4 | #include <core/os.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/os.h b/drivers/gpu/drm/nouveau/include/nvkm/core/os.h index cd57e238ddd3..fc9e8cd36087 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/os.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/os.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_OS_H__ | 2 | #ifndef __NVKM_OS_H__ |
| 2 | #define __NVKM_OS_H__ | 3 | #define __NVKM_OS_H__ |
| 3 | #include <nvif/os.h> | 4 | #include <nvif/os.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/pci.h b/drivers/gpu/drm/nouveau/include/nvkm/core/pci.h index 78d41be20b8c..4c7f647d2dc9 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/pci.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/pci.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DEVICE_PCI_H__ | 2 | #ifndef __NVKM_DEVICE_PCI_H__ |
| 2 | #define __NVKM_DEVICE_PCI_H__ | 3 | #define __NVKM_DEVICE_PCI_H__ |
| 3 | #include <core/device.h> | 4 | #include <core/device.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h b/drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h index 5ee6298991e2..674a38408240 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_RAMHT_H__ | 2 | #ifndef __NVKM_RAMHT_H__ |
| 2 | #define __NVKM_RAMHT_H__ | 3 | #define __NVKM_RAMHT_H__ |
| 3 | #include <core/gpuobj.h> | 4 | #include <core/gpuobj.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h b/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h index ca9ed3d68f44..38f51ff7ab40 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_SUBDEV_H__ | 2 | #ifndef __NVKM_SUBDEV_H__ |
| 2 | #define __NVKM_SUBDEV_H__ | 3 | #define __NVKM_SUBDEV_H__ |
| 3 | #include <core/device.h> | 4 | #include <core/device.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h b/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h index 7c7d91cad09a..5c102d0206a7 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DEVICE_TEGRA_H__ | 2 | #ifndef __NVKM_DEVICE_TEGRA_H__ |
| 2 | #define __NVKM_DEVICE_TEGRA_H__ | 3 | #define __NVKM_DEVICE_TEGRA_H__ |
| 3 | #include <core/device.h> | 4 | #include <core/device.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/bsp.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/bsp.h index 904820558fc0..40613983fccb 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/bsp.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/bsp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_BSP_H__ | 2 | #ifndef __NVKM_BSP_H__ |
| 2 | #define __NVKM_BSP_H__ | 3 | #define __NVKM_BSP_H__ |
| 3 | #include <engine/xtensa.h> | 4 | #include <engine/xtensa.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h index b93f4c1a95e5..553245994450 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_CE_H__ | 2 | #ifndef __NVKM_CE_H__ |
| 2 | #define __NVKM_CE_H__ | 3 | #define __NVKM_CE_H__ |
| 3 | #include <engine/falcon.h> | 4 | #include <engine/falcon.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/cipher.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/cipher.h index 03fa57a7c30a..72b9da2de7c2 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/cipher.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/cipher.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_CIPHER_H__ | 2 | #ifndef __NVKM_CIPHER_H__ |
| 2 | #define __NVKM_CIPHER_H__ | 3 | #define __NVKM_CIPHER_H__ |
| 3 | #include <core/engine.h> | 4 | #include <core/engine.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h index 05f9c13ab8c3..e83193d3ccab 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DISP_H__ | 2 | #ifndef __NVKM_DISP_H__ |
| 2 | #define __NVKM_DISP_H__ | 3 | #define __NVKM_DISP_H__ |
| 3 | #define nvkm_disp(p) container_of((p), struct nvkm_disp, engine) | 4 | #define nvkm_disp(p) container_of((p), struct nvkm_disp, engine) |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h index d2a6532ce3b9..5f5cae7c474e 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DMA_H__ | 2 | #ifndef __NVKM_DMA_H__ |
| 2 | #define __NVKM_DMA_H__ | 3 | #define __NVKM_DMA_H__ |
| 3 | #include <core/engine.h> | 4 | #include <core/engine.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h index e1a854e2ade1..5a51842bc241 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_FALCON_H__ | 2 | #ifndef __NVKM_FALCON_H__ |
| 2 | #define __NVKM_FALCON_H__ | 3 | #define __NVKM_FALCON_H__ |
| 3 | #define nvkm_falcon(p) container_of((p), struct nvkm_falcon, engine) | 4 | #define nvkm_falcon(p) container_of((p), struct nvkm_falcon, engine) |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h index f00527b36acc..025f400c9f5d 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_FIFO_H__ | 2 | #ifndef __NVKM_FIFO_H__ |
| 2 | #define __NVKM_FIFO_H__ | 3 | #define __NVKM_FIFO_H__ |
| 3 | #include <core/engine.h> | 4 | #include <core/engine.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h index c7944b19bed8..fb18f105fc43 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_GR_H__ | 2 | #ifndef __NVKM_GR_H__ |
| 2 | #define __NVKM_GR_H__ | 3 | #define __NVKM_GR_H__ |
| 3 | #include <core/engine.h> | 4 | #include <core/engine.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h index 257738eff9f6..4ef3d4c5e358 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MPEG_H__ | 2 | #ifndef __NVKM_MPEG_H__ |
| 2 | #define __NVKM_MPEG_H__ | 3 | #define __NVKM_MPEG_H__ |
| 3 | #include <core/engine.h> | 4 | #include <core/engine.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/msenc.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/msenc.h index 748ea9b7e559..985fc9490643 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/msenc.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/msenc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MSENC_H__ | 2 | #ifndef __NVKM_MSENC_H__ |
| 2 | #define __NVKM_MSENC_H__ | 3 | #define __NVKM_MSENC_H__ |
| 3 | #include <core/engine.h> | 4 | #include <core/engine.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/mspdec.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/mspdec.h index 08516ca82e04..e03f33472486 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/mspdec.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/mspdec.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MSPDEC_H__ | 2 | #ifndef __NVKM_MSPDEC_H__ |
| 2 | #define __NVKM_MSPDEC_H__ | 3 | #define __NVKM_MSPDEC_H__ |
| 3 | #include <engine/falcon.h> | 4 | #include <engine/falcon.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/msppp.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/msppp.h index 85fd306021ac..760bf17ea63d 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/msppp.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/msppp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MSPPP_H__ | 2 | #ifndef __NVKM_MSPPP_H__ |
| 2 | #define __NVKM_MSPPP_H__ | 3 | #define __NVKM_MSPPP_H__ |
| 3 | #include <engine/falcon.h> | 4 | #include <engine/falcon.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/msvld.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/msvld.h index 99757ed96f76..281866d2501d 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/msvld.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/msvld.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MSVLD_H__ | 2 | #ifndef __NVKM_MSVLD_H__ |
| 2 | #define __NVKM_MSVLD_H__ | 3 | #define __NVKM_MSVLD_H__ |
| 3 | #include <engine/falcon.h> | 4 | #include <engine/falcon.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h index 00b2b227ff41..fe716859d4a9 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_NVDEC_H__ | 2 | #ifndef __NVKM_NVDEC_H__ |
| 2 | #define __NVKM_NVDEC_H__ | 3 | #define __NVKM_NVDEC_H__ |
| 3 | #define nvkm_nvdec(p) container_of((p), struct nvkm_nvdec, engine) | 4 | #define nvkm_nvdec(p) container_of((p), struct nvkm_nvdec, engine) |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h index 8a819328059b..cdd68a8bab8b 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_NVENC_H__ | 2 | #ifndef __NVKM_NVENC_H__ |
| 2 | #define __NVKM_NVENC_H__ | 3 | #define __NVKM_NVENC_H__ |
| 3 | #include <core/engine.h> | 4 | #include <core/engine.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h index 240855ad8c8d..6cce8502f9df 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_PM_H__ | 2 | #ifndef __NVKM_PM_H__ |
| 2 | #define __NVKM_PM_H__ | 3 | #define __NVKM_PM_H__ |
| 3 | #include <core/engine.h> | 4 | #include <core/engine.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/sec.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/sec.h index 7317ef4c0207..b206b918c43e 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/sec.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/sec.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_SEC_H__ | 2 | #ifndef __NVKM_SEC_H__ |
| 2 | #define __NVKM_SEC_H__ | 3 | #define __NVKM_SEC_H__ |
| 3 | #include <engine/falcon.h> | 4 | #include <engine/falcon.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h index d3db1b1e75c4..f7d89822b905 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_SEC2_H__ | 2 | #ifndef __NVKM_SEC2_H__ |
| 2 | #define __NVKM_SEC2_H__ | 3 | #define __NVKM_SEC2_H__ |
| 3 | #include <core/engine.h> | 4 | #include <core/engine.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h index 096e7dbd1e65..83a17c4e11e7 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_SW_H__ | 2 | #ifndef __NVKM_SW_H__ |
| 2 | #define __NVKM_SW_H__ | 3 | #define __NVKM_SW_H__ |
| 3 | #include <core/engine.h> | 4 | #include <core/engine.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/vic.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/vic.h index 2b0dc4c695c2..9b7d4877cf41 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/vic.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/vic.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_VIC_H__ | 2 | #ifndef __NVKM_VIC_H__ |
| 2 | #define __NVKM_VIC_H__ | 3 | #define __NVKM_VIC_H__ |
| 3 | #include <core/engine.h> | 4 | #include <core/engine.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/vp.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/vp.h index 616ea91e03f8..53bf8aed48fb 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/vp.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/vp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_VP_H__ | 2 | #ifndef __NVKM_VP_H__ |
| 2 | #define __NVKM_VP_H__ | 3 | #define __NVKM_VP_H__ |
| 3 | #include <engine/xtensa.h> | 4 | #include <engine/xtensa.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h index b1fcc416732f..13c00ce6d556 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_XTENSA_H__ | 2 | #ifndef __NVKM_XTENSA_H__ |
| 2 | #define __NVKM_XTENSA_H__ | 3 | #define __NVKM_XTENSA_H__ |
| 3 | #define nvkm_xtensa(p) container_of((p), struct nvkm_xtensa, engine) | 4 | #define nvkm_xtensa(p) container_of((p), struct nvkm_xtensa, engine) |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h index d3071b5a4f98..91f1e0efe061 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_BAR_H__ | 2 | #ifndef __NVKM_BAR_H__ |
| 2 | #define __NVKM_BAR_H__ | 3 | #define __NVKM_BAR_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h index a72f3290528a..979e9a144e7b 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_BIOS_H__ | 2 | #ifndef __NVKM_BIOS_H__ |
| 2 | #define __NVKM_BIOS_H__ | 3 | #define __NVKM_BIOS_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0203.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0203.h index cf202c793a1d..703a5b524b96 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0203.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0203.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_M0203_H__ | 2 | #ifndef __NVBIOS_M0203_H__ |
| 2 | #define __NVBIOS_M0203_H__ | 3 | #define __NVBIOS_M0203_H__ |
| 3 | struct nvbios_M0203T { | 4 | struct nvbios_M0203T { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0205.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0205.h index d34608ff241e..b4e14e45a0e8 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0205.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0205.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_M0205_H__ | 2 | #ifndef __NVBIOS_M0205_H__ |
| 2 | #define __NVBIOS_M0205_H__ | 3 | #define __NVBIOS_M0205_H__ |
| 3 | struct nvbios_M0205T { | 4 | struct nvbios_M0205T { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0209.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0209.h index c7ff8d9526e7..c09376894d12 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0209.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0209.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_M0209_H__ | 2 | #ifndef __NVBIOS_M0209_H__ |
| 2 | #define __NVBIOS_M0209_H__ | 3 | #define __NVBIOS_M0209_H__ |
| 3 | u32 nvbios_M0209Te(struct nvkm_bios *, | 4 | u32 nvbios_M0209Te(struct nvkm_bios *, |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/P0260.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/P0260.h index 1c1c52eac97d..901d94ef11b8 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/P0260.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/P0260.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_P0260_H__ | 2 | #ifndef __NVBIOS_P0260_H__ |
| 2 | #define __NVBIOS_P0260_H__ | 3 | #define __NVBIOS_P0260_H__ |
| 3 | u32 nvbios_P0260Te(struct nvkm_bios *, | 4 | u32 nvbios_P0260Te(struct nvkm_bios *, |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bit.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bit.h index 6711732b7cb1..d068586f3263 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bit.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bit.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_BIT_H__ | 2 | #ifndef __NVBIOS_BIT_H__ |
| 2 | #define __NVBIOS_BIT_H__ | 3 | #define __NVBIOS_BIT_H__ |
| 3 | struct bit_entry { | 4 | struct bit_entry { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bmp.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bmp.h index 3f0c7c414026..9a3f9483ee75 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bmp.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bmp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_BMP_H__ | 2 | #ifndef __NVBIOS_BMP_H__ |
| 2 | #define __NVBIOS_BMP_H__ | 3 | #define __NVBIOS_BMP_H__ |
| 3 | static inline u16 | 4 | static inline u16 |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/boost.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/boost.h index 2ff64a20c0ec..a1c48c6b223b 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/boost.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/boost.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_BOOST_H__ | 2 | #ifndef __NVBIOS_BOOST_H__ |
| 2 | #define __NVBIOS_BOOST_H__ | 3 | #define __NVBIOS_BOOST_H__ |
| 3 | u32 nvbios_boostTe(struct nvkm_bios *, u8 *, u8 *, u8 *, u8 *, u8 *, u8 *); | 4 | u32 nvbios_boostTe(struct nvkm_bios *, u8 *, u8 *, u8 *, u8 *, u8 *, u8 *); |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h index deb477282dde..ed9e0a6a0011 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_CONN_H__ | 2 | #ifndef __NVBIOS_CONN_H__ |
| 2 | #define __NVBIOS_CONN_H__ | 3 | #define __NVBIOS_CONN_H__ |
| 3 | enum dcb_connector_type { | 4 | enum dcb_connector_type { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/cstep.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/cstep.h index 76fe7d50a1ce..49343d276e11 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/cstep.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/cstep.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_CSTEP_H__ | 2 | #ifndef __NVBIOS_CSTEP_H__ |
| 2 | #define __NVBIOS_CSTEP_H__ | 3 | #define __NVBIOS_CSTEP_H__ |
| 3 | u32 nvbios_cstepTe(struct nvkm_bios *, | 4 | u32 nvbios_cstepTe(struct nvkm_bios *, |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h index 903d117603d8..63ddc6ed897a 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_DCB_H__ | 2 | #ifndef __NVBIOS_DCB_H__ |
| 2 | #define __NVBIOS_DCB_H__ | 3 | #define __NVBIOS_DCB_H__ |
| 3 | enum dcb_output_type { | 4 | enum dcb_output_type { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/disp.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/disp.h index c5a6ebd5a478..423d92de0aae 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/disp.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/disp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_DISP_H__ | 2 | #ifndef __NVBIOS_DISP_H__ |
| 2 | #define __NVBIOS_DISP_H__ | 3 | #define __NVBIOS_DISP_H__ |
| 3 | u16 nvbios_disp_table(struct nvkm_bios *, | 4 | u16 nvbios_disp_table(struct nvkm_bios *, |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dp.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dp.h index b4d39df70d4e..df34b41838d6 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dp.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_DP_H__ | 2 | #ifndef __NVBIOS_DP_H__ |
| 2 | #define __NVBIOS_DP_H__ | 3 | #define __NVBIOS_DP_H__ |
| 3 | struct nvbios_dpout { | 4 | struct nvbios_dpout { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/extdev.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/extdev.h index bb49bd5f879e..f93e4f951f2f 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/extdev.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/extdev.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_EXTDEV_H__ | 2 | #ifndef __NVBIOS_EXTDEV_H__ |
| 2 | #define __NVBIOS_EXTDEV_H__ | 3 | #define __NVBIOS_EXTDEV_H__ |
| 3 | enum nvbios_extdev_type { | 4 | enum nvbios_extdev_type { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/fan.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/fan.h index a7513e8406a3..09c1d3b9d009 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/fan.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/fan.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_FAN_H__ | 2 | #ifndef __NVBIOS_FAN_H__ |
| 2 | #define __NVBIOS_FAN_H__ | 3 | #define __NVBIOS_FAN_H__ |
| 3 | #include <subdev/bios/therm.h> | 4 | #include <subdev/bios/therm.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h index b7a54e605469..b71a3555c64e 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_GPIO_H__ | 2 | #ifndef __NVBIOS_GPIO_H__ |
| 2 | #define __NVBIOS_GPIO_H__ | 3 | #define __NVBIOS_GPIO_H__ |
| 3 | enum dcb_gpio_func_name { | 4 | enum dcb_gpio_func_name { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/i2c.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/i2c.h index 85c529ecf9b1..ae1f7483dd28 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/i2c.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/i2c.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_I2C_H__ | 2 | #ifndef __NVBIOS_I2C_H__ |
| 2 | #define __NVBIOS_I2C_H__ | 3 | #define __NVBIOS_I2C_H__ |
| 3 | enum dcb_i2c_type { | 4 | enum dcb_i2c_type { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h index e933d3eede70..e220a1ac1387 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_ICCSENSE_H__ | 2 | #ifndef __NVBIOS_ICCSENSE_H__ |
| 2 | #define __NVBIOS_ICCSENSE_H__ | 3 | #define __NVBIOS_ICCSENSE_H__ |
| 3 | struct pwr_rail_resistor_t { | 4 | struct pwr_rail_resistor_t { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/image.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/image.h index e15d63b9a5eb..893288b060de 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/image.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/image.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_IMAGE_H__ | 2 | #ifndef __NVBIOS_IMAGE_H__ |
| 2 | #define __NVBIOS_IMAGE_H__ | 3 | #define __NVBIOS_IMAGE_H__ |
| 3 | struct nvbios_image { | 4 | struct nvbios_image { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h index 06ab48052128..744b1868e789 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_INIT_H__ | 2 | #ifndef __NVBIOS_INIT_H__ |
| 2 | #define __NVBIOS_INIT_H__ | 3 | #define __NVBIOS_INIT_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/mxm.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/mxm.h index 4e31b64c5edf..327bf9c4b703 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/mxm.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/mxm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_MXM_H__ | 2 | #ifndef __NVBIOS_MXM_H__ |
| 2 | #define __NVBIOS_MXM_H__ | 3 | #define __NVBIOS_MXM_H__ |
| 3 | u16 mxm_table(struct nvkm_bios *, u8 *ver, u8 *hdr); | 4 | u16 mxm_table(struct nvkm_bios *, u8 *ver, u8 *hdr); |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/npde.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/npde.h index 64a59549b7ea..ee5419b7b45b 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/npde.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/npde.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_NPDE_H__ | 2 | #ifndef __NVBIOS_NPDE_H__ |
| 2 | #define __NVBIOS_NPDE_H__ | 3 | #define __NVBIOS_NPDE_H__ |
| 3 | struct nvbios_npdeT { | 4 | struct nvbios_npdeT { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pcir.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pcir.h index e85931541f4f..1dffe8d6cc81 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pcir.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pcir.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_PCIR_H__ | 2 | #ifndef __NVBIOS_PCIR_H__ |
| 2 | #define __NVBIOS_PCIR_H__ | 3 | #define __NVBIOS_PCIR_H__ |
| 3 | struct nvbios_pcirT { | 4 | struct nvbios_pcirT { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/perf.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/perf.h index 478b1c0d2089..0ee84ea6d737 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/perf.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/perf.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_PERF_H__ | 2 | #ifndef __NVBIOS_PERF_H__ |
| 2 | #define __NVBIOS_PERF_H__ | 3 | #define __NVBIOS_PERF_H__ |
| 3 | u32 nvbios_perf_table(struct nvkm_bios *, u8 *ver, u8 *hdr, | 4 | u32 nvbios_perf_table(struct nvkm_bios *, u8 *ver, u8 *hdr, |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pll.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pll.h index 5a69978d1e3b..ab964e085f02 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pll.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pll.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_PLL_H__ | 2 | #ifndef __NVBIOS_PLL_H__ |
| 2 | #define __NVBIOS_PLL_H__ | 3 | #define __NVBIOS_PLL_H__ |
| 3 | /*XXX: kill me */ | 4 | /*XXX: kill me */ |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pmu.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pmu.h index 3a643df6de04..fb41ecab8f8c 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pmu.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pmu.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_PMU_H__ | 2 | #ifndef __NVBIOS_PMU_H__ |
| 2 | #define __NVBIOS_PMU_H__ | 3 | #define __NVBIOS_PMU_H__ |
| 3 | struct nvbios_pmuT { | 4 | struct nvbios_pmuT { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/power_budget.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/power_budget.h index f5f4a14c4030..ff12d810dce3 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/power_budget.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/power_budget.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_POWER_BUDGET_H__ | 2 | #ifndef __NVBIOS_POWER_BUDGET_H__ |
| 2 | #define __NVBIOS_POWER_BUDGET_H__ | 3 | #define __NVBIOS_POWER_BUDGET_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/ramcfg.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/ramcfg.h index dca6c060a24f..2b87a38adb7a 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/ramcfg.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/ramcfg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_RAMCFG_H__ | 2 | #ifndef __NVBIOS_RAMCFG_H__ |
| 2 | #define __NVBIOS_RAMCFG_H__ | 3 | #define __NVBIOS_RAMCFG_H__ |
| 3 | struct nvbios_ramcfg { | 4 | struct nvbios_ramcfg { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/rammap.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/rammap.h index 8d8ee13721ec..471eef434b51 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/rammap.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/rammap.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_RAMMAP_H__ | 2 | #ifndef __NVBIOS_RAMMAP_H__ |
| 2 | #define __NVBIOS_RAMMAP_H__ | 3 | #define __NVBIOS_RAMMAP_H__ |
| 3 | #include <subdev/bios/ramcfg.h> | 4 | #include <subdev/bios/ramcfg.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/therm.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/therm.h index dd3ba960e75d..46a3b15e10ec 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/therm.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/therm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_THERM_H__ | 2 | #ifndef __NVBIOS_THERM_H__ |
| 2 | #define __NVBIOS_THERM_H__ | 3 | #define __NVBIOS_THERM_H__ |
| 3 | struct nvbios_therm_threshold { | 4 | struct nvbios_therm_threshold { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/timing.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/timing.h index 38188d4c9ab5..40ceabf37827 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/timing.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/timing.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_TIMING_H__ | 2 | #ifndef __NVBIOS_TIMING_H__ |
| 2 | #define __NVBIOS_TIMING_H__ | 3 | #define __NVBIOS_TIMING_H__ |
| 3 | #include <subdev/bios/ramcfg.h> | 4 | #include <subdev/bios/ramcfg.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h index bea31cdd1dd1..67419bad584c 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_VMAP_H__ | 2 | #ifndef __NVBIOS_VMAP_H__ |
| 2 | #define __NVBIOS_VMAP_H__ | 3 | #define __NVBIOS_VMAP_H__ |
| 3 | struct nvbios_vmap { | 4 | struct nvbios_vmap { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/volt.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/volt.h index f0baa2c7de09..6b36d5ecb8f9 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/volt.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/volt.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_VOLT_H__ | 2 | #ifndef __NVBIOS_VOLT_H__ |
| 2 | #define __NVBIOS_VOLT_H__ | 3 | #define __NVBIOS_VOLT_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vpstate.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vpstate.h index 87f804fc3a88..36f3028d58ef 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vpstate.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vpstate.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_VPSTATE_H__ | 2 | #ifndef __NVBIOS_VPSTATE_H__ |
| 2 | #define __NVBIOS_VPSTATE_H__ | 3 | #define __NVBIOS_VPSTATE_H__ |
| 3 | struct nvbios_vpstate_header { | 4 | struct nvbios_vpstate_header { |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/xpio.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/xpio.h index 0c0fe234ff12..d1bb5d044585 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/xpio.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/xpio.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVBIOS_XPIO_H__ | 2 | #ifndef __NVBIOS_XPIO_H__ |
| 2 | #define __NVBIOS_XPIO_H__ | 3 | #define __NVBIOS_XPIO_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h index 33a057c334f2..7695f7f77a06 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_BUS_H__ | 2 | #ifndef __NVKM_BUS_H__ |
| 2 | #define __NVKM_BUS_H__ | 3 | #define __NVKM_BUS_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h index e5275f742977..15db75ef0189 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_CLK_H__ | 2 | #ifndef __NVKM_CLK_H__ |
| 2 | #define __NVKM_CLK_H__ | 3 | #define __NVKM_CLK_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h index 709d786f1808..40558064d589 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DEVINIT_H__ | 2 | #ifndef __NVKM_DEVINIT_H__ |
| 2 | #define __NVKM_DEVINIT_H__ | 3 | #define __NVKM_DEVINIT_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h index 28d513fbf44c..4da68dd52619 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_FB_H__ | 2 | #ifndef __NVKM_FB_H__ |
| 2 | #define __NVKM_FB_H__ | 3 | #define __NVKM_FB_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h index ae201e388487..092193b7f98e 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_FUSE_H__ | 2 | #ifndef __NVKM_FUSE_H__ |
| 2 | #define __NVKM_FUSE_H__ | 3 | #define __NVKM_FUSE_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h index 9b9c6d2f90b6..ee54899076e3 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_GPIO_H__ | 2 | #ifndef __NVKM_GPIO_H__ |
| 2 | #define __NVKM_GPIO_H__ | 3 | #define __NVKM_GPIO_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h index ce23cc6c672e..eef54e9b5d77 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_I2C_H__ | 2 | #ifndef __NVKM_I2C_H__ |
| 2 | #define __NVKM_I2C_H__ | 3 | #define __NVKM_I2C_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h index 6e2b70bd2f41..919653c1d101 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_IBUS_H__ | 2 | #ifndef __NVKM_IBUS_H__ |
| 2 | #define __NVKM_IBUS_H__ | 3 | #define __NVKM_IBUS_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h index b7a9b041e130..be9475cd94fd 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_ICCSENSE_H__ | 2 | #ifndef __NVKM_ICCSENSE_H__ |
| 2 | #define __NVKM_ICCSENSE_H__ | 3 | #define __NVKM_ICCSENSE_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h index 40f845e31272..91126fd29222 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_INSTMEM_H__ | 2 | #ifndef __NVKM_INSTMEM_H__ |
| 2 | #define __NVKM_INSTMEM_H__ | 3 | #define __NVKM_INSTMEM_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h index cd755baf9cab..63b7ad1f9ce2 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_LTC_H__ | 2 | #ifndef __NVKM_LTC_H__ |
| 2 | #define __NVKM_LTC_H__ | 3 | #define __NVKM_LTC_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h index 58f10890c3b6..61c93c86e2e2 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MC_H__ | 2 | #ifndef __NVKM_MC_H__ |
| 2 | #define __NVKM_MC_H__ | 3 | #define __NVKM_MC_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h index dcd3deff27a4..0fdfc610ceb3 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MMU_H__ | 2 | #ifndef __NVKM_MMU_H__ |
| 2 | #define __NVKM_MMU_H__ | 3 | #define __NVKM_MMU_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h index ed0250139dae..0fd6d6f8eada 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MXM_H__ | 2 | #ifndef __NVKM_MXM_H__ |
| 2 | #define __NVKM_MXM_H__ | 3 | #define __NVKM_MXM_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h index ac2a695963c1..23803cc859fd 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_PCI_H__ | 2 | #ifndef __NVKM_PCI_H__ |
| 2 | #define __NVKM_PCI_H__ | 3 | #define __NVKM_PCI_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h index e7f04732a425..4bc9384046c6 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_PMU_H__ | 2 | #ifndef __NVKM_PMU_H__ |
| 2 | #define __NVKM_PMU_H__ | 3 | #define __NVKM_PMU_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h index 1bfd93b85575..98fe1d0fd592 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_THERM_H__ | 2 | #ifndef __NVKM_THERM_H__ |
| 2 | #define __NVKM_THERM_H__ | 3 | #define __NVKM_THERM_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h index ff0709652f80..e9b0746826ca 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_TIMER_H__ | 2 | #ifndef __NVKM_TIMER_H__ |
| 2 | #define __NVKM_TIMER_H__ | 3 | #define __NVKM_TIMER_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h index d23209b62c25..f7d3eb647e2e 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_TOP_H__ | 2 | #ifndef __NVKM_TOP_H__ |
| 2 | #define __NVKM_TOP_H__ | 3 | #define __NVKM_TOP_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/vga.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/vga.h index ce5636fe2a66..312933ad7c2b 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/vga.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/vga.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NOUVEAU_VGA_H__ | 2 | #ifndef __NOUVEAU_VGA_H__ |
| 2 | #define __NOUVEAU_VGA_H__ | 3 | #define __NOUVEAU_VGA_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h index 08ef9983c643..8a0f85f5fc1a 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_VOLT_H__ | 2 | #ifndef __NVKM_VOLT_H__ |
| 2 | #define __NVKM_VOLT_H__ | 3 | #define __NVKM_VOLT_H__ |
| 3 | #include <core/subdev.h> | 4 | #include <core/subdev.h> |
diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.h b/drivers/gpu/drm/nouveau/nouveau_abi16.h index 841cc556fad8..441100aa2320 100644 --- a/drivers/gpu/drm/nouveau/nouveau_abi16.h +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NOUVEAU_ABI16_H__ | 2 | #ifndef __NOUVEAU_ABI16_H__ |
| 2 | #define __NOUVEAU_ABI16_H__ | 3 | #define __NOUVEAU_ABI16_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c index 7459ef9943ec..5ffcb6683776 100644 --- a/drivers/gpu/drm/nouveau/nouveau_acpi.c +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/pci.h> | 2 | #include <linux/pci.h> |
| 2 | #include <linux/acpi.h> | 3 | #include <linux/acpi.h> |
| 3 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.h b/drivers/gpu/drm/nouveau/nouveau_acpi.h index 2f03653aff86..b86294fc99e8 100644 --- a/drivers/gpu/drm/nouveau/nouveau_acpi.h +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NOUVEAU_ACPI_H__ | 2 | #ifndef __NOUVEAU_ACPI_H__ |
| 2 | #define __NOUVEAU_ACPI_H__ | 3 | #define __NOUVEAU_ACPI_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.h b/drivers/gpu/drm/nouveau/nouveau_bo.h index b06a5385d6dd..4caade5dee50 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.h +++ b/drivers/gpu/drm/nouveau/nouveau_bo.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NOUVEAU_BO_H__ | 2 | #ifndef __NOUVEAU_BO_H__ |
| 2 | #define __NOUVEAU_BO_H__ | 3 | #define __NOUVEAU_BO_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.h b/drivers/gpu/drm/nouveau/nouveau_chan.h index 46b947ba1cf4..9463a78613cb 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.h +++ b/drivers/gpu/drm/nouveau/nouveau_chan.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NOUVEAU_CHAN_H__ | 2 | #ifndef __NOUVEAU_CHAN_H__ |
| 2 | #define __NOUVEAU_CHAN_H__ | 3 | #define __NOUVEAU_CHAN_H__ |
| 3 | #include <nvif/object.h> | 4 | #include <nvif/object.h> |
diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.h b/drivers/gpu/drm/nouveau/nouveau_debugfs.h index b799f8dfb2b2..1d01a82d4b6f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.h +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NOUVEAU_DEBUGFS_H__ | 2 | #ifndef __NOUVEAU_DEBUGFS_H__ |
| 2 | #define __NOUVEAU_DEBUGFS_H__ | 3 | #define __NOUVEAU_DEBUGFS_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.h b/drivers/gpu/drm/nouveau/nouveau_display.h index 201aec2ea5b8..34cd144681b9 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.h +++ b/drivers/gpu/drm/nouveau/nouveau_display.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NOUVEAU_DISPLAY_H__ | 2 | #ifndef __NOUVEAU_DISPLAY_H__ |
| 2 | #define __NOUVEAU_DISPLAY_H__ | 3 | #define __NOUVEAU_DISPLAY_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 822fe1d4d35e..77dea95c1bf1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NOUVEAU_DRV_H__ | 2 | #ifndef __NOUVEAU_DRV_H__ |
| 2 | #define __NOUVEAU_DRV_H__ | 3 | #define __NOUVEAU_DRV_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.h b/drivers/gpu/drm/nouveau/nouveau_fence.h index d5e58a38f160..c9b399ad89e6 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.h +++ b/drivers/gpu/drm/nouveau/nouveau_fence.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NOUVEAU_FENCE_H__ | 2 | #ifndef __NOUVEAU_FENCE_H__ |
| 2 | #define __NOUVEAU_FENCE_H__ | 3 | #define __NOUVEAU_FENCE_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.h b/drivers/gpu/drm/nouveau/nouveau_gem.h index 8fa6ed9ddd3a..0456c94a5d4d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.h +++ b/drivers/gpu/drm/nouveau/nouveau_gem.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NOUVEAU_GEM_H__ | 2 | #ifndef __NOUVEAU_GEM_H__ |
| 2 | #define __NOUVEAU_GEM_H__ | 3 | #define __NOUVEAU_GEM_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_ioctl.h b/drivers/gpu/drm/nouveau/nouveau_ioctl.h index 3b9f2e5463a7..380ede26806c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ioctl.h +++ b/drivers/gpu/drm/nouveau/nouveau_ioctl.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NOUVEAU_IOCTL_H__ | 2 | #ifndef __NOUVEAU_IOCTL_H__ |
| 2 | #define __NOUVEAU_IOCTL_H__ | 3 | #define __NOUVEAU_IOCTL_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_reg.h b/drivers/gpu/drm/nouveau/nouveau_reg.h index 7226f1f60901..b5b5fe40779d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_reg.h +++ b/drivers/gpu/drm/nouveau/nouveau_reg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #define NV04_PFB_BOOT_0 0x00100000 | 3 | #define NV04_PFB_BOOT_0 0x00100000 |
| 3 | # define NV04_PFB_BOOT_0_RAM_AMOUNT 0x00000003 | 4 | # define NV04_PFB_BOOT_0_RAM_AMOUNT 0x00000003 |
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c index b7ab268f7d6f..fde11ce466e4 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/pagemap.h> | 2 | #include <linux/pagemap.h> |
| 2 | #include <linux/slab.h> | 3 | #include <linux/slab.h> |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.h b/drivers/gpu/drm/nouveau/nouveau_ttm.h index 25b0de413352..96082b696420 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.h +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NOUVEAU_TTM_H__ | 2 | #ifndef __NOUVEAU_TTM_H__ |
| 2 | #define __NOUVEAU_TTM_H__ | 3 | #define __NOUVEAU_TTM_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_usif.h b/drivers/gpu/drm/nouveau/nouveau_usif.h index c037e3ae8c70..c68f1c65af3b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_usif.h +++ b/drivers/gpu/drm/nouveau/nouveau_usif.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NOUVEAU_USIF_H__ | 2 | #ifndef __NOUVEAU_USIF_H__ |
| 2 | #define __NOUVEAU_USIF_H__ | 3 | #define __NOUVEAU_USIF_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c index 48393a4f6331..52e52a360fb1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/vgaarb.h> | 2 | #include <linux/vgaarb.h> |
| 2 | #include <linux/vga_switcheroo.h> | 3 | #include <linux/vga_switcheroo.h> |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.h b/drivers/gpu/drm/nouveau/nouveau_vga.h index ea3ad6974c65..6a3000c88142 100644 --- a/drivers/gpu/drm/nouveau/nouveau_vga.h +++ b/drivers/gpu/drm/nouveau/nouveau_vga.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NOUVEAU_VGA_H__ | 2 | #ifndef __NOUVEAU_VGA_H__ |
| 2 | #define __NOUVEAU_VGA_H__ | 3 | #define __NOUVEAU_VGA_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nv10_fence.h b/drivers/gpu/drm/nouveau/nv10_fence.h index b7a508585304..7616c66803f8 100644 --- a/drivers/gpu/drm/nouveau/nv10_fence.h +++ b/drivers/gpu/drm/nouveau/nv10_fence.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV10_FENCE_H_ | 2 | #ifndef __NV10_FENCE_H_ |
| 2 | #define __NV10_FENCE_H_ | 3 | #define __NV10_FENCE_H_ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index e4751f92b342..fb47d46050ec 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c | |||
| @@ -4099,7 +4099,7 @@ nv50_disp_atomic_commit(struct drm_device *dev, | |||
| 4099 | { | 4099 | { |
| 4100 | struct nouveau_drm *drm = nouveau_drm(dev); | 4100 | struct nouveau_drm *drm = nouveau_drm(dev); |
| 4101 | struct nv50_disp *disp = nv50_disp(dev); | 4101 | struct nv50_disp *disp = nv50_disp(dev); |
| 4102 | struct drm_plane_state *old_plane_state; | 4102 | struct drm_plane_state *new_plane_state; |
| 4103 | struct drm_plane *plane; | 4103 | struct drm_plane *plane; |
| 4104 | struct drm_crtc *crtc; | 4104 | struct drm_crtc *crtc; |
| 4105 | bool active = false; | 4105 | bool active = false; |
| @@ -4129,8 +4129,8 @@ nv50_disp_atomic_commit(struct drm_device *dev, | |||
| 4129 | if (ret) | 4129 | if (ret) |
| 4130 | goto err_cleanup; | 4130 | goto err_cleanup; |
| 4131 | 4131 | ||
| 4132 | for_each_old_plane_in_state(state, plane, old_plane_state, i) { | 4132 | for_each_new_plane_in_state(state, plane, new_plane_state, i) { |
| 4133 | struct nv50_wndw_atom *asyw = nv50_wndw_atom(old_plane_state); | 4133 | struct nv50_wndw_atom *asyw = nv50_wndw_atom(new_plane_state); |
| 4134 | struct nv50_wndw *wndw = nv50_wndw(plane); | 4134 | struct nv50_wndw *wndw = nv50_wndw(plane); |
| 4135 | 4135 | ||
| 4136 | if (asyw->set.image) { | 4136 | if (asyw->set.image) { |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h index d9ca9636a3e3..da130f5058e5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gf100_ce_data[] = { | 2 | static uint32_t gf100_ce_data[] = { |
| 2 | /* 0x0000: ctx_object */ | 3 | /* 0x0000: ctx_object */ |
| 3 | 0x00000000, | 4 | 0x00000000, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h index f0a1cf31c7ca..0b92eb32598d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gt215_ce_data[] = { | 2 | static uint32_t gt215_ce_data[] = { |
| 2 | /* 0x0000: ctx_object */ | 3 | /* 0x0000: ctx_object */ |
| 3 | 0x00000000, | 4 | 0x00000000, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h index 2dce405976ad..0e3d08f11b0b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_CE_PRIV_H__ | 2 | #ifndef __NVKM_CE_PRIV_H__ |
| 2 | #define __NVKM_CE_PRIV_H__ | 3 | #define __NVKM_CE_PRIV_H__ |
| 3 | #include <engine/ce.h> | 4 | #include <engine/ce.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.h b/drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.h index 1bbe76e0740a..6a62021e9861 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DEVICE_ACPI_H__ | 2 | #ifndef __NVKM_DEVICE_ACPI_H__ |
| 2 | #define __NVKM_DEVICE_ACPI_H__ | 3 | #define __NVKM_DEVICE_ACPI_H__ |
| 3 | #include <core/os.h> | 4 | #include <core/os.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.h b/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.h index 20249d8e444d..f279162f48c6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DEVICE_CTRL_H__ | 2 | #ifndef __NVKM_DEVICE_CTRL_H__ |
| 2 | #define __NVKM_DEVICE_CTRL_H__ | 3 | #define __NVKM_DEVICE_CTRL_H__ |
| 3 | #define nvkm_control(p) container_of((p), struct nvkm_control, object) | 4 | #define nvkm_control(p) container_of((p), struct nvkm_control, object) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h index 6c16f3835f44..08d0bf605722 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DEVICE_PRIV_H__ | 2 | #ifndef __NVKM_DEVICE_PRIV_H__ |
| 2 | #define __NVKM_DEVICE_PRIV_H__ | 3 | #define __NVKM_DEVICE_PRIV_H__ |
| 3 | #include <core/device.h> | 4 | #include <core/device.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h index 737b38f6fbd2..5701b3221a54 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV50_DISP_CHAN_H__ | 2 | #ifndef __NV50_DISP_CHAN_H__ |
| 2 | #define __NV50_DISP_CHAN_H__ | 3 | #define __NV50_DISP_CHAN_H__ |
| 3 | #define nv50_disp_chan(p) container_of((p), struct nv50_disp_chan, object) | 4 | #define nv50_disp_chan(p) container_of((p), struct nv50_disp_chan, object) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.h index de962b7b026d..090e869ae612 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DISP_CONN_H__ | 2 | #ifndef __NVKM_DISP_CONN_H__ |
| 2 | #define __NVKM_DISP_CONN_H__ | 3 | #define __NVKM_DISP_CONN_H__ |
| 3 | #include <engine/disp.h> | 4 | #include <engine/disp.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h index ea4a0d062e31..f9b98211da6a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV50_DISP_DMAC_H__ | 2 | #ifndef __NV50_DISP_DMAC_H__ |
| 2 | #define __NV50_DISP_DMAC_H__ | 3 | #define __NV50_DISP_DMAC_H__ |
| 3 | #define nv50_disp_dmac(p) container_of((p), struct nv50_disp_dmac, base) | 4 | #define nv50_disp_dmac(p) container_of((p), struct nv50_disp_dmac, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h index 59173c290525..495f665a0ee6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DISP_DP_H__ | 2 | #ifndef __NVKM_DISP_DP_H__ |
| 2 | #define __NVKM_DISP_DP_H__ | 3 | #define __NVKM_DISP_DP_H__ |
| 3 | #define nvkm_dp(p) container_of((p), struct nvkm_dp, outp) | 4 | #define nvkm_dp(p) container_of((p), struct nvkm_dp, outp) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c index e82c68f18444..d131cca999dd 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "hdmi.h" | 2 | #include "hdmi.h" |
| 2 | 3 | ||
| 3 | void pack_hdmi_infoframe(struct packed_hdmi_infoframe *packed_frame, | 4 | void pack_hdmi_infoframe(struct packed_hdmi_infoframe *packed_frame, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.h index 528f5621a496..45094c6e1425 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DISP_HDMI_H__ | 2 | #ifndef __NVKM_DISP_HDMI_H__ |
| 2 | #define __NVKM_DISP_HDMI_H__ | 3 | #define __NVKM_DISP_HDMI_H__ |
| 3 | #include "ior.h" | 4 | #include "ior.h" |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h index b04c49d2eeeb..57030b3a4a75 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DISP_HEAD_H__ | 2 | #ifndef __NVKM_DISP_HEAD_H__ |
| 2 | #define __NVKM_DISP_HEAD_H__ | 3 | #define __NVKM_DISP_HEAD_H__ |
| 3 | #include "priv.h" | 4 | #include "priv.h" |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h index a1e8bf48b778..cd6dd8742dc6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DISP_IOR_H__ | 2 | #ifndef __NVKM_DISP_IOR_H__ |
| 2 | #define __NVKM_DISP_IOR_H__ | 3 | #define __NVKM_DISP_IOR_H__ |
| 3 | #include "priv.h" | 4 | #include "priv.h" |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h index 6ea19466f436..eb0b8acb1c5b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV50_DISP_H__ | 2 | #ifndef __NV50_DISP_H__ |
| 2 | #define __NV50_DISP_H__ | 3 | #define __NV50_DISP_H__ |
| 3 | #define nv50_disp(p) container_of((p), struct nv50_disp, base) | 4 | #define nv50_disp(p) container_of((p), struct nv50_disp, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h index 146d101d4891..ea84d7d5741a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DISP_OUTP_H__ | 2 | #ifndef __NVKM_DISP_OUTP_H__ |
| 2 | #define __NVKM_DISP_OUTP_H__ | 3 | #define __NVKM_DISP_OUTP_H__ |
| 3 | #include <engine/disp.h> | 4 | #include <engine/disp.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h index 5772f0094129..6c9bfff6d043 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DISP_PRIV_H__ | 2 | #ifndef __NVKM_DISP_PRIV_H__ |
| 2 | #define __NVKM_DISP_PRIV_H__ | 3 | #define __NVKM_DISP_PRIV_H__ |
| 3 | #include <engine/disp.h> | 4 | #include <engine/disp.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h index b147cf5b3518..4818fa69ae6c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV50_DISP_ROOT_H__ | 2 | #ifndef __NV50_DISP_ROOT_H__ |
| 2 | #define __NV50_DISP_ROOT_H__ | 3 | #define __NV50_DISP_ROOT_H__ |
| 3 | #define nv50_disp_root(p) container_of((p), struct nv50_disp_root, object) | 4 | #define nv50_disp_root(p) container_of((p), struct nv50_disp_root, object) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/dma/priv.h index deb37ee55c0b..4307cbecd5c5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DMA_PRIV_H__ | 2 | #ifndef __NVKM_DMA_PRIV_H__ |
| 2 | #define __NVKM_DMA_PRIV_H__ | 3 | #define __NVKM_DMA_PRIV_H__ |
| 3 | #define nvkm_dma(p) container_of((p), struct nvkm_dma, engine) | 4 | #define nvkm_dma(p) container_of((p), struct nvkm_dma, engine) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.h b/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.h index 69a7f1034024..4bbac8a21c71 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DMA_USER_H__ | 2 | #ifndef __NVKM_DMA_USER_H__ |
| 2 | #define __NVKM_DMA_USER_H__ | 3 | #define __NVKM_DMA_USER_H__ |
| 3 | #define nvkm_dmaobj(p) container_of((p), struct nvkm_dmaobj, object) | 4 | #define nvkm_dmaobj(p) container_of((p), struct nvkm_dmaobj, object) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h index d8019bdacd61..3ffef236189e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_FIFO_CHAN_H__ | 2 | #ifndef __NVKM_FIFO_CHAN_H__ |
| 2 | #define __NVKM_FIFO_CHAN_H__ | 3 | #define __NVKM_FIFO_CHAN_H__ |
| 3 | #define nvkm_fifo_chan(p) container_of((p), struct nvkm_fifo_chan, object) | 4 | #define nvkm_fifo_chan(p) container_of((p), struct nvkm_fifo_chan, object) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h index 7d697e2dce1a..27002caba420 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __GF100_FIFO_CHAN_H__ | 2 | #ifndef __GF100_FIFO_CHAN_H__ |
| 2 | #define __GF100_FIFO_CHAN_H__ | 3 | #define __GF100_FIFO_CHAN_H__ |
| 3 | #define gf100_fifo_chan(p) container_of((p), struct gf100_fifo_chan, base) | 4 | #define gf100_fifo_chan(p) container_of((p), struct gf100_fifo_chan, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changk104.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changk104.h index 230f64e5f731..ec10be2984a9 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changk104.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changk104.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __GK104_FIFO_CHAN_H__ | 2 | #ifndef __GK104_FIFO_CHAN_H__ |
| 2 | #define __GK104_FIFO_CHAN_H__ | 3 | #define __GK104_FIFO_CHAN_H__ |
| 3 | #define gk104_fifo_chan(p) container_of((p), struct gk104_fifo_chan, base) | 4 | #define gk104_fifo_chan(p) container_of((p), struct gk104_fifo_chan, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv04.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv04.h index 3361a1fd0343..15b06bdf5067 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv04.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv04.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV04_FIFO_CHAN_H__ | 2 | #ifndef __NV04_FIFO_CHAN_H__ |
| 2 | #define __NV04_FIFO_CHAN_H__ | 3 | #define __NV04_FIFO_CHAN_H__ |
| 3 | #define nv04_fifo_chan(p) container_of((p), struct nv04_fifo_chan, base) | 4 | #define nv04_fifo_chan(p) container_of((p), struct nv04_fifo_chan, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.h index 4b9da469b704..ad9aa157e078 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV50_FIFO_CHAN_H__ | 2 | #ifndef __NV50_FIFO_CHAN_H__ |
| 2 | #define __NV50_FIFO_CHAN_H__ | 3 | #define __NV50_FIFO_CHAN_H__ |
| 3 | #define nv50_fifo_chan(p) container_of((p), struct nv50_fifo_chan, base) | 4 | #define nv50_fifo_chan(p) container_of((p), struct nv50_fifo_chan, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.h index 70db58eab9c3..571a6edb3f97 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __GF100_FIFO_H__ | 2 | #ifndef __GF100_FIFO_H__ |
| 2 | #define __GF100_FIFO_H__ | 3 | #define __GF100_FIFO_H__ |
| 3 | #define gf100_fifo(p) container_of((p), struct gf100_fifo, base) | 4 | #define gf100_fifo(p) container_of((p), struct gf100_fifo, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h index 44bff98d6725..0506c5290936 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __GK104_FIFO_H__ | 2 | #ifndef __GK104_FIFO_H__ |
| 2 | #define __GK104_FIFO_H__ | 3 | #define __GK104_FIFO_H__ |
| 3 | #define gk104_fifo(p) container_of((p), struct gk104_fifo, base) | 4 | #define gk104_fifo(p) container_of((p), struct gk104_fifo, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.h index 03f60004bf7c..1d70542553cc 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV04_FIFO_H__ | 2 | #ifndef __NV04_FIFO_H__ |
| 2 | #define __NV04_FIFO_H__ | 3 | #define __NV04_FIFO_H__ |
| 3 | #define nv04_fifo(p) container_of((p), struct nv04_fifo, base) | 4 | #define nv04_fifo(p) container_of((p), struct nv04_fifo, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.h index 8ab53948cbb4..a3994e8db462 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV50_FIFO_H__ | 2 | #ifndef __NV50_FIFO_H__ |
| 2 | #define __NV50_FIFO_H__ | 3 | #define __NV50_FIFO_H__ |
| 3 | #define nv50_fifo(p) container_of((p), struct nv50_fifo, base) | 4 | #define nv50_fifo(p) container_of((p), struct nv50_fifo, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h index f889b13b5e41..ae76b1aaccd4 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_FIFO_PRIV_H__ | 2 | #ifndef __NVKM_FIFO_PRIV_H__ |
| 2 | #define __NVKM_FIFO_PRIV_H__ | 3 | #define __NVKM_FIFO_PRIV_H__ |
| 3 | #define nvkm_fifo(p) container_of((p), struct nvkm_fifo, engine) | 4 | #define nvkm_fifo(p) container_of((p), struct nvkm_fifo, engine) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/regsnv04.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/regsnv04.h index 92d56221197b..49892a5e7201 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/regsnv04.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/regsnv04.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV04_FIFO_REGS_H__ | 2 | #ifndef __NV04_FIFO_REGS_H__ |
| 2 | #define __NV04_FIFO_REGS_H__ | 3 | #define __NV04_FIFO_REGS_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h index 017180d147cf..2812ca511c9c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_GRCTX_NVC0_H__ | 2 | #ifndef __NVKM_GRCTX_NVC0_H__ |
| 2 | #define __NVKM_GRCTX_NVC0_H__ | 3 | #define __NVKM_GRCTX_NVC0_H__ |
| 3 | #include "gf100.h" | 4 | #include "gf100.h" |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.h index 50e808e9f926..4d67d90261b8 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_GRCTX_H__ | 2 | #ifndef __NVKM_GRCTX_H__ |
| 2 | #define __NVKM_GRCTX_H__ | 3 | #define __NVKM_GRCTX_H__ |
| 3 | #include <core/gpuobj.h> | 4 | #include <core/gpuobj.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h index 12a703fe355d..0323acb739c8 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gf100_grgpc_data[] = { | 2 | static uint32_t gf100_grgpc_data[] = { |
| 2 | /* 0x0000: gpc_mmio_list_head */ | 3 | /* 0x0000: gpc_mmio_list_head */ |
| 3 | 0x00000064, | 4 | 0x00000064, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h index ffbfc51200f1..1bb265917915 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gf117_grgpc_data[] = { | 2 | static uint32_t gf117_grgpc_data[] = { |
| 2 | /* 0x0000: gpc_mmio_list_head */ | 3 | /* 0x0000: gpc_mmio_list_head */ |
| 3 | 0x0000006c, | 4 | 0x0000006c, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h index 357f662de571..cf8343a693ba 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gk104_grgpc_data[] = { | 2 | static uint32_t gk104_grgpc_data[] = { |
| 2 | /* 0x0000: gpc_mmio_list_head */ | 3 | /* 0x0000: gpc_mmio_list_head */ |
| 3 | 0x0000006c, | 4 | 0x0000006c, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h index 4ffc8212a85c..f4bfa109ed27 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gk110_grgpc_data[] = { | 2 | static uint32_t gk110_grgpc_data[] = { |
| 2 | /* 0x0000: gpc_mmio_list_head */ | 3 | /* 0x0000: gpc_mmio_list_head */ |
| 3 | 0x0000006c, | 4 | 0x0000006c, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h index 09196206c9bc..59a3e1b2927f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gk208_grgpc_data[] = { | 2 | static uint32_t gk208_grgpc_data[] = { |
| 2 | /* 0x0000: gpc_mmio_list_head */ | 3 | /* 0x0000: gpc_mmio_list_head */ |
| 3 | 0x0000006c, | 4 | 0x0000006c, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h index 6d7d004363d9..8daa0516704a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gm107_grgpc_data[] = { | 2 | static uint32_t gm107_grgpc_data[] = { |
| 2 | /* 0x0000: gpc_mmio_list_head */ | 3 | /* 0x0000: gpc_mmio_list_head */ |
| 3 | 0x0000006c, | 4 | 0x0000006c, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h index 7538404b8b13..cbf2351f8da8 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gf100_grhub_data[] = { | 2 | static uint32_t gf100_grhub_data[] = { |
| 2 | /* 0x0000: hub_mmio_list_head */ | 3 | /* 0x0000: hub_mmio_list_head */ |
| 3 | 0x00000300, | 4 | 0x00000300, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h index ce000a47ec6d..70830036ffee 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gf117_grhub_data[] = { | 2 | static uint32_t gf117_grhub_data[] = { |
| 2 | /* 0x0000: hub_mmio_list_head */ | 3 | /* 0x0000: hub_mmio_list_head */ |
| 3 | 0x00000300, | 4 | 0x00000300, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h index 1f26cb6a233c..7f2fd84d0c3a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gk104_grhub_data[] = { | 2 | static uint32_t gk104_grhub_data[] = { |
| 2 | /* 0x0000: hub_mmio_list_head */ | 3 | /* 0x0000: hub_mmio_list_head */ |
| 3 | 0x00000300, | 4 | 0x00000300, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h index 70436d93efe3..560063789de8 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gk110_grhub_data[] = { | 2 | static uint32_t gk110_grhub_data[] = { |
| 2 | /* 0x0000: hub_mmio_list_head */ | 3 | /* 0x0000: hub_mmio_list_head */ |
| 3 | 0x00000300, | 4 | 0x00000300, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h index e0933a07426a..71e85784b615 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gk208_grhub_data[] = { | 2 | static uint32_t gk208_grhub_data[] = { |
| 2 | /* 0x0000: hub_mmio_list_head */ | 3 | /* 0x0000: hub_mmio_list_head */ |
| 3 | 0x00000300, | 4 | 0x00000300, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h index 9b432823bcbe..d85eac6d1c61 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gm107_grhub_data[] = { | 2 | static uint32_t gm107_grhub_data[] = { |
| 2 | /* 0x0000: hub_mmio_list_head */ | 3 | /* 0x0000: hub_mmio_list_head */ |
| 3 | 0x00000300, | 4 | 0x00000300, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/os.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/os.h index 1718ae4e8224..f87693809c9f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/os.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/os.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_GRAPH_OS_H__ | 2 | #ifndef __NVKM_GRAPH_OS_H__ |
| 2 | #define __NVKM_GRAPH_OS_H__ | 3 | #define __NVKM_GRAPH_OS_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.h index d7c3d86cc99d..d5a376c4dd0b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV10_GR_H__ | 2 | #ifndef __NV10_GR_H__ |
| 2 | #define __NV10_GR_H__ | 3 | #define __NV10_GR_H__ |
| 3 | #include "priv.h" | 4 | #include "priv.h" |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c index d1dc92999dc0..df2cd864147c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "nv20.h" | 2 | #include "nv20.h" |
| 2 | #include "regs.h" | 3 | #include "regs.h" |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h index cdf4501e3798..ad7e53bb7c23 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV20_GR_H__ | 2 | #ifndef __NV20_GR_H__ |
| 2 | #define __NV20_GR_H__ | 3 | #define __NV20_GR_H__ |
| 3 | #define nv20_gr(p) container_of((p), struct nv20_gr, base) | 4 | #define nv20_gr(p) container_of((p), struct nv20_gr, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c index 6c4a00819b4b..e59a28a26d65 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "nv20.h" | 2 | #include "nv20.h" |
| 2 | #include "regs.h" | 3 | #include "regs.h" |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c index 3cad26dbc2b1..e113b2d4c811 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "nv20.h" | 2 | #include "nv20.h" |
| 2 | #include "regs.h" | 3 | #include "regs.h" |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c index b4e3c50badc7..4aac2c224874 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "nv20.h" | 2 | #include "nv20.h" |
| 2 | #include "regs.h" | 3 | #include "regs.h" |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c index e7ed04b935cd..301556503e93 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "nv20.h" | 2 | #include "nv20.h" |
| 2 | #include "regs.h" | 3 | #include "regs.h" |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c index 5e8abacbacc6..5d6926611a5b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "nv20.h" | 2 | #include "nv20.h" |
| 2 | #include "regs.h" | 3 | #include "regs.h" |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h index 2812ed11f877..89b773233ac5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV40_GR_H__ | 2 | #ifndef __NV40_GR_H__ |
| 2 | #define __NV40_GR_H__ | 3 | #define __NV40_GR_H__ |
| 3 | #define nv40_gr(p) container_of((p), struct nv40_gr, base) | 4 | #define nv40_gr(p) container_of((p), struct nv40_gr, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h index 45eec83a5969..567fa4f3e518 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV50_GR_H__ | 2 | #ifndef __NV50_GR_H__ |
| 2 | #define __NV50_GR_H__ | 3 | #define __NV50_GR_H__ |
| 3 | #define nv50_gr(p) container_of((p), struct nv50_gr, base) | 4 | #define nv50_gr(p) container_of((p), struct nv50_gr, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h index 2a52d9f026ec..66359c23cbce 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_GR_PRIV_H__ | 2 | #ifndef __NVKM_GR_PRIV_H__ |
| 2 | #define __NVKM_GR_PRIV_H__ | 3 | #define __NVKM_GR_PRIV_H__ |
| 3 | #define nvkm_gr(p) container_of((p), struct nvkm_gr, engine) | 4 | #define nvkm_gr(p) container_of((p), struct nvkm_gr, engine) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/regs.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/regs.h index 90a9873ce522..dc4f936675ac 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/regs.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/regs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_GR_REGS_H__ | 2 | #ifndef __NVKM_GR_REGS_H__ |
| 2 | #define __NVKM_GR_REGS_H__ | 3 | #define __NVKM_GR_REGS_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h index d3bb34fcdebf..1ac2b4558bec 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV31_MPEG_H__ | 2 | #ifndef __NV31_MPEG_H__ |
| 2 | #define __NV31_MPEG_H__ | 3 | #define __NV31_MPEG_H__ |
| 3 | #define nv31_mpeg(p) container_of((p), struct nv31_mpeg, engine) | 4 | #define nv31_mpeg(p) container_of((p), struct nv31_mpeg, engine) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/priv.h index d5753103ff63..26f9d14151e2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MPEG_PRIV_H__ | 2 | #ifndef __NVKM_MPEG_PRIV_H__ |
| 2 | #define __NVKM_MPEG_PRIV_H__ | 3 | #define __NVKM_MPEG_PRIV_H__ |
| 3 | #include <engine/mpeg.h> | 4 | #include <engine/mpeg.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/priv.h index d518af4bc9de..db305072a82f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MSPDEC_PRIV_H__ | 2 | #ifndef __NVKM_MSPDEC_PRIV_H__ |
| 2 | #define __NVKM_MSPDEC_PRIV_H__ | 3 | #define __NVKM_MSPDEC_PRIV_H__ |
| 3 | #include <engine/mspdec.h> | 4 | #include <engine/mspdec.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msppp/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/msppp/priv.h index 37a91f9d9181..7708e52c9043 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/msppp/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/msppp/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MSPPP_PRIV_H__ | 2 | #ifndef __NVKM_MSPPP_PRIV_H__ |
| 2 | #define __NVKM_MSPPP_PRIV_H__ | 3 | #define __NVKM_MSPPP_PRIV_H__ |
| 3 | #include <engine/msppp.h> | 4 | #include <engine/msppp.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/priv.h index 9dc1da67d929..66c36049abca 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MSVLD_PRIV_H__ | 2 | #ifndef __NVKM_MSVLD_PRIV_H__ |
| 2 | #define __NVKM_MSVLD_PRIV_H__ | 3 | #define __NVKM_MSVLD_PRIV_H__ |
| 3 | #include <engine/msvld.h> | 4 | #include <engine/msvld.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/priv.h index 353b94f51205..6c300739f621 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_NVDEC_PRIV_H__ | 2 | #ifndef __NVKM_NVDEC_PRIV_H__ |
| 2 | #define __NVKM_NVDEC_PRIV_H__ | 3 | #define __NVKM_NVDEC_PRIV_H__ |
| 3 | #include <engine/nvdec.h> | 4 | #include <engine/nvdec.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h index 56d0344853ea..c74fd4557d41 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_PM_NVC0_H__ | 2 | #ifndef __NVKM_PM_NVC0_H__ |
| 2 | #define __NVKM_PM_NVC0_H__ | 3 | #define __NVKM_PM_NVC0_H__ |
| 3 | #include "priv.h" | 4 | #include "priv.h" |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h index da481abe8f7a..3f37b713936c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_PM_NV40_H__ | 2 | #ifndef __NVKM_PM_NV40_H__ |
| 2 | #define __NVKM_PM_NV40_H__ | 3 | #define __NVKM_PM_NV40_H__ |
| 3 | #define nv40_pm(p) container_of((p), struct nv40_pm, base) | 4 | #define nv40_pm(p) container_of((p), struct nv40_pm, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h index d7b81cbf82b5..17240d54b1eb 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_PM_PRIV_H__ | 2 | #ifndef __NVKM_PM_PRIV_H__ |
| 2 | #define __NVKM_PM_PRIV_H__ | 3 | #define __NVKM_PM_PRIV_H__ |
| 3 | #define nvkm_pm(p) container_of((p), struct nvkm_pm, engine) | 4 | #define nvkm_pm(p) container_of((p), struct nvkm_pm, engine) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h b/drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h index 4b57f8814560..6278a0c5fe83 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t g98_sec_data[] = { | 2 | static uint32_t g98_sec_data[] = { |
| 2 | /* 0x0000: ctx_dma */ | 3 | /* 0x0000: ctx_dma */ |
| 3 | /* 0x0000: ctx_dma_query */ | 4 | /* 0x0000: ctx_dma_query */ |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h index 7ecc9d4724dc..2f97c806a79d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_SEC2_PRIV_H__ | 2 | #ifndef __NVKM_SEC2_PRIV_H__ |
| 2 | #define __NVKM_SEC2_PRIV_H__ | 3 | #define __NVKM_SEC2_PRIV_H__ |
| 3 | #include <engine/sec2.h> | 4 | #include <engine/sec2.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h b/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h index 6608bf6c6842..b1fa69314e4a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_SW_CHAN_H__ | 2 | #ifndef __NVKM_SW_CHAN_H__ |
| 2 | #define __NVKM_SW_CHAN_H__ | 3 | #define __NVKM_SW_CHAN_H__ |
| 3 | #define nvkm_sw_chan(p) container_of((p), struct nvkm_sw_chan, object) | 4 | #define nvkm_sw_chan(p) container_of((p), struct nvkm_sw_chan, object) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.h index 25cdfdef2d46..459afd30a484 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_SW_NV50_H__ | 2 | #ifndef __NVKM_SW_NV50_H__ |
| 2 | #define __NVKM_SW_NV50_H__ | 3 | #define __NVKM_SW_NV50_H__ |
| 3 | #define nv50_sw_chan(p) container_of((p), struct nv50_sw_chan, base) | 4 | #define nv50_sw_chan(p) container_of((p), struct nv50_sw_chan, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h index 943ef4c10091..7050a9e49db1 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_NVSW_H__ | 2 | #ifndef __NVKM_NVSW_H__ |
| 2 | #define __NVKM_NVSW_H__ | 3 | #define __NVKM_NVSW_H__ |
| 3 | #define nvkm_nvsw(p) container_of((p), struct nvkm_nvsw, object) | 4 | #define nvkm_nvsw(p) container_of((p), struct nvkm_nvsw, object) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sw/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/sw/priv.h index 0ef1318dc2fd..4aca1791abc3 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/sw/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/sw/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_SW_PRIV_H__ | 2 | #ifndef __NVKM_SW_PRIV_H__ |
| 2 | #define __NVKM_SW_PRIV_H__ | 3 | #define __NVKM_SW_PRIV_H__ |
| 3 | #define nvkm_sw(p) container_of((p), struct nvkm_sw, engine) | 4 | #define nvkm_sw(p) container_of((p), struct nvkm_sw, engine) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/falcon/priv.h b/drivers/gpu/drm/nouveau/nvkm/falcon/priv.h index 97b56f759d0b..d515ad994199 100644 --- a/drivers/gpu/drm/nouveau/nvkm/falcon/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/falcon/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_FALCON_PRIV_H__ | 2 | #ifndef __NVKM_FALCON_PRIV_H__ |
| 2 | #define __NVKM_FALCON_PRIV_H__ | 3 | #define __NVKM_FALCON_PRIV_H__ |
| 3 | #include <engine/falcon.h> | 4 | #include <engine/falcon.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h index 20a5255362ba..9accd7923788 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __GF100_BAR_H__ | 2 | #ifndef __GF100_BAR_H__ |
| 2 | #define __GF100_BAR_H__ | 3 | #define __GF100_BAR_H__ |
| 3 | #define gf100_bar(p) container_of((p), struct gf100_bar, base) | 4 | #define gf100_bar(p) container_of((p), struct gf100_bar, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h index 1eb764f22a49..ce9ab9110b08 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV50_BAR_H__ | 2 | #ifndef __NV50_BAR_H__ |
| 2 | #define __NV50_BAR_H__ | 3 | #define __NV50_BAR_H__ |
| 3 | #define nv50_bar(p) container_of((p), struct nv50_bar, base) | 4 | #define nv50_bar(p) container_of((p), struct nv50_bar, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h index d834ef20db5b..63d111c8afd4 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_BAR_PRIV_H__ | 2 | #ifndef __NVKM_BAR_PRIV_H__ |
| 2 | #define __NVKM_BAR_PRIV_H__ | 3 | #define __NVKM_BAR_PRIV_H__ |
| 3 | #define nvkm_bar(p) container_of((p), struct nvkm_bar, subdev) | 4 | #define nvkm_bar(p) container_of((p), struct nvkm_bar, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h index 7d1d3c6b4b72..33435ca16311 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_BIOS_PRIV_H__ | 2 | #ifndef __NVKM_BIOS_PRIV_H__ |
| 2 | #define __NVKM_BIOS_PRIV_H__ | 3 | #define __NVKM_BIOS_PRIV_H__ |
| 3 | #define nvkm_bios(p) container_of((p), struct nvkm_bios, subdev) | 4 | #define nvkm_bios(p) container_of((p), struct nvkm_bios, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.h b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.h index 54ec3b131dfd..17ac1812a928 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_BUS_HWSQ_H__ | 2 | #ifndef __NVKM_BUS_HWSQ_H__ |
| 2 | #define __NVKM_BUS_HWSQ_H__ | 3 | #define __NVKM_BUS_HWSQ_H__ |
| 3 | #include <subdev/bus.h> | 4 | #include <subdev/bus.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/priv.h index a130f2c642d5..ef01e569352d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_BUS_PRIV_H__ | 2 | #ifndef __NVKM_BUS_PRIV_H__ |
| 2 | #define __NVKM_BUS_PRIV_H__ | 3 | #define __NVKM_BUS_PRIV_H__ |
| 3 | #define nvkm_bus(p) container_of((p), struct nvkm_bus, subdev) | 4 | #define nvkm_bus(p) container_of((p), struct nvkm_bus, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.h b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.h index 8865b59fe575..1ea886a4301f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_CLK_NVA3_H__ | 2 | #ifndef __NVKM_CLK_NVA3_H__ |
| 2 | #define __NVKM_CLK_NVA3_H__ | 3 | #define __NVKM_CLK_NVA3_H__ |
| 3 | #include "priv.h" | 4 | #include "priv.h" |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.h b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.h index d3c7fb6efa16..f134d979d884 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV50_CLK_H__ | 2 | #ifndef __NV50_CLK_H__ |
| 2 | #define __NV50_CLK_H__ | 3 | #define __NV50_CLK_H__ |
| 3 | #define nv50_clk(p) container_of((p), struct nv50_clk, base) | 4 | #define nv50_clk(p) container_of((p), struct nv50_clk, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/pll.h b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/pll.h index 44020a30dee8..9a39f1fd2976 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/pll.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/pll.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_PLL_H__ | 2 | #ifndef __NVKM_PLL_H__ |
| 2 | #define __NVKM_PLL_H__ | 3 | #define __NVKM_PLL_H__ |
| 3 | #include <core/os.h> | 4 | #include <core/os.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/priv.h index 51eafc00c8b1..b656177923fb 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_CLK_PRIV_H__ | 2 | #ifndef __NVKM_CLK_PRIV_H__ |
| 2 | #define __NVKM_CLK_PRIV_H__ | 3 | #define __NVKM_CLK_PRIV_H__ |
| 3 | #define nvkm_clk(p) container_of((p), struct nvkm_clk, subdev) | 4 | #define nvkm_clk(p) container_of((p), struct nvkm_clk, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/seq.h b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/seq.h index d717e8b8f679..d0715fe84328 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/seq.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/seq.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_CLK_SEQ_H__ | 2 | #ifndef __NVKM_CLK_SEQ_H__ |
| 2 | #define __NVKM_CLK_SEQ_H__ | 3 | #define __NVKM_CLK_SEQ_H__ |
| 3 | #include <subdev/bus/hwsq.h> | 4 | #include <subdev/bus/hwsq.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.h b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.h index 4a87c8c2bce8..b18e49847eee 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV04_DEVINIT_H__ | 2 | #ifndef __NV04_DEVINIT_H__ |
| 2 | #define __NV04_DEVINIT_H__ | 3 | #define __NV04_DEVINIT_H__ |
| 3 | #define nv04_devinit(p) container_of((p), struct nv04_devinit, base) | 4 | #define nv04_devinit(p) container_of((p), struct nv04_devinit, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h index 25d2ae3af1c6..315ebaff1165 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV50_DEVINIT_H__ | 2 | #ifndef __NV50_DEVINIT_H__ |
| 2 | #define __NV50_DEVINIT_H__ | 3 | #define __NV50_DEVINIT_H__ |
| 3 | #define nv50_devinit(p) container_of((p), struct nv50_devinit, base) | 4 | #define nv50_devinit(p) container_of((p), struct nv50_devinit, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h index e1f6ae58f1d3..5b3097a586dd 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_DEVINIT_PRIV_H__ | 2 | #ifndef __NVKM_DEVINIT_PRIV_H__ |
| 2 | #define __NVKM_DEVINIT_PRIV_H__ | 3 | #define __NVKM_DEVINIT_PRIV_H__ |
| 3 | #define nvkm_devinit(p) container_of((p), struct nvkm_devinit, subdev) | 4 | #define nvkm_devinit(p) container_of((p), struct nvkm_devinit, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h index 412eb89834e8..1756f7b02858 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_RAM_NVC0_H__ | 2 | #ifndef __NVKM_RAM_NVC0_H__ |
| 2 | #define __NVKM_RAM_NVC0_H__ | 3 | #define __NVKM_RAM_NVC0_H__ |
| 3 | #define gf100_fb(p) container_of((p), struct gf100_fb, base) | 4 | #define gf100_fb(p) container_of((p), struct gf100_fb, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h index faa88c8c66fe..a37758c76268 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_FB_NV50_H__ | 2 | #ifndef __NVKM_FB_NV50_H__ |
| 2 | #define __NVKM_FB_NV50_H__ | 3 | #define __NVKM_FB_NV50_H__ |
| 3 | #define nv50_fb(p) container_of((p), struct nv50_fb, base) | 4 | #define nv50_fb(p) container_of((p), struct nv50_fb, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h index e905d44fa1d5..8e87b887d4f5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_FB_PRIV_H__ | 2 | #ifndef __NVKM_FB_PRIV_H__ |
| 2 | #define __NVKM_FB_PRIV_H__ | 3 | #define __NVKM_FB_PRIV_H__ |
| 3 | #define nvkm_fb(p) container_of((p), struct nvkm_fb, subdev) | 4 | #define nvkm_fb(p) container_of((p), struct nvkm_fb, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h index fac7e73c3ddf..b2122d261f8d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_FB_RAM_PRIV_H__ | 2 | #ifndef __NVKM_FB_RAM_PRIV_H__ |
| 2 | #define __NVKM_FB_RAM_PRIV_H__ | 3 | #define __NVKM_FB_RAM_PRIV_H__ |
| 3 | #include "priv.h" | 4 | #include "priv.h" |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h index 9ef9d6aa3721..a65fa5586af8 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_FBRAM_FUC_H__ | 2 | #ifndef __NVKM_FBRAM_FUC_H__ |
| 2 | #define __NVKM_FBRAM_FUC_H__ | 3 | #define __NVKM_FBRAM_FUC_H__ |
| 3 | #include <subdev/fb.h> | 4 | #include <subdev/fb.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.h index 8a0524566b48..8549fdf2437c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV40_FB_RAM_H__ | 2 | #ifndef __NV40_FB_RAM_H__ |
| 2 | #define __NV40_FB_RAM_H__ | 3 | #define __NV40_FB_RAM_H__ |
| 3 | #define nv40_ram(p) container_of((p), struct nv40_ram, base) | 4 | #define nv40_ram(p) container_of((p), struct nv40_ram, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramseq.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramseq.h index 8df7306d5729..d8f5053e8e2a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramseq.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramseq.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_FBRAM_SEQ_H__ | 2 | #ifndef __NVKM_FBRAM_SEQ_H__ |
| 2 | #define __NVKM_FBRAM_SEQ_H__ | 3 | #define __NVKM_FBRAM_SEQ_H__ |
| 3 | #include <subdev/bus/hwsq.h> | 4 | #include <subdev/bus/hwsq.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/regsnv04.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/regsnv04.h index 1f865f61504e..ad26fcbe9e06 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/regsnv04.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/regsnv04.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_FB_REGS_04_H__ | 2 | #ifndef __NVKM_FB_REGS_04_H__ |
| 2 | #define __NVKM_FB_REGS_04_H__ | 3 | #define __NVKM_FB_REGS_04_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/priv.h index b0390b540ef5..3a5595a9e457 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_FUSE_PRIV_H__ | 2 | #ifndef __NVKM_FUSE_PRIV_H__ |
| 2 | #define __NVKM_FUSE_PRIV_H__ | 3 | #define __NVKM_FUSE_PRIV_H__ |
| 3 | #define nvkm_fuse(p) container_of((p), struct nvkm_fuse, subdev) | 4 | #define nvkm_fuse(p) container_of((p), struct nvkm_fuse, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/priv.h index 371bcdbbe0d6..9759f13447bf 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_GPIO_PRIV_H__ | 2 | #ifndef __NVKM_GPIO_PRIV_H__ |
| 2 | #define __NVKM_GPIO_PRIV_H__ | 3 | #define __NVKM_GPIO_PRIV_H__ |
| 3 | #define nvkm_gpio(p) container_of((p), struct nvkm_gpio, subdev) | 4 | #define nvkm_gpio(p) container_of((p), struct nvkm_gpio, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h index 9587ab456d9e..7d56c4ba693c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_I2C_AUX_H__ | 2 | #ifndef __NVKM_I2C_AUX_H__ |
| 2 | #define __NVKM_I2C_AUX_H__ | 3 | #define __NVKM_I2C_AUX_H__ |
| 3 | #include "pad.h" | 4 | #include "pad.h" |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.h b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.h index e1be14c23e54..bea0dd33961e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_I2C_BUS_H__ | 2 | #ifndef __NVKM_I2C_BUS_H__ |
| 2 | #define __NVKM_I2C_BUS_H__ | 3 | #define __NVKM_I2C_BUS_H__ |
| 3 | #include "pad.h" | 4 | #include "pad.h" |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.h b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.h index 316c4536f29a..33f0c809e583 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_I2C_PAD_H__ | 2 | #ifndef __NVKM_I2C_PAD_H__ |
| 2 | #define __NVKM_I2C_PAD_H__ | 3 | #define __NVKM_I2C_PAD_H__ |
| 3 | #include <subdev/i2c.h> | 4 | #include <subdev/i2c.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/priv.h index bf655a66ef40..f476a69b6cb7 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_I2C_PRIV_H__ | 2 | #ifndef __NVKM_I2C_PRIV_H__ |
| 2 | #define __NVKM_I2C_PRIV_H__ | 3 | #define __NVKM_I2C_PRIV_H__ |
| 3 | #define nvkm_i2c(p) container_of((p), struct nvkm_i2c, subdev) | 4 | #define nvkm_i2c(p) container_of((p), struct nvkm_i2c, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/priv.h index 01caf798cf31..504a6d37ec50 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_IBUS_PRIV_H__ | 2 | #ifndef __NVKM_IBUS_PRIV_H__ |
| 2 | #define __NVKM_IBUS_PRIV_H__ | 3 | #define __NVKM_IBUS_PRIV_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h index e90e0f6ed008..bd599b8252ca 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_ICCSENSE_PRIV_H__ | 2 | #ifndef __NVKM_ICCSENSE_PRIV_H__ |
| 2 | #define __NVKM_ICCSENSE_PRIV_H__ | 3 | #define __NVKM_ICCSENSE_PRIV_H__ |
| 3 | #define nvkm_iccsense(p) container_of((p), struct nvkm_iccsense, subdev) | 4 | #define nvkm_iccsense(p) container_of((p), struct nvkm_iccsense, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h index ace4471864a3..021e7a1f39a1 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_INSTMEM_PRIV_H__ | 2 | #ifndef __NVKM_INSTMEM_PRIV_H__ |
| 2 | #define __NVKM_INSTMEM_PRIV_H__ | 3 | #define __NVKM_INSTMEM_PRIV_H__ |
| 3 | #define nvkm_instmem(p) container_of((p), struct nvkm_instmem, subdev) | 4 | #define nvkm_instmem(p) container_of((p), struct nvkm_instmem, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h index 8b95f96e3ffa..e71cc25cc775 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_LTC_PRIV_H__ | 2 | #ifndef __NVKM_LTC_PRIV_H__ |
| 2 | #define __NVKM_LTC_PRIV_H__ | 3 | #define __NVKM_LTC_PRIV_H__ |
| 3 | #define nvkm_ltc(p) container_of((p), struct nvkm_ltc, subdev) | 4 | #define nvkm_ltc(p) container_of((p), struct nvkm_ltc, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h index 3be4126441e4..8869d79c2b59 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MC_PRIV_H__ | 2 | #ifndef __NVKM_MC_PRIV_H__ |
| 2 | #define __NVKM_MC_PRIV_H__ | 3 | #define __NVKM_MC_PRIV_H__ |
| 3 | #define nvkm_mc(p) container_of((p), struct nvkm_mc, subdev) | 4 | #define nvkm_mc(p) container_of((p), struct nvkm_mc, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h index 363e33b296d5..9c35c43635c2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV04_MMU_PRIV__ | 2 | #ifndef __NV04_MMU_PRIV__ |
| 2 | #define __NV04_MMU_PRIV__ | 3 | #define __NV04_MMU_PRIV__ |
| 3 | #define nv04_mmu(p) container_of((p), struct nv04_mmu, base) | 4 | #define nv04_mmu(p) container_of((p), struct nv04_mmu, base) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h index 27cedc60b507..bf37f313b5bb 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MMU_PRIV_H__ | 2 | #ifndef __NVKM_MMU_PRIV_H__ |
| 2 | #define __NVKM_MMU_PRIV_H__ | 3 | #define __NVKM_MMU_PRIV_H__ |
| 3 | #define nvkm_mmu(p) container_of((p), struct nvkm_mmu, subdev) | 4 | #define nvkm_mmu(p) container_of((p), struct nvkm_mmu, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h index 333e0c01545a..011a67fe4a8b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVMXM_MXMS_H__ | 2 | #ifndef __NVMXM_MXMS_H__ |
| 2 | #define __NVMXM_MXMS_H__ | 3 | #define __NVMXM_MXMS_H__ |
| 3 | #include "priv.h" | 4 | #include "priv.h" |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/priv.h index 7d970157aed1..6767c2279e7c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_MXM_PRIV_H__ | 2 | #ifndef __NVKM_MXM_PRIV_H__ |
| 2 | #define __NVKM_MXM_PRIV_H__ | 3 | #define __NVKM_MXM_PRIV_H__ |
| 3 | #define nvkm_mxm(p) container_of((p), struct nvkm_mxm, subdev) | 4 | #define nvkm_mxm(p) container_of((p), struct nvkm_mxm, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.h b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.h index df2dd08363ad..edb7f00f0de5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include "priv.h" | 2 | #include "priv.h" |
| 2 | #if defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE)) | 3 | #if defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE)) |
| 3 | #ifndef __NVKM_PCI_AGP_H__ | 4 | #ifndef __NVKM_PCI_AGP_H__ |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h index 86921ec962d6..c17f6063c9ea 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_PCI_PRIV_H__ | 2 | #ifndef __NVKM_PCI_PRIV_H__ |
| 2 | #define __NVKM_PCI_PRIV_H__ | 3 | #define __NVKM_PCI_PRIV_H__ |
| 3 | #define nvkm_pci(p) container_of((p), struct nvkm_pci, subdev) | 4 | #define nvkm_pci(p) container_of((p), struct nvkm_pci, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h index 0bcf0b307a61..53d01fb00a8b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gf100_pmu_data[] = { | 2 | static uint32_t gf100_pmu_data[] = { |
| 2 | /* 0x0000: proc_kern */ | 3 | /* 0x0000: proc_kern */ |
| 3 | 0x52544e49, | 4 | 0x52544e49, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h index fe8905666c67..e1e981966c2d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gf119_pmu_data[] = { | 2 | static uint32_t gf119_pmu_data[] = { |
| 2 | /* 0x0000: proc_kern */ | 3 | /* 0x0000: proc_kern */ |
| 3 | 0x52544e49, | 4 | 0x52544e49, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h index 9cf4e6fc724e..c4edbc79e41a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gk208_pmu_data[] = { | 2 | static uint32_t gk208_pmu_data[] = { |
| 2 | /* 0x0000: proc_kern */ | 3 | /* 0x0000: proc_kern */ |
| 3 | 0x52544e49, | 4 | 0x52544e49, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h index 5d692425b190..6a2572e8945a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | static uint32_t gt215_pmu_data[] = { | 2 | static uint32_t gt215_pmu_data[] = { |
| 2 | /* 0x0000: proc_kern */ | 3 | /* 0x0000: proc_kern */ |
| 3 | 0x52544e49, | 4 | 0x52544e49, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/os.h b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/os.h index c8b06cb77e72..30d9480b9be5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/os.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/os.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_PWR_OS_H__ | 2 | #ifndef __NVKM_PWR_OS_H__ |
| 2 | #define __NVKM_PWR_OS_H__ | 3 | #define __NVKM_PWR_OS_H__ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c index e6f74168238c..11b28b086a06 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #ifndef __NVKM_PMU_MEMX_H__ | 2 | #ifndef __NVKM_PMU_MEMX_H__ |
| 2 | #define __NVKM_PMU_MEMX_H__ | 3 | #define __NVKM_PMU_MEMX_H__ |
| 3 | #include "priv.h" | 4 | #include "priv.h" |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h index a4c48a10cd47..e9c6f9725afe 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_PMU_PRIV_H__ | 2 | #ifndef __NVKM_PMU_PRIV_H__ |
| 2 | #define __NVKM_PMU_PRIV_H__ | 3 | #define __NVKM_PMU_PRIV_H__ |
| 3 | #define nvkm_pmu(p) container_of((p), struct nvkm_pmu, subdev) | 4 | #define nvkm_pmu(p) container_of((p), struct nvkm_pmu, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/priv.h index f820ca2aeda4..3b8878486faa 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_TIMER_PRIV_H__ | 2 | #ifndef __NVKM_TIMER_PRIV_H__ |
| 2 | #define __NVKM_TIMER_PRIV_H__ | 3 | #define __NVKM_TIMER_PRIV_H__ |
| 3 | #define nvkm_timer(p) container_of((p), struct nvkm_timer, subdev) | 4 | #define nvkm_timer(p) container_of((p), struct nvkm_timer, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/regsnv04.h b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/regsnv04.h index 10bef85b485e..23d07f5f44d9 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/regsnv04.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/regsnv04.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #define NV04_PTIMER_INTR_0 0x009100 | 2 | #define NV04_PTIMER_INTR_0 0x009100 |
| 2 | #define NV04_PTIMER_INTR_EN_0 0x009140 | 3 | #define NV04_PTIMER_INTR_EN_0 0x009140 |
| 3 | #define NV04_PTIMER_NUMERATOR 0x009200 | 4 | #define NV04_PTIMER_NUMERATOR 0x009200 |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/top/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/top/priv.h index adb3ed03d937..4f49b0acaa0e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/top/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/top/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_TOP_PRIV_H__ | 2 | #ifndef __NVKM_TOP_PRIV_H__ |
| 2 | #define __NVKM_TOP_PRIV_H__ | 3 | #define __NVKM_TOP_PRIV_H__ |
| 3 | #define nvkm_top(p) container_of((p), struct nvkm_top, subdev) | 4 | #define nvkm_top(p) container_of((p), struct nvkm_top, subdev) |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h index 354bafe4b4e2..1a8ad560321b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVKM_VOLT_PRIV_H__ | 2 | #ifndef __NVKM_VOLT_PRIV_H__ |
| 2 | #define __NVKM_VOLT_PRIV_H__ | 3 | #define __NVKM_VOLT_PRIV_H__ |
| 3 | #define nvkm_volt(p) container_of((p), struct nvkm_volt, subdev) | 4 | #define nvkm_volt(p) container_of((p), struct nvkm_volt, subdev) |
diff --git a/drivers/gpu/drm/omapdrm/Makefile b/drivers/gpu/drm/omapdrm/Makefile index b391be7ecb6c..f115253115c5 100644 --- a/drivers/gpu/drm/omapdrm/Makefile +++ b/drivers/gpu/drm/omapdrm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the drm device driver. This driver provides support for the | 3 | # Makefile for the drm device driver. This driver provides support for the |
| 3 | # Direct Rendering Infrastructure (DRI) | 4 | # Direct Rendering Infrastructure (DRI) |
diff --git a/drivers/gpu/drm/omapdrm/displays/Makefile b/drivers/gpu/drm/omapdrm/displays/Makefile index 46baafb1a83e..d99659e1381b 100644 --- a/drivers/gpu/drm/omapdrm/displays/Makefile +++ b/drivers/gpu/drm/omapdrm/displays/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_DRM_OMAP_ENCODER_OPA362) += encoder-opa362.o | 2 | obj-$(CONFIG_DRM_OMAP_ENCODER_OPA362) += encoder-opa362.o |
| 2 | obj-$(CONFIG_DRM_OMAP_ENCODER_TFP410) += encoder-tfp410.o | 3 | obj-$(CONFIG_DRM_OMAP_ENCODER_TFP410) += encoder-tfp410.o |
| 3 | obj-$(CONFIG_DRM_OMAP_ENCODER_TPD12S015) += encoder-tpd12s015.o | 4 | obj-$(CONFIG_DRM_OMAP_ENCODER_TPD12S015) += encoder-tpd12s015.o |
diff --git a/drivers/gpu/drm/omapdrm/dss/Makefile b/drivers/gpu/drm/omapdrm/dss/Makefile index 142ce5a02542..62d5b4f45420 100644 --- a/drivers/gpu/drm/omapdrm/dss/Makefile +++ b/drivers/gpu/drm/omapdrm/dss/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_OMAP2_DSS_INIT) += omapdss-boot-init.o | 2 | obj-$(CONFIG_OMAP2_DSS_INIT) += omapdss-boot-init.o |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_OMAP_DSS_BASE) += omapdss-base.o | 4 | obj-$(CONFIG_OMAP_DSS_BASE) += omapdss-base.o |
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_common.c b/drivers/gpu/drm/omapdrm/dss/hdmi_common.c index 4dfb67fe5f6d..3ecde23ac604 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi_common.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi_common.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | #define DSS_SUBSYS_NAME "HDMI" | 3 | #define DSS_SUBSYS_NAME "HDMI" |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile index 9f6610d08b00..d73d3e661cec 100644 --- a/drivers/gpu/drm/panel/Makefile +++ b/drivers/gpu/drm/panel/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_DRM_PANEL_LVDS) += panel-lvds.o | 2 | obj-$(CONFIG_DRM_PANEL_LVDS) += panel-lvds.o |
| 2 | obj-$(CONFIG_DRM_PANEL_SIMPLE) += panel-simple.o | 3 | obj-$(CONFIG_DRM_PANEL_SIMPLE) += panel-simple.o |
| 3 | obj-$(CONFIG_DRM_PANEL_INNOLUX_P079ZCA) += panel-innolux-p079zca.o | 4 | obj-$(CONFIG_DRM_PANEL_INNOLUX_P079ZCA) += panel-innolux-p079zca.o |
diff --git a/drivers/gpu/drm/pl111/Makefile b/drivers/gpu/drm/pl111/Makefile index 59483d610ef5..f2874bbdaa14 100644 --- a/drivers/gpu/drm/pl111/Makefile +++ b/drivers/gpu/drm/pl111/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | pl111_drm-y += pl111_connector.o \ | 2 | pl111_drm-y += pl111_connector.o \ |
| 2 | pl111_display.o \ | 3 | pl111_display.o \ |
| 3 | pl111_drv.o | 4 | pl111_drv.o |
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile index 4acbb944bcd2..0ad8244b5ccf 100644 --- a/drivers/gpu/drm/radeon/Makefile +++ b/drivers/gpu/drm/radeon/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the drm device driver. This driver provides support for the | 3 | # Makefile for the drm device driver. This driver provides support for the |
| 3 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. | 4 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. |
diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c index b928c17bdeed..c21d8fa591ef 100644 --- a/drivers/gpu/drm/radeon/mkregtable.c +++ b/drivers/gpu/drm/radeon/mkregtable.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* utility to create the register check tables | 2 | /* utility to create the register check tables |
| 2 | * this includes inlined list.h safe for userspace. | 3 | * this includes inlined list.h safe for userspace. |
| 3 | * | 4 | * |
diff --git a/drivers/gpu/drm/radeon/r100_track.h b/drivers/gpu/drm/radeon/r100_track.h index eb40888bdfcc..ad16a925f8d5 100644 --- a/drivers/gpu/drm/radeon/r100_track.h +++ b/drivers/gpu/drm/radeon/r100_track.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #define R100_TRACK_MAX_TEXTURE 3 | 3 | #define R100_TRACK_MAX_TEXTURE 3 |
| 3 | #define R200_TRACK_MAX_TEXTURE 6 | 4 | #define R200_TRACK_MAX_TEXTURE 6 |
diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c index ebdf1b859cb6..2917ea1b667e 100644 --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | #include <drm/drmP.h> | 3 | #include <drm/drmP.h> |
| 3 | #include <drm/drm_dp_mst_helper.h> | 4 | #include <drm/drm_dp_mst_helper.h> |
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_tv.c b/drivers/gpu/drm/radeon/radeon_legacy_tv.c index 49750d07ab7d..611cf934b211 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_tv.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_tv.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <drm/drmP.h> | 2 | #include <drm/drmP.h> |
| 2 | #include <drm/drm_crtc_helper.h> | 3 | #include <drm/drm_crtc_helper.h> |
| 3 | #include "radeon.h" | 4 | #include "radeon.h" |
diff --git a/drivers/gpu/drm/radeon/radeon_trace.h b/drivers/gpu/drm/radeon/radeon_trace.h index fdce4062901f..db8f079e441e 100644 --- a/drivers/gpu/drm/radeon/radeon_trace.h +++ b/drivers/gpu/drm/radeon/radeon_trace.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #if !defined(_RADEON_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) | 2 | #if !defined(_RADEON_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) |
| 2 | #define _RADEON_TRACE_H_ | 3 | #define _RADEON_TRACE_H_ |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_trace_points.c b/drivers/gpu/drm/radeon/radeon_trace_points.c index e51d3575976b..66b3d5084662 100644 --- a/drivers/gpu/drm/radeon/radeon_trace_points.c +++ b/drivers/gpu/drm/radeon/radeon_trace_points.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* Copyright Red Hat Inc 2010. | 2 | /* Copyright Red Hat Inc 2010. |
| 2 | * Author : Dave Airlie <airlied@redhat.com> | 3 | * Author : Dave Airlie <airlied@redhat.com> |
| 3 | */ | 4 | */ |
diff --git a/drivers/gpu/drm/rcar-du/Makefile b/drivers/gpu/drm/rcar-du/Makefile index 2131e722de3b..0cf5c11030e8 100644 --- a/drivers/gpu/drm/rcar-du/Makefile +++ b/drivers/gpu/drm/rcar-du/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rcar-du-drm-y := rcar_du_crtc.o \ | 2 | rcar-du-drm-y := rcar_du_crtc.o \ |
| 2 | rcar_du_drv.o \ | 3 | rcar_du_drv.o \ |
| 3 | rcar_du_encoder.o \ | 4 | rcar_du_encoder.o \ |
diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile index fa8dc9d9aac2..305409818ffb 100644 --- a/drivers/gpu/drm/rockchip/Makefile +++ b/drivers/gpu/drm/rockchip/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the drm device driver. This driver provides support for the | 3 | # Makefile for the drm device driver. This driver provides support for the |
| 3 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. | 4 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. |
diff --git a/drivers/gpu/drm/selftests/drm_mm_selftests.h b/drivers/gpu/drm/selftests/drm_mm_selftests.h index 37bbdac52896..54acc117550c 100644 --- a/drivers/gpu/drm/selftests/drm_mm_selftests.h +++ b/drivers/gpu/drm/selftests/drm_mm_selftests.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* List each unit test as selftest(name, function) | 2 | /* List each unit test as selftest(name, function) |
| 2 | * | 3 | * |
| 3 | * The name is used as both an enum and expanded as igt__name to create | 4 | * The name is used as both an enum and expanded as igt__name to create |
diff --git a/drivers/gpu/drm/shmobile/Makefile b/drivers/gpu/drm/shmobile/Makefile index 4c3eeb355630..861edafed856 100644 --- a/drivers/gpu/drm/shmobile/Makefile +++ b/drivers/gpu/drm/shmobile/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | shmob-drm-y := shmob_drm_backlight.o \ | 2 | shmob-drm-y := shmob_drm_backlight.o \ |
| 2 | shmob_drm_crtc.o \ | 3 | shmob_drm_crtc.o \ |
| 3 | shmob_drm_drv.o \ | 4 | shmob_drm_drv.o \ |
diff --git a/drivers/gpu/drm/sti/Makefile b/drivers/gpu/drm/sti/Makefile index c35db12435c3..f203ac5514ae 100644 --- a/drivers/gpu/drm/sti/Makefile +++ b/drivers/gpu/drm/sti/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | sti-drm-y := \ | 2 | sti-drm-y := \ |
| 2 | sti_mixer.o \ | 3 | sti_mixer.o \ |
| 3 | sti_gdp.o \ | 4 | sti_gdp.o \ |
diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile index 43c753cafc88..55b32368f8fb 100644 --- a/drivers/gpu/drm/sun4i/Makefile +++ b/drivers/gpu/drm/sun4i/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | sun4i-drm-y += sun4i_drv.o | 2 | sun4i-drm-y += sun4i_drv.o |
| 2 | sun4i-drm-y += sun4i_framebuffer.o | 3 | sun4i-drm-y += sun4i_framebuffer.o |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/tegra/Makefile b/drivers/gpu/drm/tegra/Makefile index 8927784396e8..46d65d39214d 100644 --- a/drivers/gpu/drm/tegra/Makefile +++ b/drivers/gpu/drm/tegra/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ccflags-$(CONFIG_DRM_TEGRA_DEBUG) += -DDEBUG | 2 | ccflags-$(CONFIG_DRM_TEGRA_DEBUG) += -DDEBUG |
| 2 | 3 | ||
| 3 | tegra-drm-y := \ | 4 | tegra-drm-y := \ |
diff --git a/drivers/gpu/drm/tilcdc/Makefile b/drivers/gpu/drm/tilcdc/Makefile index 55ebd516728f..b9e1108e5b4e 100644 --- a/drivers/gpu/drm/tilcdc/Makefile +++ b/drivers/gpu/drm/tilcdc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ifeq (, $(findstring -W,$(EXTRA_CFLAGS))) | 2 | ifeq (, $(findstring -W,$(EXTRA_CFLAGS))) |
| 2 | ccflags-y += -Werror | 3 | ccflags-y += -Werror |
| 3 | endif | 4 | endif |
diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile index 4d0c938ff4b2..a60e560804e0 100644 --- a/drivers/gpu/drm/ttm/Makefile +++ b/drivers/gpu/drm/ttm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the drm device driver. This driver provides support for the | 3 | # Makefile for the drm device driver. This driver provides support for the |
| 3 | 4 | ||
diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile index 25bd5d30415d..837c82757339 100644 --- a/drivers/gpu/drm/vc4/Makefile +++ b/drivers/gpu/drm/vc4/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Please keep these build lists sorted! | 2 | # Please keep these build lists sorted! |
| 2 | 3 | ||
| 3 | # core driver code | 4 | # core driver code |
diff --git a/drivers/gpu/drm/virtio/Makefile b/drivers/gpu/drm/virtio/Makefile index 7684f613bdc3..f29deec83d1f 100644 --- a/drivers/gpu/drm/virtio/Makefile +++ b/drivers/gpu/drm/virtio/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the drm device driver. This driver provides support for the | 3 | # Makefile for the drm device driver. This driver provides support for the |
| 3 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. | 4 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. |
diff --git a/drivers/gpu/drm/vmwgfx/Makefile b/drivers/gpu/drm/vmwgfx/Makefile index a365330bbb82..ad80211e1098 100644 --- a/drivers/gpu/drm/vmwgfx/Makefile +++ b/drivers/gpu/drm/vmwgfx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \ | 2 | vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \ |
| 2 | vmwgfx_fb.o vmwgfx_ioctl.o vmwgfx_resource.o vmwgfx_buffer.o \ | 3 | vmwgfx_fb.o vmwgfx_ioctl.o vmwgfx_resource.o vmwgfx_buffer.o \ |
| 3 | vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \ | 4 | vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \ |
diff --git a/drivers/gpu/drm/vmwgfx/device_include/vm_basic_types.h b/drivers/gpu/drm/vmwgfx/device_include/vm_basic_types.h index 120eab830eaf..3a195e8106b3 100644 --- a/drivers/gpu/drm/vmwgfx/device_include/vm_basic_types.h +++ b/drivers/gpu/drm/vmwgfx/device_include/vm_basic_types.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _VM_BASIC_TYPES_H_ | 2 | #ifndef _VM_BASIC_TYPES_H_ |
| 2 | #define _VM_BASIC_TYPES_H_ | 3 | #define _VM_BASIC_TYPES_H_ |
| 3 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
diff --git a/drivers/gpu/drm/zte/Makefile b/drivers/gpu/drm/zte/Makefile index 9df7766a7f9d..b6d966d849dd 100644 --- a/drivers/gpu/drm/zte/Makefile +++ b/drivers/gpu/drm/zte/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | zxdrm-y := \ | 2 | zxdrm-y := \ |
| 2 | zx_drm_drv.o \ | 3 | zx_drm_drv.o \ |
| 3 | zx_hdmi.o \ | 4 | zx_hdmi.o \ |
diff --git a/drivers/gpu/host1x/Makefile b/drivers/gpu/host1x/Makefile index a1d9974cfcb5..c0b80244158d 100644 --- a/drivers/gpu/host1x/Makefile +++ b/drivers/gpu/host1x/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | host1x-y = \ | 2 | host1x-y = \ |
| 2 | bus.o \ | 3 | bus.o \ |
| 3 | syncpt.o \ | 4 | syncpt.o \ |
diff --git a/drivers/gpu/ipu-v3/Makefile b/drivers/gpu/ipu-v3/Makefile index 8cdf9e4ae772..7cc8b47e488b 100644 --- a/drivers/gpu/ipu-v3/Makefile +++ b/drivers/gpu/ipu-v3/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_IMX_IPUV3_CORE) += imx-ipu-v3.o | 2 | obj-$(CONFIG_IMX_IPUV3_CORE) += imx-ipu-v3.o |
| 2 | 3 | ||
| 3 | imx-ipu-v3-objs := ipu-common.o ipu-cpmem.o ipu-csi.o ipu-dc.o ipu-di.o \ | 4 | imx-ipu-v3-objs := ipu-common.o ipu-cpmem.o ipu-csi.o ipu-dc.o ipu-di.o \ |
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 8659d7e633a5..235bd2a7b333 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the HID driver | 3 | # Makefile for the HID driver |
| 3 | # | 4 | # |
diff --git a/drivers/hid/hid-lg.h b/drivers/hid/hid-lg.h index 10dd8f024135..3d8902ba1c6c 100644 --- a/drivers/hid/hid-lg.h +++ b/drivers/hid/hid-lg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __HID_LG_H | 2 | #ifndef __HID_LG_H |
| 2 | #define __HID_LG_H | 3 | #define __HID_LG_H |
| 3 | 4 | ||
diff --git a/drivers/hid/hid-lg4ff.h b/drivers/hid/hid-lg4ff.h index de1f350e0bd3..e5c55d515ac2 100644 --- a/drivers/hid/hid-lg4ff.h +++ b/drivers/hid/hid-lg4ff.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __HID_LG4FF_H | 2 | #ifndef __HID_LG4FF_H |
| 2 | #define __HID_LG4FF_H | 3 | #define __HID_LG4FF_H |
| 3 | 4 | ||
diff --git a/drivers/hid/intel-ish-hid/Makefile b/drivers/hid/intel-ish-hid/Makefile index 8c08b0b358b1..825b70af672f 100644 --- a/drivers/hid/intel-ish-hid/Makefile +++ b/drivers/hid/intel-ish-hid/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile - Intel ISH HID drivers | 3 | # Makefile - Intel ISH HID drivers |
| 3 | # Copyright (c) 2014-2016, Intel Corporation. | 4 | # Copyright (c) 2014-2016, Intel Corporation. |
diff --git a/drivers/hid/usbhid/Makefile b/drivers/hid/usbhid/Makefile index 890f2914a8ff..0ff227d0c033 100644 --- a/drivers/hid/usbhid/Makefile +++ b/drivers/hid/usbhid/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the USB input drivers | 3 | # Makefile for the USB input drivers |
| 3 | # | 4 | # |
diff --git a/drivers/hsi/Makefile b/drivers/hsi/Makefile index 96944783d584..53c3bcdbf1b0 100644 --- a/drivers/hsi/Makefile +++ b/drivers/hsi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for HSI | 3 | # Makefile for HSI |
| 3 | # | 4 | # |
diff --git a/drivers/hv/Makefile b/drivers/hv/Makefile index 39c9b2c08d33..e7b1d796ba2e 100644 --- a/drivers/hv/Makefile +++ b/drivers/hv/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_HYPERV) += hv_vmbus.o | 2 | obj-$(CONFIG_HYPERV) += hv_vmbus.o |
| 2 | obj-$(CONFIG_HYPERV_UTILS) += hv_utils.o | 3 | obj-$(CONFIG_HYPERV_UTILS) += hv_utils.o |
| 3 | obj-$(CONFIG_HYPERV_BALLOON) += hv_balloon.o | 4 | obj-$(CONFIG_HYPERV_BALLOON) += hv_balloon.o |
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index c84d9784be98..23e195a5a2f3 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for sensor chip drivers. | 3 | # Makefile for sensor chip drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/hwmon/adt7x10.h b/drivers/hwmon/adt7x10.h index d491c698529e..21ad15ce3163 100644 --- a/drivers/hwmon/adt7x10.h +++ b/drivers/hwmon/adt7x10.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __HWMON_ADT7X10_H__ | 2 | #ifndef __HWMON_ADT7X10_H__ |
| 2 | #define __HWMON_ADT7X10_H__ | 3 | #define __HWMON_ADT7X10_H__ |
| 3 | 4 | ||
diff --git a/drivers/hwmon/da9052-hwmon.c b/drivers/hwmon/da9052-hwmon.c index 97a62f5b9ea4..a973eb6a2890 100644 --- a/drivers/hwmon/da9052-hwmon.c +++ b/drivers/hwmon/da9052-hwmon.c | |||
| @@ -477,6 +477,11 @@ static int da9052_hwmon_probe(struct platform_device *pdev) | |||
| 477 | /* disable touchscreen features */ | 477 | /* disable touchscreen features */ |
| 478 | da9052_reg_write(hwmon->da9052, DA9052_TSI_CONT_A_REG, 0x00); | 478 | da9052_reg_write(hwmon->da9052, DA9052_TSI_CONT_A_REG, 0x00); |
| 479 | 479 | ||
| 480 | /* Sample every 1ms */ | ||
| 481 | da9052_reg_update(hwmon->da9052, DA9052_ADC_CONT_REG, | ||
| 482 | DA9052_ADCCONT_ADCMODE, | ||
| 483 | DA9052_ADCCONT_ADCMODE); | ||
| 484 | |||
| 480 | err = da9052_request_irq(hwmon->da9052, DA9052_IRQ_TSIREADY, | 485 | err = da9052_request_irq(hwmon->da9052, DA9052_IRQ_TSIREADY, |
| 481 | "tsiready-irq", da9052_tsi_datardy_irq, | 486 | "tsiready-irq", da9052_tsi_datardy_irq, |
| 482 | hwmon); | 487 | hwmon); |
diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile index 459a6be3390e..e9364420a512 100644 --- a/drivers/hwmon/pmbus/Makefile +++ b/drivers/hwmon/pmbus/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for PMBus chip drivers. | 3 | # Makefile for PMBus chip drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c index 5eafbaada795..dfc40c740d07 100644 --- a/drivers/hwmon/tmp102.c +++ b/drivers/hwmon/tmp102.c | |||
| @@ -268,14 +268,11 @@ static int tmp102_probe(struct i2c_client *client, | |||
| 268 | return err; | 268 | return err; |
| 269 | } | 269 | } |
| 270 | 270 | ||
| 271 | tmp102->ready_time = jiffies; | 271 | /* |
| 272 | if (tmp102->config_orig & TMP102_CONF_SD) { | 272 | * Mark that we are not ready with data until the first |
| 273 | /* | 273 | * conversion is complete |
| 274 | * Mark that we are not ready with data until the first | 274 | */ |
| 275 | * conversion is complete | 275 | tmp102->ready_time = jiffies + msecs_to_jiffies(CONVERSION_TIME_MS); |
| 276 | */ | ||
| 277 | tmp102->ready_time += msecs_to_jiffies(CONVERSION_TIME_MS); | ||
| 278 | } | ||
| 279 | 276 | ||
| 280 | hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name, | 277 | hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name, |
| 281 | tmp102, | 278 | tmp102, |
diff --git a/drivers/hwspinlock/Makefile b/drivers/hwspinlock/Makefile index 14928aa7cc5a..b87c01a506a4 100644 --- a/drivers/hwspinlock/Makefile +++ b/drivers/hwspinlock/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Generic Hardware Spinlock framework | 3 | # Generic Hardware Spinlock framework |
| 3 | # | 4 | # |
diff --git a/drivers/hwtracing/coresight/Makefile b/drivers/hwtracing/coresight/Makefile index 5bae90ce794d..61db9dd0d571 100644 --- a/drivers/hwtracing/coresight/Makefile +++ b/drivers/hwtracing/coresight/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for CoreSight drivers. | 3 | # Makefile for CoreSight drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/hwtracing/intel_th/Makefile b/drivers/hwtracing/intel_th/Makefile index 81d42fe918f7..880c9b5e8566 100644 --- a/drivers/hwtracing/intel_th/Makefile +++ b/drivers/hwtracing/intel_th/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_INTEL_TH) += intel_th.o | 2 | obj-$(CONFIG_INTEL_TH) += intel_th.o |
| 2 | intel_th-y := core.o | 3 | intel_th-y := core.o |
| 3 | intel_th-$(CONFIG_INTEL_TH_DEBUG) += debug.o | 4 | intel_th-$(CONFIG_INTEL_TH_DEBUG) += debug.o |
diff --git a/drivers/hwtracing/stm/Makefile b/drivers/hwtracing/stm/Makefile index 3abd84ce13d4..effc19e5190f 100644 --- a/drivers/hwtracing/stm/Makefile +++ b/drivers/hwtracing/stm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_STM) += stm_core.o | 2 | obj-$(CONFIG_STM) += stm_core.o |
| 2 | 3 | ||
| 3 | stm_core-y := core.o policy.o | 4 | stm_core-y := core.o policy.o |
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index 7bb65a4369e1..72c94c60fdd1 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the i2c core. | 3 | # Makefile for the i2c core. |
| 3 | # | 4 | # |
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index 47f3ac9a695a..2ce8576540a2 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the i2c bus drivers. | 3 | # Makefile for the i2c bus drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/i2c/busses/i2c-octeon-core.h b/drivers/i2c/busses/i2c-octeon-core.h index aa3c8f4771c1..a7ef19855bb8 100644 --- a/drivers/i2c/busses/i2c-octeon-core.h +++ b/drivers/i2c/busses/i2c-octeon-core.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/atomic.h> | 2 | #include <linux/atomic.h> |
| 2 | #include <linux/clk.h> | 3 | #include <linux/clk.h> |
| 3 | #include <linux/delay.h> | 4 | #include <linux/delay.h> |
diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile index 4a67d3199877..6d9d865e8518 100644 --- a/drivers/i2c/muxes/Makefile +++ b/drivers/i2c/muxes/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for multiplexer I2C chip drivers. | 3 | # Makefile for multiplexer I2C chip drivers. |
| 3 | 4 | ||
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile index 2a8c417d4081..9f617a77970f 100644 --- a/drivers/ide/Makefile +++ b/drivers/ide/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # link order is important here | 3 | # link order is important here |
| 3 | # | 4 | # |
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index 968038482d2f..7d4e5c08f133 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Provides ACPI support for IDE drives. | 3 | * Provides ACPI support for IDE drives. |
| 3 | * | 4 | * |
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 81e18f9628d0..a7355ab3bb22 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
| @@ -1328,6 +1328,7 @@ static int ide_cdrom_prep_fs(struct request_queue *q, struct request *rq) | |||
| 1328 | unsigned long blocks = blk_rq_sectors(rq) / (hard_sect >> 9); | 1328 | unsigned long blocks = blk_rq_sectors(rq) / (hard_sect >> 9); |
| 1329 | struct scsi_request *req = scsi_req(rq); | 1329 | struct scsi_request *req = scsi_req(rq); |
| 1330 | 1330 | ||
| 1331 | scsi_req_init(req); | ||
| 1331 | memset(req->cmd, 0, BLK_MAX_CDB); | 1332 | memset(req->cmd, 0, BLK_MAX_CDB); |
| 1332 | 1333 | ||
| 1333 | if (rq_data_dir(rq) == READ) | 1334 | if (rq_data_dir(rq) == READ) |
diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h index eea60c986c4f..264e822eba58 100644 --- a/drivers/ide/ide-cd.h +++ b/drivers/ide/ide-cd.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 1996-98 Erik Andersen | 3 | * Copyright (C) 1996-98 Erik Andersen |
| 3 | * Copyright (C) 1998-2000 Jens Axboe | 4 | * Copyright (C) 1998-2000 Jens Axboe |
diff --git a/drivers/ide/ide-cd_ioctl.c b/drivers/ide/ide-cd_ioctl.c index 9d26c9737e21..2acca12b9c94 100644 --- a/drivers/ide/ide-cd_ioctl.c +++ b/drivers/ide/ide-cd_ioctl.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * cdrom.c IOCTLs handling for ide-cd driver. | 3 | * cdrom.c IOCTLs handling for ide-cd driver. |
| 3 | * | 4 | * |
diff --git a/drivers/ide/ide-cd_verbose.c b/drivers/ide/ide-cd_verbose.c index 58a6feb74c02..5ecd5b2f03a3 100644 --- a/drivers/ide/ide-cd_verbose.c +++ b/drivers/ide/ide-cd_verbose.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Verbose error logging for ATAPI CD/DVD devices. | 3 | * Verbose error logging for ATAPI CD/DVD devices. |
| 3 | * | 4 | * |
diff --git a/drivers/ide/ide-devsets.c b/drivers/ide/ide-devsets.c index ef7c8c43a380..4e20747af32e 100644 --- a/drivers/ide/ide-devsets.c +++ b/drivers/ide/ide-devsets.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 3 | #include <linux/gfp.h> | 4 | #include <linux/gfp.h> |
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 241983da5fc4..188d1b03715d 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 1994-1998 Linus Torvalds & authors (see below) | 3 | * Copyright (C) 1994-1998 Linus Torvalds & authors (see below) |
| 3 | * Copyright (C) 1998-2002 Linux ATA Development | 4 | * Copyright (C) 1998-2002 Linux ATA Development |
diff --git a/drivers/ide/ide-disk.h b/drivers/ide/ide-disk.h index d511dab7c4aa..0e8cc18bfda6 100644 --- a/drivers/ide/ide-disk.h +++ b/drivers/ide/ide-disk.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __IDE_DISK_H | 2 | #ifndef __IDE_DISK_H |
| 2 | #define __IDE_DISK_H | 3 | #define __IDE_DISK_H |
| 3 | 4 | ||
diff --git a/drivers/ide/ide-disk_ioctl.c b/drivers/ide/ide-disk_ioctl.c index da36f729ff32..2c45616cff4f 100644 --- a/drivers/ide/ide-disk_ioctl.c +++ b/drivers/ide/ide-disk_ioctl.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/ide.h> | 3 | #include <linux/ide.h> |
| 3 | #include <linux/hdreg.h> | 4 | #include <linux/hdreg.h> |
diff --git a/drivers/ide/ide-disk_proc.c b/drivers/ide/ide-disk_proc.c index 0d1fae6cba6d..82a36ced4e96 100644 --- a/drivers/ide/ide-disk_proc.c +++ b/drivers/ide/ide-disk_proc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/ide.h> | 3 | #include <linux/ide.h> |
| 3 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 3ddd88219906..5bd2aafc3753 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * IDE ATAPI floppy driver. | 3 | * IDE ATAPI floppy driver. |
| 3 | * | 4 | * |
diff --git a/drivers/ide/ide-floppy.h b/drivers/ide/ide-floppy.h index 6dd2beb48434..13c9b4b6d75e 100644 --- a/drivers/ide/ide-floppy.h +++ b/drivers/ide/ide-floppy.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __IDE_FLOPPY_H | 2 | #ifndef __IDE_FLOPPY_H |
| 2 | #define __IDE_FLOPPY_H | 3 | #define __IDE_FLOPPY_H |
| 3 | 4 | ||
diff --git a/drivers/ide/ide-floppy_ioctl.c b/drivers/ide/ide-floppy_ioctl.c index a22ca8467010..40a2ebe34e1d 100644 --- a/drivers/ide/ide-floppy_ioctl.c +++ b/drivers/ide/ide-floppy_ioctl.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * ide-floppy IOCTLs handling. | 3 | * ide-floppy IOCTLs handling. |
| 3 | */ | 4 | */ |
diff --git a/drivers/ide/ide-floppy_proc.c b/drivers/ide/ide-floppy_proc.c index e7a25ea757df..471457ebea67 100644 --- a/drivers/ide/ide-floppy_proc.c +++ b/drivers/ide/ide-floppy_proc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/export.h> | 3 | #include <linux/export.h> |
| 3 | #include <linux/ide.h> | 4 | #include <linux/ide.h> |
diff --git a/drivers/ide/ide-gd.h b/drivers/ide/ide-gd.h index 55970772bd04..af3fe1880e9e 100644 --- a/drivers/ide/ide-gd.h +++ b/drivers/ide/ide-gd.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __IDE_GD_H | 2 | #ifndef __IDE_GD_H |
| 2 | #define __IDE_GD_H | 3 | #define __IDE_GD_H |
| 3 | 4 | ||
diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c index 1f264d5d3f3f..6465bcc7cea6 100644 --- a/drivers/ide/ide-park.c +++ b/drivers/ide/ide-park.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/gfp.h> | 3 | #include <linux/gfp.h> |
| 3 | #include <linux/ide.h> | 4 | #include <linux/ide.h> |
diff --git a/drivers/ide/ide-pio-blacklist.c b/drivers/ide/ide-pio-blacklist.c index 40e683a84ff9..1fd24798e5c9 100644 --- a/drivers/ide/ide-pio-blacklist.c +++ b/drivers/ide/ide-pio-blacklist.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * PIO blacklist. Some drives incorrectly report their maximal PIO mode, | 3 | * PIO blacklist. Some drives incorrectly report their maximal PIO mode, |
| 3 | * at least in respect to CMD640. Here we keep info on some known drives. | 4 | * at least in respect to CMD640. Here we keep info on some known drives. |
diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c index 544f02d673ca..dccdca9eda38 100644 --- a/drivers/ide/ide-pm.c +++ b/drivers/ide/ide-pm.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/gfp.h> | 3 | #include <linux/gfp.h> |
| 3 | #include <linux/ide.h> | 4 | #include <linux/ide.h> |
diff --git a/drivers/ide/ide-sysfs.c b/drivers/ide/ide-sysfs.c index 84a6a9e08d64..b9dfeb2e8bd6 100644 --- a/drivers/ide/ide-sysfs.c +++ b/drivers/ide/ide-sysfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/ide.h> | 3 | #include <linux/ide.h> |
| 3 | 4 | ||
diff --git a/drivers/ide/qd65xx.h b/drivers/ide/qd65xx.h index 1fba2a5f281c..01a43ab45e0e 100644 --- a/drivers/ide/qd65xx.h +++ b/drivers/ide/qd65xx.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (c) 2000 Linus Torvalds & authors | 3 | * Copyright (c) 2000 Linus Torvalds & authors |
| 3 | */ | 4 | */ |
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index 5dc7ea4b6bc4..f0b06b14e782 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c | |||
| @@ -913,15 +913,16 @@ static __cpuidle int intel_idle(struct cpuidle_device *dev, | |||
| 913 | struct cpuidle_state *state = &drv->states[index]; | 913 | struct cpuidle_state *state = &drv->states[index]; |
| 914 | unsigned long eax = flg2MWAIT(state->flags); | 914 | unsigned long eax = flg2MWAIT(state->flags); |
| 915 | unsigned int cstate; | 915 | unsigned int cstate; |
| 916 | int cpu = smp_processor_id(); | ||
| 916 | 917 | ||
| 917 | cstate = (((eax) >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1; | 918 | cstate = (((eax) >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1; |
| 918 | 919 | ||
| 919 | /* | 920 | /* |
| 920 | * NB: if CPUIDLE_FLAG_TLB_FLUSHED is set, this idle transition | 921 | * leave_mm() to avoid costly and often unnecessary wakeups |
| 921 | * will probably flush the TLB. It's not guaranteed to flush | 922 | * for flushing the user TLB's associated with the active mm. |
| 922 | * the TLB, though, so it's not clear that we can do anything | ||
| 923 | * useful with this knowledge. | ||
| 924 | */ | 923 | */ |
| 924 | if (state->flags & CPUIDLE_FLAG_TLB_FLUSHED) | ||
| 925 | leave_mm(cpu); | ||
| 925 | 926 | ||
| 926 | if (!(lapic_timer_reliable_states & (1 << (cstate)))) | 927 | if (!(lapic_timer_reliable_states & (1 << (cstate)))) |
| 927 | tick_broadcast_enter(); | 928 | tick_broadcast_enter(); |
diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile index 93c769cd99bf..b16b2e9ddc40 100644 --- a/drivers/iio/Makefile +++ b/drivers/iio/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the industrial I/O core. | 3 | # Makefile for the industrial I/O core. |
| 3 | # | 4 | # |
diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile index 31fba1974e95..703e7c21f547 100644 --- a/drivers/iio/accel/Makefile +++ b/drivers/iio/accel/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for industrial I/O accelerometer drivers | 3 | # Makefile for industrial I/O accelerometer drivers |
| 3 | # | 4 | # |
diff --git a/drivers/iio/accel/bmc150-accel.h b/drivers/iio/accel/bmc150-accel.h index 38a8b11f8c19..ae6118ae11b1 100644 --- a/drivers/iio/accel/bmc150-accel.h +++ b/drivers/iio/accel/bmc150-accel.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BMC150_ACCEL_H_ | 2 | #ifndef _BMC150_ACCEL_H_ |
| 2 | #define _BMC150_ACCEL_H_ | 3 | #define _BMC150_ACCEL_H_ |
| 3 | 4 | ||
diff --git a/drivers/iio/accel/kxsd9-i2c.c b/drivers/iio/accel/kxsd9-i2c.c index 95e20855d2ef..98fbb628d5bd 100644 --- a/drivers/iio/accel/kxsd9-i2c.c +++ b/drivers/iio/accel/kxsd9-i2c.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/device.h> | 2 | #include <linux/device.h> |
| 2 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 3 | #include <linux/module.h> | 4 | #include <linux/module.h> |
diff --git a/drivers/iio/accel/kxsd9.h b/drivers/iio/accel/kxsd9.h index 7e8a28168310..5e3ca212f5be 100644 --- a/drivers/iio/accel/kxsd9.h +++ b/drivers/iio/accel/kxsd9.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/device.h> | 2 | #include <linux/device.h> |
| 2 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 3 | 4 | ||
diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index 9874e05f52d7..9572c1090f35 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for IIO ADC drivers | 3 | # Makefile for IIO ADC drivers |
| 3 | # | 4 | # |
diff --git a/drivers/iio/adc/qcom-vadc-common.c b/drivers/iio/adc/qcom-vadc-common.c index 102fc51b10aa..47d24ae5462f 100644 --- a/drivers/iio/adc/qcom-vadc-common.c +++ b/drivers/iio/adc/qcom-vadc-common.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/bug.h> | 2 | #include <linux/bug.h> |
| 2 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 3 | #include <linux/bitops.h> | 4 | #include <linux/bitops.h> |
diff --git a/drivers/iio/adc/qcom-vadc-common.h b/drivers/iio/adc/qcom-vadc-common.h index 63c872a70adc..1d5354ff5c72 100644 --- a/drivers/iio/adc/qcom-vadc-common.h +++ b/drivers/iio/adc/qcom-vadc-common.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Code shared between the different Qualcomm PMIC voltage ADCs | 3 | * Code shared between the different Qualcomm PMIC voltage ADCs |
| 3 | */ | 4 | */ |
diff --git a/drivers/iio/buffer/Makefile b/drivers/iio/buffer/Makefile index 85beaae831ae..95f9f41c58b7 100644 --- a/drivers/iio/buffer/Makefile +++ b/drivers/iio/buffer/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the industrial I/O buffer implementations | 3 | # Makefile for the industrial I/O buffer implementations |
| 3 | # | 4 | # |
diff --git a/drivers/iio/common/Makefile b/drivers/iio/common/Makefile index 6fa760e1bdd5..4bc30bb548e2 100644 --- a/drivers/iio/common/Makefile +++ b/drivers/iio/common/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the IIO common modules. | 3 | # Makefile for the IIO common modules. |
| 3 | # Common modules contains modules, which can be shared among multiple | 4 | # Common modules contains modules, which can be shared among multiple |
diff --git a/drivers/iio/common/ssp_sensors/ssp_iio_sensor.h b/drivers/iio/common/ssp_sensors/ssp_iio_sensor.h index 541c6590d69c..4528ab55eb68 100644 --- a/drivers/iio/common/ssp_sensors/ssp_iio_sensor.h +++ b/drivers/iio/common/ssp_sensors/ssp_iio_sensor.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __SSP_IIO_SENSOR_H__ | 2 | #ifndef __SSP_IIO_SENSOR_H__ |
| 2 | #define __SSP_IIO_SENSOR_H__ | 3 | #define __SSP_IIO_SENSOR_H__ |
| 3 | 4 | ||
diff --git a/drivers/iio/common/st_sensors/Makefile b/drivers/iio/common/st_sensors/Makefile index 9f3e24f3024b..f7fb3b79b64c 100644 --- a/drivers/iio/common/st_sensors/Makefile +++ b/drivers/iio/common/st_sensors/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the STMicroelectronics sensor common modules. | 3 | # Makefile for the STMicroelectronics sensor common modules. |
| 3 | # | 4 | # |
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.h b/drivers/iio/common/st_sensors/st_sensors_core.h index cd88098ff6f1..e8894be55660 100644 --- a/drivers/iio/common/st_sensors/st_sensors_core.h +++ b/drivers/iio/common/st_sensors/st_sensors_core.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Local functions in the ST Sensors core | 3 | * Local functions in the ST Sensors core |
| 3 | */ | 4 | */ |
diff --git a/drivers/iio/dac/Makefile b/drivers/iio/dac/Makefile index 603587cc2f07..993511ba4b17 100644 --- a/drivers/iio/dac/Makefile +++ b/drivers/iio/dac/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for industrial I/O DAC drivers | 3 | # Makefile for industrial I/O DAC drivers |
| 3 | # | 4 | # |
diff --git a/drivers/iio/dummy/Makefile b/drivers/iio/dummy/Makefile index 0765e93d7804..f14fe20f365c 100644 --- a/drivers/iio/dummy/Makefile +++ b/drivers/iio/dummy/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the IIO Dummy Driver | 3 | # Makefile for the IIO Dummy Driver |
| 3 | # | 4 | # |
diff --git a/drivers/iio/dummy/iio_dummy_evgen.h b/drivers/iio/dummy/iio_dummy_evgen.h index d044b946e74a..e0bf64fe9d67 100644 --- a/drivers/iio/dummy/iio_dummy_evgen.h +++ b/drivers/iio/dummy/iio_dummy_evgen.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _IIO_DUMMY_EVGEN_H_ | 2 | #ifndef _IIO_DUMMY_EVGEN_H_ |
| 2 | #define _IIO_DUMMY_EVGEN_H_ | 3 | #define _IIO_DUMMY_EVGEN_H_ |
| 3 | 4 | ||
diff --git a/drivers/iio/gyro/Makefile b/drivers/iio/gyro/Makefile index f0e149a606b0..295ec780c4eb 100644 --- a/drivers/iio/gyro/Makefile +++ b/drivers/iio/gyro/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for industrial I/O gyroscope sensor drivers | 3 | # Makefile for industrial I/O gyroscope sensor drivers |
| 3 | # | 4 | # |
diff --git a/drivers/iio/gyro/bmg160.h b/drivers/iio/gyro/bmg160.h index 72db723c8fb6..6bcff6562249 100644 --- a/drivers/iio/gyro/bmg160.h +++ b/drivers/iio/gyro/bmg160.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef BMG160_H_ | 2 | #ifndef BMG160_H_ |
| 2 | #define BMG160_H_ | 3 | #define BMG160_H_ |
| 3 | 4 | ||
diff --git a/drivers/iio/gyro/mpu3050.h b/drivers/iio/gyro/mpu3050.h index bef87a714dc5..835b0249c376 100644 --- a/drivers/iio/gyro/mpu3050.h +++ b/drivers/iio/gyro/mpu3050.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/iio/iio.h> | 2 | #include <linux/iio/iio.h> |
| 2 | #include <linux/mutex.h> | 3 | #include <linux/mutex.h> |
| 3 | #include <linux/regmap.h> | 4 | #include <linux/regmap.h> |
diff --git a/drivers/iio/humidity/Makefile b/drivers/iio/humidity/Makefile index be0dedeb8f3c..ae4204995017 100644 --- a/drivers/iio/humidity/Makefile +++ b/drivers/iio/humidity/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for IIO humidity sensor drivers | 3 | # Makefile for IIO humidity sensor drivers |
| 3 | # | 4 | # |
diff --git a/drivers/iio/imu/Makefile b/drivers/iio/imu/Makefile index 8b563c3323b5..68629c68b19b 100644 --- a/drivers/iio/imu/Makefile +++ b/drivers/iio/imu/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for Inertial Measurement Units | 3 | # Makefile for Inertial Measurement Units |
| 3 | # | 4 | # |
diff --git a/drivers/iio/imu/adis16400_buffer.c b/drivers/iio/imu/adis16400_buffer.c index 90c24a23c679..e70a5339acb1 100644 --- a/drivers/iio/imu/adis16400_buffer.c +++ b/drivers/iio/imu/adis16400_buffer.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/interrupt.h> | 2 | #include <linux/interrupt.h> |
| 2 | #include <linux/mutex.h> | 3 | #include <linux/mutex.h> |
| 3 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
diff --git a/drivers/iio/imu/bmi160/bmi160.h b/drivers/iio/imu/bmi160/bmi160.h index d2ae6ed70271..e7b11e74fd1d 100644 --- a/drivers/iio/imu/bmi160/bmi160.h +++ b/drivers/iio/imu/bmi160/bmi160.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef BMI160_H_ | 2 | #ifndef BMI160_H_ |
| 2 | #define BMI160_H_ | 3 | #define BMI160_H_ |
| 3 | 4 | ||
diff --git a/drivers/iio/imu/inv_mpu6050/Makefile b/drivers/iio/imu/inv_mpu6050/Makefile index 734af5e6cef9..70ffe0d13d8c 100644 --- a/drivers/iio/imu/inv_mpu6050/Makefile +++ b/drivers/iio/imu/inv_mpu6050/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for Invensense MPU6050 device. | 3 | # Makefile for Invensense MPU6050 device. |
| 3 | # | 4 | # |
diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile index fa32fa459e2e..c263469b7ce9 100644 --- a/drivers/iio/light/Makefile +++ b/drivers/iio/light/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for IIO Light sensors | 3 | # Makefile for IIO Light sensors |
| 3 | # | 4 | # |
diff --git a/drivers/iio/magnetometer/Makefile b/drivers/iio/magnetometer/Makefile index b86d6cb7f285..664b2f866472 100644 --- a/drivers/iio/magnetometer/Makefile +++ b/drivers/iio/magnetometer/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for industrial I/O Magnetometer sensor drivers | 3 | # Makefile for industrial I/O Magnetometer sensor drivers |
| 3 | # | 4 | # |
diff --git a/drivers/iio/magnetometer/bmc150_magn.h b/drivers/iio/magnetometer/bmc150_magn.h index 9a8e26812ca8..3b69232afd2c 100644 --- a/drivers/iio/magnetometer/bmc150_magn.h +++ b/drivers/iio/magnetometer/bmc150_magn.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BMC150_MAGN_H_ | 2 | #ifndef _BMC150_MAGN_H_ |
| 2 | #define _BMC150_MAGN_H_ | 3 | #define _BMC150_MAGN_H_ |
| 3 | 4 | ||
diff --git a/drivers/iio/potentiometer/Makefile b/drivers/iio/potentiometer/Makefile index 2260d40e0936..1afd1e70f8cc 100644 --- a/drivers/iio/potentiometer/Makefile +++ b/drivers/iio/potentiometer/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for industrial I/O potentiometer drivers | 3 | # Makefile for industrial I/O potentiometer drivers |
| 3 | # | 4 | # |
diff --git a/drivers/iio/pressure/Makefile b/drivers/iio/pressure/Makefile index 838642789389..c2058d7b2f93 100644 --- a/drivers/iio/pressure/Makefile +++ b/drivers/iio/pressure/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for industrial I/O pressure drivers | 3 | # Makefile for industrial I/O pressure drivers |
| 3 | # | 4 | # |
diff --git a/drivers/iio/pressure/bmp280-regmap.c b/drivers/iio/pressure/bmp280-regmap.c index 6807113ec09f..08c00ac32bda 100644 --- a/drivers/iio/pressure/bmp280-regmap.c +++ b/drivers/iio/pressure/bmp280-regmap.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/device.h> | 2 | #include <linux/device.h> |
| 2 | #include <linux/module.h> | 3 | #include <linux/module.h> |
| 3 | #include <linux/regmap.h> | 4 | #include <linux/regmap.h> |
diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h index 61347438b779..eda50ef65706 100644 --- a/drivers/iio/pressure/bmp280.h +++ b/drivers/iio/pressure/bmp280.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/bitops.h> | 2 | #include <linux/bitops.h> |
| 2 | #include <linux/device.h> | 3 | #include <linux/device.h> |
| 3 | #include <linux/regmap.h> | 4 | #include <linux/regmap.h> |
diff --git a/drivers/iio/proximity/Makefile b/drivers/iio/proximity/Makefile index ed1b6f4cc209..ad6686391f08 100644 --- a/drivers/iio/proximity/Makefile +++ b/drivers/iio/proximity/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for IIO proximity sensors | 3 | # Makefile for IIO proximity sensors |
| 3 | # | 4 | # |
diff --git a/drivers/iio/temperature/Makefile b/drivers/iio/temperature/Makefile index ad1d668de546..34bd9023727b 100644 --- a/drivers/iio/temperature/Makefile +++ b/drivers/iio/temperature/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for industrial I/O temperature drivers | 3 | # Makefile for industrial I/O temperature drivers |
| 3 | # | 4 | # |
diff --git a/drivers/iio/trigger/Makefile b/drivers/iio/trigger/Makefile index 0a72a2a76cb2..f3d11acb8a0b 100644 --- a/drivers/iio/trigger/Makefile +++ b/drivers/iio/trigger/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for triggers not associated with iio-devices | 3 | # Makefile for triggers not associated with iio-devices |
| 3 | # | 4 | # |
diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile index b4df164f71a6..9c0a2b5c834e 100644 --- a/drivers/infiniband/core/Makefile +++ b/drivers/infiniband/core/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | infiniband-$(CONFIG_INFINIBAND_ADDR_TRANS) := rdma_cm.o | 2 | infiniband-$(CONFIG_INFINIBAND_ADDR_TRANS) := rdma_cm.o |
| 2 | user_access-$(CONFIG_INFINIBAND_ADDR_TRANS) := rdma_ucm.o | 3 | user_access-$(CONFIG_INFINIBAND_ADDR_TRANS) := rdma_ucm.o |
| 3 | 4 | ||
diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c index b12e58787c3d..1fb72c356e36 100644 --- a/drivers/infiniband/core/netlink.c +++ b/drivers/infiniband/core/netlink.c | |||
| @@ -175,13 +175,24 @@ static int rdma_nl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, | |||
| 175 | !netlink_capable(skb, CAP_NET_ADMIN)) | 175 | !netlink_capable(skb, CAP_NET_ADMIN)) |
| 176 | return -EPERM; | 176 | return -EPERM; |
| 177 | 177 | ||
| 178 | /* | ||
| 179 | * LS responses overload the 0x100 (NLM_F_ROOT) flag. Don't | ||
| 180 | * mistakenly call the .dump() function. | ||
| 181 | */ | ||
| 182 | if (index == RDMA_NL_LS) { | ||
| 183 | if (cb_table[op].doit) | ||
| 184 | return cb_table[op].doit(skb, nlh, extack); | ||
| 185 | return -EINVAL; | ||
| 186 | } | ||
| 178 | /* FIXME: Convert IWCM to properly handle doit callbacks */ | 187 | /* FIXME: Convert IWCM to properly handle doit callbacks */ |
| 179 | if ((nlh->nlmsg_flags & NLM_F_DUMP) || index == RDMA_NL_RDMA_CM || | 188 | if ((nlh->nlmsg_flags & NLM_F_DUMP) || index == RDMA_NL_RDMA_CM || |
| 180 | index == RDMA_NL_IWCM) { | 189 | index == RDMA_NL_IWCM) { |
| 181 | struct netlink_dump_control c = { | 190 | struct netlink_dump_control c = { |
| 182 | .dump = cb_table[op].dump, | 191 | .dump = cb_table[op].dump, |
| 183 | }; | 192 | }; |
| 184 | return netlink_dump_start(nls, skb, nlh, &c); | 193 | if (c.dump) |
| 194 | return netlink_dump_start(nls, skb, nlh, &c); | ||
| 195 | return -EINVAL; | ||
| 185 | } | 196 | } |
| 186 | 197 | ||
| 187 | if (cb_table[op].doit) | 198 | if (cb_table[op].doit) |
diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c index 3ba24c428c3b..2fae850a3eff 100644 --- a/drivers/infiniband/core/nldev.c +++ b/drivers/infiniband/core/nldev.c | |||
| @@ -214,7 +214,9 @@ static int nldev_port_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh, | |||
| 214 | 214 | ||
| 215 | err = nlmsg_parse(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1, | 215 | err = nlmsg_parse(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1, |
| 216 | nldev_policy, extack); | 216 | nldev_policy, extack); |
| 217 | if (err || !tb[RDMA_NLDEV_ATTR_PORT_INDEX]) | 217 | if (err || |
| 218 | !tb[RDMA_NLDEV_ATTR_DEV_INDEX] || | ||
| 219 | !tb[RDMA_NLDEV_ATTR_PORT_INDEX]) | ||
| 218 | return -EINVAL; | 220 | return -EINVAL; |
| 219 | 221 | ||
| 220 | index = nla_get_u32(tb[RDMA_NLDEV_ATTR_DEV_INDEX]); | 222 | index = nla_get_u32(tb[RDMA_NLDEV_ATTR_DEV_INDEX]); |
diff --git a/drivers/infiniband/hw/Makefile b/drivers/infiniband/hw/Makefile index 34c93abf0fe0..e4f31c1be8f7 100644 --- a/drivers/infiniband/hw/Makefile +++ b/drivers/infiniband/hw/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_INFINIBAND_MTHCA) += mthca/ | 2 | obj-$(CONFIG_INFINIBAND_MTHCA) += mthca/ |
| 2 | obj-$(CONFIG_INFINIBAND_QIB) += qib/ | 3 | obj-$(CONFIG_INFINIBAND_QIB) += qib/ |
| 3 | obj-$(CONFIG_INFINIBAND_CXGB3) += cxgb3/ | 4 | obj-$(CONFIG_INFINIBAND_CXGB3) += cxgb3/ |
diff --git a/drivers/infiniband/hw/bnxt_re/Makefile b/drivers/infiniband/hw/bnxt_re/Makefile index afbaa0e20670..6e3bc25cc140 100644 --- a/drivers/infiniband/hw/bnxt_re/Makefile +++ b/drivers/infiniband/hw/bnxt_re/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | ccflags-y := -Idrivers/net/ethernet/broadcom/bnxt | 3 | ccflags-y := -Idrivers/net/ethernet/broadcom/bnxt |
| 3 | obj-$(CONFIG_INFINIBAND_BNXT_RE) += bnxt_re.o | 4 | obj-$(CONFIG_INFINIBAND_BNXT_RE) += bnxt_re.o |
diff --git a/drivers/infiniband/hw/cxgb3/Makefile b/drivers/infiniband/hw/cxgb3/Makefile index 2761364185af..2c66d35d19bd 100644 --- a/drivers/infiniband/hw/cxgb3/Makefile +++ b/drivers/infiniband/hw/cxgb3/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb3 | 2 | ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb3 |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_INFINIBAND_CXGB3) += iw_cxgb3.o | 4 | obj-$(CONFIG_INFINIBAND_CXGB3) += iw_cxgb3.o |
diff --git a/drivers/infiniband/hw/hfi1/Makefile b/drivers/infiniband/hw/hfi1/Makefile index 66d538c033b0..ce4010bad982 100644 --- a/drivers/infiniband/hw/hfi1/Makefile +++ b/drivers/infiniband/hw/hfi1/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # HFI driver | 3 | # HFI driver |
| 3 | # | 4 | # |
diff --git a/drivers/infiniband/hw/i40iw/Makefile b/drivers/infiniband/hw/i40iw/Makefile index 90068c03d217..5a8a7a3f28ae 100644 --- a/drivers/infiniband/hw/i40iw/Makefile +++ b/drivers/infiniband/hw/i40iw/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ccflags-y := -Idrivers/net/ethernet/intel/i40e | 2 | ccflags-y := -Idrivers/net/ethernet/intel/i40e |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_INFINIBAND_I40IW) += i40iw.o | 4 | obj-$(CONFIG_INFINIBAND_I40IW) += i40iw.o |
diff --git a/drivers/infiniband/hw/mthca/Makefile b/drivers/infiniband/hw/mthca/Makefile index e388d95d0cf1..3a09e9ffd634 100644 --- a/drivers/infiniband/hw/mthca/Makefile +++ b/drivers/infiniband/hw/mthca/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_INFINIBAND_MTHCA) += ib_mthca.o | 2 | obj-$(CONFIG_INFINIBAND_MTHCA) += ib_mthca.o |
| 2 | 3 | ||
| 3 | ib_mthca-y := mthca_main.o mthca_cmd.o mthca_profile.o mthca_reset.o \ | 4 | ib_mthca-y := mthca_main.o mthca_cmd.o mthca_profile.o mthca_reset.o \ |
diff --git a/drivers/infiniband/hw/qib/Makefile b/drivers/infiniband/hw/qib/Makefile index 79ebd79e8405..80ffab88fbca 100644 --- a/drivers/infiniband/hw/qib/Makefile +++ b/drivers/infiniband/hw/qib/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_INFINIBAND_QIB) += ib_qib.o | 2 | obj-$(CONFIG_INFINIBAND_QIB) += ib_qib.o |
| 2 | 3 | ||
| 3 | ib_qib-y := qib_diag.o qib_driver.o qib_eeprom.o \ | 4 | ib_qib-y := qib_diag.o qib_driver.o qib_eeprom.o \ |
diff --git a/drivers/infiniband/hw/usnic/Makefile b/drivers/infiniband/hw/usnic/Makefile index 99fb2db47cd5..94ae7a1a6950 100644 --- a/drivers/infiniband/hw/usnic/Makefile +++ b/drivers/infiniband/hw/usnic/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ccflags-y := -Idrivers/net/ethernet/cisco/enic | 2 | ccflags-y := -Idrivers/net/ethernet/cisco/enic |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_INFINIBAND_USNIC)+= usnic_verbs.o | 4 | obj-$(CONFIG_INFINIBAND_USNIC)+= usnic_verbs.o |
diff --git a/drivers/infiniband/sw/rxe/Makefile b/drivers/infiniband/sw/rxe/Makefile index 3f12beb7076f..66af72dca759 100644 --- a/drivers/infiniband/sw/rxe/Makefile +++ b/drivers/infiniband/sw/rxe/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_RDMA_RXE) += rdma_rxe.o | 2 | obj-$(CONFIG_RDMA_RXE) += rdma_rxe.o |
| 2 | 3 | ||
| 3 | rdma_rxe-y := \ | 4 | rdma_rxe-y := \ |
diff --git a/drivers/infiniband/ulp/Makefile b/drivers/infiniband/ulp/Makefile index c28af1823a2d..437813c7b481 100644 --- a/drivers/infiniband/ulp/Makefile +++ b/drivers/infiniband/ulp/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_INFINIBAND_IPOIB) += ipoib/ | 2 | obj-$(CONFIG_INFINIBAND_IPOIB) += ipoib/ |
| 2 | obj-$(CONFIG_INFINIBAND_SRP) += srp/ | 3 | obj-$(CONFIG_INFINIBAND_SRP) += srp/ |
| 3 | obj-$(CONFIG_INFINIBAND_SRPT) += srpt/ | 4 | obj-$(CONFIG_INFINIBAND_SRPT) += srpt/ |
diff --git a/drivers/infiniband/ulp/ipoib/Makefile b/drivers/infiniband/ulp/ipoib/Makefile index e5430dd50764..6ece857ed262 100644 --- a/drivers/infiniband/ulp/ipoib/Makefile +++ b/drivers/infiniband/ulp/ipoib/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_INFINIBAND_IPOIB) += ib_ipoib.o | 2 | obj-$(CONFIG_INFINIBAND_IPOIB) += ib_ipoib.o |
| 2 | 3 | ||
| 3 | ib_ipoib-y := ipoib_main.o \ | 4 | ib_ipoib-y := ipoib_main.o \ |
diff --git a/drivers/infiniband/ulp/isert/ib_isert.h b/drivers/infiniband/ulp/isert/ib_isert.h index 87d994de8c91..d6fd248320ae 100644 --- a/drivers/infiniband/ulp/isert/ib_isert.h +++ b/drivers/infiniband/ulp/isert/ib_isert.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/socket.h> | 2 | #include <linux/socket.h> |
| 2 | #include <linux/in.h> | 3 | #include <linux/in.h> |
| 3 | #include <linux/in6.h> | 4 | #include <linux/in6.h> |
diff --git a/drivers/input/Makefile b/drivers/input/Makefile index 595820bbabe9..40de6a7be641 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the input core drivers. | 3 | # Makefile for the input core drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/input/gameport/Makefile b/drivers/input/gameport/Makefile index b6f6097bd8c4..73ad8fe4db79 100644 --- a/drivers/input/gameport/Makefile +++ b/drivers/input/gameport/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the gameport drivers. | 3 | # Makefile for the gameport drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile index 496fd56b3f1b..67651efda2e1 100644 --- a/drivers/input/joystick/Makefile +++ b/drivers/input/joystick/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the input core drivers. | 3 | # Makefile for the input core drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile index d2338bacdad1..526e68294e6e 100644 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the input core drivers. | 3 | # Makefile for the input core drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile index 03fd4262ada9..4b6118d313fe 100644 --- a/drivers/input/misc/Makefile +++ b/drivers/input/misc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the input misc drivers. | 3 | # Makefile for the input misc drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile index 56bf0ad877c6..e49f08565076 100644 --- a/drivers/input/mouse/Makefile +++ b/drivers/input/mouse/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the mouse drivers. | 3 | # Makefile for the mouse drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/input/mouse/byd.h b/drivers/input/mouse/byd.h index d6c120cf36cd..8cb90d904186 100644 --- a/drivers/input/mouse/byd.h +++ b/drivers/input/mouse/byd.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BYD_H | 2 | #ifndef _BYD_H |
| 2 | #define _BYD_H | 3 | #define _BYD_H |
| 3 | 4 | ||
diff --git a/drivers/input/mouse/cypress_ps2.h b/drivers/input/mouse/cypress_ps2.h index 81f68aaed7c8..1eaddd818004 100644 --- a/drivers/input/mouse/cypress_ps2.h +++ b/drivers/input/mouse/cypress_ps2.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _CYPRESS_PS2_H | 2 | #ifndef _CYPRESS_PS2_H |
| 2 | #define _CYPRESS_PS2_H | 3 | #define _CYPRESS_PS2_H |
| 3 | 4 | ||
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index 0e761d079dc4..6d6b092e2da9 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c | |||
| @@ -1258,6 +1258,7 @@ static const struct acpi_device_id elan_acpi_id[] = { | |||
| 1258 | { "ELAN0605", 0 }, | 1258 | { "ELAN0605", 0 }, |
| 1259 | { "ELAN0609", 0 }, | 1259 | { "ELAN0609", 0 }, |
| 1260 | { "ELAN060B", 0 }, | 1260 | { "ELAN060B", 0 }, |
| 1261 | { "ELAN0611", 0 }, | ||
| 1261 | { "ELAN1000", 0 }, | 1262 | { "ELAN1000", 0 }, |
| 1262 | { } | 1263 | { } |
| 1263 | }; | 1264 | }; |
diff --git a/drivers/input/mouse/hgpk.h b/drivers/input/mouse/hgpk.h index dd686771cfe0..98b7b384229b 100644 --- a/drivers/input/mouse/hgpk.h +++ b/drivers/input/mouse/hgpk.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * OLPC HGPK (XO-1) touchpad PS/2 mouse driver | 3 | * OLPC HGPK (XO-1) touchpad PS/2 mouse driver |
| 3 | */ | 4 | */ |
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h index 38855e425f01..8cd453808cc7 100644 --- a/drivers/input/mouse/psmouse.h +++ b/drivers/input/mouse/psmouse.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _PSMOUSE_H | 2 | #ifndef _PSMOUSE_H |
| 2 | #define _PSMOUSE_H | 3 | #define _PSMOUSE_H |
| 3 | 4 | ||
diff --git a/drivers/input/rmi4/Makefile b/drivers/input/rmi4/Makefile index 9aaac3dd8613..f17631656987 100644 --- a/drivers/input/rmi4/Makefile +++ b/drivers/input/rmi4/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_RMI4_CORE) += rmi_core.o | 2 | obj-$(CONFIG_RMI4_CORE) += rmi_core.o |
| 2 | rmi_core-y := rmi_bus.o rmi_driver.o rmi_f01.o | 3 | rmi_core-y := rmi_bus.o rmi_driver.o rmi_f01.o |
| 3 | 4 | ||
diff --git a/drivers/input/rmi4/rmi_f30.c b/drivers/input/rmi4/rmi_f30.c index 34dfee555b20..82e0f0d43d55 100644 --- a/drivers/input/rmi4/rmi_f30.c +++ b/drivers/input/rmi4/rmi_f30.c | |||
| @@ -232,9 +232,10 @@ static int rmi_f30_map_gpios(struct rmi_function *fn, | |||
| 232 | unsigned int trackstick_button = BTN_LEFT; | 232 | unsigned int trackstick_button = BTN_LEFT; |
| 233 | bool button_mapped = false; | 233 | bool button_mapped = false; |
| 234 | int i; | 234 | int i; |
| 235 | int button_count = min_t(u8, f30->gpioled_count, TRACKSTICK_RANGE_END); | ||
| 235 | 236 | ||
| 236 | f30->gpioled_key_map = devm_kcalloc(&fn->dev, | 237 | f30->gpioled_key_map = devm_kcalloc(&fn->dev, |
| 237 | f30->gpioled_count, | 238 | button_count, |
| 238 | sizeof(f30->gpioled_key_map[0]), | 239 | sizeof(f30->gpioled_key_map[0]), |
| 239 | GFP_KERNEL); | 240 | GFP_KERNEL); |
| 240 | if (!f30->gpioled_key_map) { | 241 | if (!f30->gpioled_key_map) { |
| @@ -242,7 +243,7 @@ static int rmi_f30_map_gpios(struct rmi_function *fn, | |||
| 242 | return -ENOMEM; | 243 | return -ENOMEM; |
| 243 | } | 244 | } |
| 244 | 245 | ||
| 245 | for (i = 0; i < f30->gpioled_count; i++) { | 246 | for (i = 0; i < button_count; i++) { |
| 246 | if (!rmi_f30_is_valid_button(i, f30->ctrl)) | 247 | if (!rmi_f30_is_valid_button(i, f30->ctrl)) |
| 247 | continue; | 248 | continue; |
| 248 | 249 | ||
diff --git a/drivers/input/serio/Makefile b/drivers/input/serio/Makefile index 767bd9b6e1ed..a3ca07621542 100644 --- a/drivers/input/serio/Makefile +++ b/drivers/input/serio/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the input core drivers. | 3 | # Makefile for the input core drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h index 6231d63860ee..796289846204 100644 --- a/drivers/input/serio/i8042-sparcio.h +++ b/drivers/input/serio/i8042-sparcio.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _I8042_SPARCIO_H | 2 | #ifndef _I8042_SPARCIO_H |
| 2 | #define _I8042_SPARCIO_H | 3 | #define _I8042_SPARCIO_H |
| 3 | 4 | ||
diff --git a/drivers/input/sparse-keymap.c b/drivers/input/sparse-keymap.c index bb0349fa64bc..fd03e55768c9 100644 --- a/drivers/input/sparse-keymap.c +++ b/drivers/input/sparse-keymap.c | |||
| @@ -255,6 +255,7 @@ void sparse_keymap_report_entry(struct input_dev *dev, const struct key_entry *k | |||
| 255 | 255 | ||
| 256 | case KE_VSW: | 256 | case KE_VSW: |
| 257 | input_report_switch(dev, ke->sw.code, value); | 257 | input_report_switch(dev, ke->sw.code, value); |
| 258 | input_sync(dev); | ||
| 258 | break; | 259 | break; |
| 259 | } | 260 | } |
| 260 | } | 261 | } |
diff --git a/drivers/input/tablet/Makefile b/drivers/input/tablet/Makefile index 200fc4e11987..8279ccc18b0a 100644 --- a/drivers/input/tablet/Makefile +++ b/drivers/input/tablet/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the tablet drivers | 3 | # Makefile for the tablet drivers |
| 3 | # | 4 | # |
diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c index b796e891e2ee..4b8b9d7aa75e 100644 --- a/drivers/input/tablet/gtco.c +++ b/drivers/input/tablet/gtco.c | |||
| @@ -230,13 +230,17 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report, | |||
| 230 | 230 | ||
| 231 | /* Walk this report and pull out the info we need */ | 231 | /* Walk this report and pull out the info we need */ |
| 232 | while (i < length) { | 232 | while (i < length) { |
| 233 | prefix = report[i]; | 233 | prefix = report[i++]; |
| 234 | |||
| 235 | /* Skip over prefix */ | ||
| 236 | i++; | ||
| 237 | 234 | ||
| 238 | /* Determine data size and save the data in the proper variable */ | 235 | /* Determine data size and save the data in the proper variable */ |
| 239 | size = PREF_SIZE(prefix); | 236 | size = (1U << PREF_SIZE(prefix)) >> 1; |
| 237 | if (i + size > length) { | ||
| 238 | dev_err(ddev, | ||
| 239 | "Not enough data (need %d, have %d)\n", | ||
| 240 | i + size, length); | ||
| 241 | break; | ||
| 242 | } | ||
| 243 | |||
| 240 | switch (size) { | 244 | switch (size) { |
| 241 | case 1: | 245 | case 1: |
| 242 | data = report[i]; | 246 | data = report[i]; |
| @@ -244,8 +248,7 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report, | |||
| 244 | case 2: | 248 | case 2: |
| 245 | data16 = get_unaligned_le16(&report[i]); | 249 | data16 = get_unaligned_le16(&report[i]); |
| 246 | break; | 250 | break; |
| 247 | case 3: | 251 | case 4: |
| 248 | size = 4; | ||
| 249 | data32 = get_unaligned_le32(&report[i]); | 252 | data32 = get_unaligned_le32(&report[i]); |
| 250 | break; | 253 | break; |
| 251 | } | 254 | } |
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 6badce87037b..850c1562555a 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the touchscreen drivers. | 3 | # Makefile for the touchscreen drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/input/touchscreen/ar1021_i2c.c b/drivers/input/touchscreen/ar1021_i2c.c index f9dcbd63e598..b35b640fdadf 100644 --- a/drivers/input/touchscreen/ar1021_i2c.c +++ b/drivers/input/touchscreen/ar1021_i2c.c | |||
| @@ -117,6 +117,7 @@ static int ar1021_i2c_probe(struct i2c_client *client, | |||
| 117 | input->open = ar1021_i2c_open; | 117 | input->open = ar1021_i2c_open; |
| 118 | input->close = ar1021_i2c_close; | 118 | input->close = ar1021_i2c_close; |
| 119 | 119 | ||
| 120 | __set_bit(INPUT_PROP_DIRECT, input->propbit); | ||
| 120 | input_set_capability(input, EV_KEY, BTN_TOUCH); | 121 | input_set_capability(input, EV_KEY, BTN_TOUCH); |
| 121 | input_set_abs_params(input, ABS_X, 0, AR1021_MAX_X, 0, 0); | 122 | input_set_abs_params(input, ABS_X, 0, AR1021_MAX_X, 0, 0); |
| 122 | input_set_abs_params(input, ABS_Y, 0, AR1021_MAX_Y, 0, 0); | 123 | input_set_abs_params(input, ABS_Y, 0, AR1021_MAX_Y, 0, 0); |
diff --git a/drivers/input/touchscreen/tsc200x-core.h b/drivers/input/touchscreen/tsc200x-core.h index 49a63a3c6840..a43c08ccfd3d 100644 --- a/drivers/input/touchscreen/tsc200x-core.h +++ b/drivers/input/touchscreen/tsc200x-core.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _TSC200X_CORE_H | 2 | #ifndef _TSC200X_CORE_H |
| 2 | #define _TSC200X_CORE_H | 3 | #define _TSC200X_CORE_H |
| 3 | 4 | ||
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index b910aea813a1..1fb695854809 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_IOMMU_API) += iommu.o | 2 | obj-$(CONFIG_IOMMU_API) += iommu.o |
| 2 | obj-$(CONFIG_IOMMU_API) += iommu-traces.o | 3 | obj-$(CONFIG_IOMMU_API) += iommu-traces.o |
| 3 | obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o | 4 | obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o |
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index a5b89f6bcdbf..25842b566c39 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | #define pr_fmt(fmt) "DMAR-IR: " fmt | 3 | #define pr_fmt(fmt) "DMAR-IR: " fmt |
| 3 | 4 | ||
diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h index a3e667077b14..cd2e1eafffe6 100644 --- a/drivers/iommu/io-pgtable.h +++ b/drivers/iommu/io-pgtable.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __IO_PGTABLE_H | 2 | #ifndef __IO_PGTABLE_H |
| 2 | #define __IO_PGTABLE_H | 3 | #define __IO_PGTABLE_H |
| 3 | #include <linux/bitops.h> | 4 | #include <linux/bitops.h> |
diff --git a/drivers/iommu/iommu-traces.c b/drivers/iommu/iommu-traces.c index bf3b317ff0c1..1e9ca7789de1 100644 --- a/drivers/iommu/iommu-traces.c +++ b/drivers/iommu/iommu-traces.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * iommu trace points | 3 | * iommu trace points |
| 3 | * | 4 | * |
diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c index 0e2f31f9032b..22d4db302c1c 100644 --- a/drivers/iommu/s390-iommu.c +++ b/drivers/iommu/s390-iommu.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * IOMMU API for s390 PCI devices | 3 | * IOMMU API for s390 PCI devices |
| 3 | * | 4 | * |
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 845abc107ad5..b842dfdc903f 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_IRQCHIP) += irqchip.o | 2 | obj-$(CONFIG_IRQCHIP) += irqchip.o |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_ALPINE_MSI) += irq-alpine-msi.o | 4 | obj-$(CONFIG_ALPINE_MSI) += irq-alpine-msi.o |
diff --git a/drivers/irqchip/irq-ftintc010.c b/drivers/irqchip/irq-ftintc010.c index cd2dc8bbbe9c..0bf98425dca5 100644 --- a/drivers/irqchip/irq-ftintc010.c +++ b/drivers/irqchip/irq-ftintc010.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * irqchip for the Faraday Technology FTINTC010 Copyright (C) 2017 Linus | 3 | * irqchip for the Faraday Technology FTINTC010 Copyright (C) 2017 Linus |
| 3 | * Walleij <linus.walleij@linaro.org> | 4 | * Walleij <linus.walleij@linaro.org> |
diff --git a/drivers/irqchip/irq-gic-realview.c b/drivers/irqchip/irq-gic-realview.c index 18d58d2b4ffe..b4c1924f0255 100644 --- a/drivers/irqchip/irq-gic-realview.c +++ b/drivers/irqchip/irq-gic-realview.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Special GIC quirks for the ARM RealView | 3 | * Special GIC quirks for the ARM RealView |
| 3 | * Copyright (C) 2015 Linus Walleij | 4 | * Copyright (C) 2015 Linus Walleij |
diff --git a/drivers/irqchip/irq-imgpdc.c b/drivers/irqchip/irq-imgpdc.c index c02d29c9dc05..1f59998e03f8 100644 --- a/drivers/irqchip/irq-imgpdc.c +++ b/drivers/irqchip/irq-imgpdc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * IMG PowerDown Controller (PDC) | 3 | * IMG PowerDown Controller (PDC) |
| 3 | * | 4 | * |
diff --git a/drivers/irqchip/irq-metag-ext.c b/drivers/irqchip/irq-metag-ext.c index be7216bfb8dd..e67483161f0f 100644 --- a/drivers/irqchip/irq-metag-ext.c +++ b/drivers/irqchip/irq-metag-ext.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Meta External interrupt code. | 3 | * Meta External interrupt code. |
| 3 | * | 4 | * |
diff --git a/drivers/irqchip/irq-metag.c b/drivers/irqchip/irq-metag.c index a5f053bd2f44..857b946747eb 100644 --- a/drivers/irqchip/irq-metag.c +++ b/drivers/irqchip/irq-metag.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Meta internal (HWSTATMETA) interrupt code. | 3 | * Meta internal (HWSTATMETA) interrupt code. |
| 3 | * | 4 | * |
diff --git a/drivers/irqchip/irq-mvebu-gicp.c b/drivers/irqchip/irq-mvebu-gicp.c index b283fc90be1e..17a4a7b6cdbb 100644 --- a/drivers/irqchip/irq-mvebu-gicp.c +++ b/drivers/irqchip/irq-mvebu-gicp.c | |||
| @@ -194,6 +194,7 @@ static int mvebu_gicp_probe(struct platform_device *pdev) | |||
| 194 | return -ENOMEM; | 194 | return -ENOMEM; |
| 195 | 195 | ||
| 196 | gicp->dev = &pdev->dev; | 196 | gicp->dev = &pdev->dev; |
| 197 | spin_lock_init(&gicp->spi_lock); | ||
| 197 | 198 | ||
| 198 | gicp->res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 199 | gicp->res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 199 | if (!gicp->res) | 200 | if (!gicp->res) |
diff --git a/drivers/irqchip/irq-mvebu-gicp.h b/drivers/irqchip/irq-mvebu-gicp.h index 98535e886ea5..eaa12fb72102 100644 --- a/drivers/irqchip/irq-mvebu-gicp.h +++ b/drivers/irqchip/irq-mvebu-gicp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MVEBU_GICP_H__ | 2 | #ifndef __MVEBU_GICP_H__ |
| 2 | #define __MVEBU_GICP_H__ | 3 | #define __MVEBU_GICP_H__ |
| 3 | 4 | ||
diff --git a/drivers/irqchip/irq-renesas-h8300h.c b/drivers/irqchip/irq-renesas-h8300h.c index b8327590ae52..1054d74b7edd 100644 --- a/drivers/irqchip/irq-renesas-h8300h.c +++ b/drivers/irqchip/irq-renesas-h8300h.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * H8/300H interrupt controller driver | 3 | * H8/300H interrupt controller driver |
| 3 | * | 4 | * |
diff --git a/drivers/irqchip/irq-renesas-h8s.c b/drivers/irqchip/irq-renesas-h8s.c index 71d8139be26c..aed31afb0216 100644 --- a/drivers/irqchip/irq-renesas-h8s.c +++ b/drivers/irqchip/irq-renesas-h8s.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * H8S interrupt contoller driver | 3 | * H8S interrupt contoller driver |
| 3 | * | 4 | * |
diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-versatile-fpga.c index 37dd4645bf18..928858dada75 100644 --- a/drivers/irqchip/irq-versatile-fpga.c +++ b/drivers/irqchip/irq-versatile-fpga.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Support for Versatile FPGA-based IRQ controllers | 3 | * Support for Versatile FPGA-based IRQ controllers |
| 3 | */ | 4 | */ |
diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile index c32e45826c2c..e7d3d8f2ad5a 100644 --- a/drivers/isdn/Makefile +++ b/drivers/isdn/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for the kernel ISDN subsystem and device drivers. | 2 | # Makefile for the kernel ISDN subsystem and device drivers. |
| 2 | 3 | ||
| 3 | # Object files in subdirectories | 4 | # Object files in subdirectories |
diff --git a/drivers/isdn/capi/Makefile b/drivers/isdn/capi/Makefile index 4d5b4b71db1e..06da3ed2c40a 100644 --- a/drivers/isdn/capi/Makefile +++ b/drivers/isdn/capi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for the CAPI subsystem. | 2 | # Makefile for the CAPI subsystem. |
| 2 | 3 | ||
| 3 | # Ordering constraints: kernelcapi.o first | 4 | # Ordering constraints: kernelcapi.o first |
diff --git a/drivers/isdn/capi/capilib.c b/drivers/isdn/capi/capilib.c index 33361f833c01..a39ad3796bba 100644 --- a/drivers/isdn/capi/capilib.c +++ b/drivers/isdn/capi/capilib.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | #include <linux/slab.h> | 3 | #include <linux/slab.h> |
| 3 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
diff --git a/drivers/isdn/gigaset/Makefile b/drivers/isdn/gigaset/Makefile index c453b72272a0..ac45a2739f56 100644 --- a/drivers/isdn/gigaset/Makefile +++ b/drivers/isdn/gigaset/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | gigaset-y := common.o interface.o proc.o ev-layer.o asyncdata.o | 2 | gigaset-y := common.o interface.o proc.o ev-layer.o asyncdata.o |
| 2 | gigaset-$(CONFIG_GIGASET_CAPI) += capi.o | 3 | gigaset-$(CONFIG_GIGASET_CAPI) += capi.o |
| 3 | gigaset-$(CONFIG_GIGASET_I4L) += i4l.o | 4 | gigaset-$(CONFIG_GIGASET_I4L) += i4l.o |
diff --git a/drivers/isdn/hardware/avm/Makefile b/drivers/isdn/hardware/avm/Makefile index b540e8f2efb6..3830a0573fcc 100644 --- a/drivers/isdn/hardware/avm/Makefile +++ b/drivers/isdn/hardware/avm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for the AVM ISDN device drivers | 2 | # Makefile for the AVM ISDN device drivers |
| 2 | 3 | ||
| 3 | # Each configuration option enables a list of files. | 4 | # Each configuration option enables a list of files. |
diff --git a/drivers/isdn/hardware/eicon/Makefile b/drivers/isdn/hardware/eicon/Makefile index 4fa7fdb7df0d..a0ab2e2d7df0 100644 --- a/drivers/isdn/hardware/eicon/Makefile +++ b/drivers/isdn/hardware/eicon/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for the Eicon DIVA ISDN drivers. | 2 | # Makefile for the Eicon DIVA ISDN drivers. |
| 2 | 3 | ||
| 3 | # Each configuration option enables a list of files. | 4 | # Each configuration option enables a list of files. |
diff --git a/drivers/isdn/hardware/eicon/adapter.h b/drivers/isdn/hardware/eicon/adapter.h index 71a7c2f084a7..f9b24eb8781d 100644 --- a/drivers/isdn/hardware/eicon/adapter.h +++ b/drivers/isdn/hardware/eicon/adapter.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: adapter.h,v 1.4 2004/03/21 17:26:01 armin Exp $ */ | 2 | /* $Id: adapter.h,v 1.4 2004/03/21 17:26:01 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #ifndef __DIVA_USER_MODE_IDI_ADAPTER_H__ | 4 | #ifndef __DIVA_USER_MODE_IDI_ADAPTER_H__ |
diff --git a/drivers/isdn/hardware/eicon/debug.c b/drivers/isdn/hardware/eicon/debug.c index 8bc2791bc39c..301788115c4f 100644 --- a/drivers/isdn/hardware/eicon/debug.c +++ b/drivers/isdn/hardware/eicon/debug.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "platform.h" | 2 | #include "platform.h" |
| 2 | #include "pc.h" | 3 | #include "pc.h" |
| 3 | #include "di_defs.h" | 4 | #include "di_defs.h" |
diff --git a/drivers/isdn/hardware/eicon/diva.c b/drivers/isdn/hardware/eicon/diva.c index d91dd580e978..944a7f338099 100644 --- a/drivers/isdn/hardware/eicon/diva.c +++ b/drivers/isdn/hardware/eicon/diva.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* $Id: diva.c,v 1.21.4.1 2004/05/08 14:33:43 armin Exp $ */ | 2 | /* $Id: diva.c,v 1.21.4.1 2004/05/08 14:33:43 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #define CARDTYPE_H_WANT_DATA 1 | 4 | #define CARDTYPE_H_WANT_DATA 1 |
diff --git a/drivers/isdn/hardware/eicon/diva.h b/drivers/isdn/hardware/eicon/diva.h index e979085d1b89..b067032093a8 100644 --- a/drivers/isdn/hardware/eicon/diva.h +++ b/drivers/isdn/hardware/eicon/diva.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: diva.h,v 1.1.2.2 2001/02/08 12:25:43 armin Exp $ */ | 2 | /* $Id: diva.h,v 1.1.2.2 2001/02/08 12:25:43 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #ifndef __DIVA_XDI_OS_PART_H__ | 4 | #ifndef __DIVA_XDI_OS_PART_H__ |
diff --git a/drivers/isdn/hardware/eicon/diva_pci.h b/drivers/isdn/hardware/eicon/diva_pci.h index bb4b562050f6..7ef5db98ad3c 100644 --- a/drivers/isdn/hardware/eicon/diva_pci.h +++ b/drivers/isdn/hardware/eicon/diva_pci.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: diva_pci.h,v 1.6 2003/01/04 15:29:45 schindler Exp $ */ | 2 | /* $Id: diva_pci.h,v 1.6 2003/01/04 15:29:45 schindler Exp $ */ |
| 2 | 3 | ||
| 3 | #ifndef __DIVA_PCI_INTERFACE_H__ | 4 | #ifndef __DIVA_PCI_INTERFACE_H__ |
diff --git a/drivers/isdn/hardware/eicon/dqueue.h b/drivers/isdn/hardware/eicon/dqueue.h index 6992c45457a4..2da9799686ab 100644 --- a/drivers/isdn/hardware/eicon/dqueue.h +++ b/drivers/isdn/hardware/eicon/dqueue.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: dqueue.h,v 1.1.2.2 2001/02/08 12:25:43 armin Exp $ */ | 2 | /* $Id: dqueue.h,v 1.1.2.2 2001/02/08 12:25:43 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #ifndef _DIVA_USER_MODE_IDI_DATA_QUEUE_H__ | 4 | #ifndef _DIVA_USER_MODE_IDI_DATA_QUEUE_H__ |
diff --git a/drivers/isdn/hardware/eicon/dsp_tst.h b/drivers/isdn/hardware/eicon/dsp_tst.h index fe36f138be8b..85edd3ea50f7 100644 --- a/drivers/isdn/hardware/eicon/dsp_tst.h +++ b/drivers/isdn/hardware/eicon/dsp_tst.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: dsp_tst.h,v 1.1.2.2 2001/02/08 12:25:43 armin Exp $ */ | 2 | /* $Id: dsp_tst.h,v 1.1.2.2 2001/02/08 12:25:43 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #ifndef __DIVA_PRI_HOST_TEST_DSPS_H__ | 4 | #ifndef __DIVA_PRI_HOST_TEST_DSPS_H__ |
diff --git a/drivers/isdn/hardware/eicon/entity.h b/drivers/isdn/hardware/eicon/entity.h index fdb83416af31..f9767d321db9 100644 --- a/drivers/isdn/hardware/eicon/entity.h +++ b/drivers/isdn/hardware/eicon/entity.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: entity.h,v 1.4 2004/03/21 17:26:01 armin Exp $ */ | 2 | /* $Id: entity.h,v 1.4 2004/03/21 17:26:01 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #ifndef __DIVAS_USER_MODE_IDI_ENTITY__ | 4 | #ifndef __DIVAS_USER_MODE_IDI_ENTITY__ |
diff --git a/drivers/isdn/hardware/eicon/os_4bri.c b/drivers/isdn/hardware/eicon/os_4bri.c index 1891246807ed..87db5f4df27d 100644 --- a/drivers/isdn/hardware/eicon/os_4bri.c +++ b/drivers/isdn/hardware/eicon/os_4bri.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* $Id: os_4bri.c,v 1.28.4.4 2005/02/11 19:40:25 armin Exp $ */ | 2 | /* $Id: os_4bri.c,v 1.28.4.4 2005/02/11 19:40:25 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #include "platform.h" | 4 | #include "platform.h" |
diff --git a/drivers/isdn/hardware/eicon/os_4bri.h b/drivers/isdn/hardware/eicon/os_4bri.h index 72253278d4f5..94b2709537d8 100644 --- a/drivers/isdn/hardware/eicon/os_4bri.h +++ b/drivers/isdn/hardware/eicon/os_4bri.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: os_4bri.h,v 1.1.2.2 2001/02/08 12:25:44 armin Exp $ */ | 2 | /* $Id: os_4bri.h,v 1.1.2.2 2001/02/08 12:25:44 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #ifndef __DIVA_OS_4_BRI_H__ | 4 | #ifndef __DIVA_OS_4_BRI_H__ |
diff --git a/drivers/isdn/hardware/eicon/os_bri.c b/drivers/isdn/hardware/eicon/os_bri.c index 20f2653c58fa..de93090bcacb 100644 --- a/drivers/isdn/hardware/eicon/os_bri.c +++ b/drivers/isdn/hardware/eicon/os_bri.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* $Id: os_bri.c,v 1.21 2004/03/21 17:26:01 armin Exp $ */ | 2 | /* $Id: os_bri.c,v 1.21 2004/03/21 17:26:01 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #include "platform.h" | 4 | #include "platform.h" |
diff --git a/drivers/isdn/hardware/eicon/os_bri.h b/drivers/isdn/hardware/eicon/os_bri.h index 02e7456f8962..37c92cc53ded 100644 --- a/drivers/isdn/hardware/eicon/os_bri.h +++ b/drivers/isdn/hardware/eicon/os_bri.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: os_bri.h,v 1.1.2.2 2001/02/08 12:25:44 armin Exp $ */ | 2 | /* $Id: os_bri.h,v 1.1.2.2 2001/02/08 12:25:44 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #ifndef __DIVA_OS_BRI_REV_1_H__ | 4 | #ifndef __DIVA_OS_BRI_REV_1_H__ |
diff --git a/drivers/isdn/hardware/eicon/os_pri.c b/drivers/isdn/hardware/eicon/os_pri.c index da4957abb422..b20f1fb89d14 100644 --- a/drivers/isdn/hardware/eicon/os_pri.c +++ b/drivers/isdn/hardware/eicon/os_pri.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* $Id: os_pri.c,v 1.32 2004/03/21 17:26:01 armin Exp $ */ | 2 | /* $Id: os_pri.c,v 1.32 2004/03/21 17:26:01 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #include "platform.h" | 4 | #include "platform.h" |
diff --git a/drivers/isdn/hardware/eicon/os_pri.h b/drivers/isdn/hardware/eicon/os_pri.h index 537c74d042e7..0e91855b171a 100644 --- a/drivers/isdn/hardware/eicon/os_pri.h +++ b/drivers/isdn/hardware/eicon/os_pri.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: os_pri.h,v 1.1.2.2 2001/02/08 12:25:44 armin Exp $ */ | 2 | /* $Id: os_pri.h,v 1.1.2.2 2001/02/08 12:25:44 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #ifndef __DIVA_OS_PRI_REV_1_H__ | 4 | #ifndef __DIVA_OS_PRI_REV_1_H__ |
diff --git a/drivers/isdn/hardware/eicon/um_idi.c b/drivers/isdn/hardware/eicon/um_idi.c index e1519718ce67..db4dd4ff3642 100644 --- a/drivers/isdn/hardware/eicon/um_idi.c +++ b/drivers/isdn/hardware/eicon/um_idi.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* $Id: um_idi.c,v 1.14 2004/03/21 17:54:37 armin Exp $ */ | 2 | /* $Id: um_idi.c,v 1.14 2004/03/21 17:54:37 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #include "platform.h" | 4 | #include "platform.h" |
diff --git a/drivers/isdn/hardware/eicon/um_idi.h b/drivers/isdn/hardware/eicon/um_idi.h index ffb88f7b42fc..9aedd9e351a3 100644 --- a/drivers/isdn/hardware/eicon/um_idi.h +++ b/drivers/isdn/hardware/eicon/um_idi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: um_idi.h,v 1.6 2004/03/21 17:26:01 armin Exp $ */ | 2 | /* $Id: um_idi.h,v 1.6 2004/03/21 17:26:01 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #ifndef __DIVA_USER_MODE_IDI_CORE_H__ | 4 | #ifndef __DIVA_USER_MODE_IDI_CORE_H__ |
diff --git a/drivers/isdn/hardware/eicon/um_xdi.h b/drivers/isdn/hardware/eicon/um_xdi.h index b48fc042a5bc..1f37aa4efd18 100644 --- a/drivers/isdn/hardware/eicon/um_xdi.h +++ b/drivers/isdn/hardware/eicon/um_xdi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: um_xdi.h,v 1.1.2.2 2002/10/02 14:38:38 armin Exp $ */ | 2 | /* $Id: um_xdi.h,v 1.1.2.2 2002/10/02 14:38:38 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #ifndef __DIVA_USER_MODE_XDI_H__ | 4 | #ifndef __DIVA_USER_MODE_XDI_H__ |
diff --git a/drivers/isdn/hardware/eicon/xdi_adapter.h b/drivers/isdn/hardware/eicon/xdi_adapter.h index d303e65dbe6c..b036e217c659 100644 --- a/drivers/isdn/hardware/eicon/xdi_adapter.h +++ b/drivers/isdn/hardware/eicon/xdi_adapter.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: xdi_adapter.h,v 1.7 2004/03/21 17:26:01 armin Exp $ */ | 2 | /* $Id: xdi_adapter.h,v 1.7 2004/03/21 17:26:01 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #ifndef __DIVA_OS_XDI_ADAPTER_H__ | 4 | #ifndef __DIVA_OS_XDI_ADAPTER_H__ |
diff --git a/drivers/isdn/hardware/eicon/xdi_msg.h b/drivers/isdn/hardware/eicon/xdi_msg.h index 2498c349a32e..0646079bf466 100644 --- a/drivers/isdn/hardware/eicon/xdi_msg.h +++ b/drivers/isdn/hardware/eicon/xdi_msg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: xdi_msg.h,v 1.1.2.2 2001/02/16 08:40:36 armin Exp $ */ | 2 | /* $Id: xdi_msg.h,v 1.1.2.2 2001/02/16 08:40:36 armin Exp $ */ |
| 2 | 3 | ||
| 3 | #ifndef __DIVA_XDI_UM_CFG_MESSAGE_H__ | 4 | #ifndef __DIVA_XDI_UM_CFG_MESSAGE_H__ |
diff --git a/drivers/isdn/hardware/mISDN/Makefile b/drivers/isdn/hardware/mISDN/Makefile index 2987d990993f..422f9fd8ab9a 100644 --- a/drivers/isdn/hardware/mISDN/Makefile +++ b/drivers/isdn/hardware/mISDN/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the modular ISDN hardware drivers | 3 | # Makefile for the modular ISDN hardware drivers |
| 3 | # | 4 | # |
diff --git a/drivers/isdn/hardware/mISDN/hfc_multi.h b/drivers/isdn/hardware/mISDN/hfc_multi.h index c601f880141e..5acf826d913c 100644 --- a/drivers/isdn/hardware/mISDN/hfc_multi.h +++ b/drivers/isdn/hardware/mISDN/hfc_multi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * see notice in hfc_multi.c | 3 | * see notice in hfc_multi.c |
| 3 | */ | 4 | */ |
diff --git a/drivers/isdn/hardware/mISDN/hfc_multi_8xx.h b/drivers/isdn/hardware/mISDN/hfc_multi_8xx.h index 8a254747768e..b0d772340e16 100644 --- a/drivers/isdn/hardware/mISDN/hfc_multi_8xx.h +++ b/drivers/isdn/hardware/mISDN/hfc_multi_8xx.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * For License see notice in hfc_multi.c | 3 | * For License see notice in hfc_multi.c |
| 3 | * | 4 | * |
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.h b/drivers/isdn/hardware/mISDN/hfcsusb.h index 5f8f1d9cac11..e4fa2a2824af 100644 --- a/drivers/isdn/hardware/mISDN/hfcsusb.h +++ b/drivers/isdn/hardware/mISDN/hfcsusb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * hfcsusb.h, HFC-S USB mISDN driver | 3 | * hfcsusb.h, HFC-S USB mISDN driver |
| 3 | */ | 4 | */ |
diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile index 646368fe41c9..3eca9d23f1c2 100644 --- a/drivers/isdn/hisax/Makefile +++ b/drivers/isdn/hisax/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for the hisax ISDN device driver | 2 | # Makefile for the hisax ISDN device driver |
| 2 | 3 | ||
| 3 | # The target object and module list name. | 4 | # The target object and module list name. |
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.h b/drivers/isdn/hisax/hfc4s8s_l1.h index 6a8f89113d2f..4665b9d5df16 100644 --- a/drivers/isdn/hisax/hfc4s8s_l1.h +++ b/drivers/isdn/hisax/hfc4s8s_l1.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /***************************************************************/ | 2 | /***************************************************************/ |
| 2 | /* $Id: hfc4s8s_l1.h,v 1.1 2005/02/02 17:28:55 martinb1 Exp $ */ | 3 | /* $Id: hfc4s8s_l1.h,v 1.1 2005/02/02 17:28:55 martinb1 Exp $ */ |
| 3 | /* */ | 4 | /* */ |
diff --git a/drivers/isdn/hisax/hfc_usb.h b/drivers/isdn/hisax/hfc_usb.h index f987bf89da1a..9a212330e8a8 100644 --- a/drivers/isdn/hisax/hfc_usb.h +++ b/drivers/isdn/hisax/hfc_usb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * hfc_usb.h | 3 | * hfc_usb.h |
| 3 | * | 4 | * |
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.h b/drivers/isdn/hisax/hisax_fcpcipnp.h index aedef97827fe..1f64e9937aa1 100644 --- a/drivers/isdn/hisax/hisax_fcpcipnp.h +++ b/drivers/isdn/hisax/hisax_fcpcipnp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include "hisax_if.h" | 2 | #include "hisax_if.h" |
| 2 | #include "hisax_isac.h" | 3 | #include "hisax_isac.h" |
| 3 | #include <linux/pci.h> | 4 | #include <linux/pci.h> |
diff --git a/drivers/isdn/hisax/hisax_isac.h b/drivers/isdn/hisax/hisax_isac.h index 08890cf4d923..d7301da97991 100644 --- a/drivers/isdn/hisax/hisax_isac.h +++ b/drivers/isdn/hisax/hisax_isac.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __HISAX_ISAC_H__ | 2 | #ifndef __HISAX_ISAC_H__ |
| 2 | #define __HISAX_ISAC_H__ | 3 | #define __HISAX_ISAC_H__ |
| 3 | 4 | ||
diff --git a/drivers/isdn/i4l/Makefile b/drivers/isdn/i4l/Makefile index cb9d3bb9fae0..be77500c9e86 100644 --- a/drivers/isdn/i4l/Makefile +++ b/drivers/isdn/i4l/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for the kernel ISDN subsystem and device drivers. | 2 | # Makefile for the kernel ISDN subsystem and device drivers. |
| 2 | 3 | ||
| 3 | # Each configuration option enables a list of files. | 4 | # Each configuration option enables a list of files. |
diff --git a/drivers/isdn/mISDN/Makefile b/drivers/isdn/mISDN/Makefile index 0a6bd2a9e730..f3b4b7fa85f8 100644 --- a/drivers/isdn/mISDN/Makefile +++ b/drivers/isdn/mISDN/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the modular ISDN driver | 3 | # Makefile for the modular ISDN driver |
| 3 | # | 4 | # |
diff --git a/drivers/isdn/mISDN/dsp_hwec.h b/drivers/isdn/mISDN/dsp_hwec.h index bbca1eb5a888..c9cb0ea249da 100644 --- a/drivers/isdn/mISDN/dsp_hwec.h +++ b/drivers/isdn/mISDN/dsp_hwec.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * dsp_hwec.h | 3 | * dsp_hwec.h |
| 3 | */ | 4 | */ |
diff --git a/drivers/isdn/mISDN/l1oip.h b/drivers/isdn/mISDN/l1oip.h index 661c060ada49..7ea10db20e3a 100644 --- a/drivers/isdn/mISDN/l1oip.h +++ b/drivers/isdn/mISDN/l1oip.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * see notice in l1oip.c | 3 | * see notice in l1oip.c |
| 3 | */ | 4 | */ |
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile index 7d7b26552923..35980450db9b 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | # LED Core | 3 | # LED Core |
| 3 | obj-$(CONFIG_NEW_LEDS) += led-core.o | 4 | obj-$(CONFIG_NEW_LEDS) += led-core.o |
diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile index a72c43cffebf..9f2e868811e2 100644 --- a/drivers/leds/trigger/Makefile +++ b/drivers/leds/trigger/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o | 2 | obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o |
| 2 | obj-$(CONFIG_LEDS_TRIGGER_ONESHOT) += ledtrig-oneshot.o | 3 | obj-$(CONFIG_LEDS_TRIGGER_ONESHOT) += ledtrig-oneshot.o |
| 3 | obj-$(CONFIG_LEDS_TRIGGER_DISK) += ledtrig-disk.o | 4 | obj-$(CONFIG_LEDS_TRIGGER_DISK) += ledtrig-disk.o |
diff --git a/drivers/lightnvm/Makefile b/drivers/lightnvm/Makefile index 82d1a117fb27..2c3fd9d2c08c 100644 --- a/drivers/lightnvm/Makefile +++ b/drivers/lightnvm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for Open-Channel SSDs. | 3 | # Makefile for Open-Channel SSDs. |
| 3 | # | 4 | # |
diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile index 516eb65bcacc..ee803638e595 100644 --- a/drivers/macintosh/Makefile +++ b/drivers/macintosh/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Macintosh-specific device drivers. | 3 | # Makefile for the Macintosh-specific device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/macintosh/adb-iop.c b/drivers/macintosh/adb-iop.c index f5f4da3d0b67..dbc4a3e63396 100644 --- a/drivers/macintosh/adb-iop.c +++ b/drivers/macintosh/adb-iop.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * I/O Processor (IOP) ADB Driver | 3 | * I/O Processor (IOP) ADB Driver |
| 3 | * Written and (C) 1999 by Joshua M. Thompson (funaho@jurai.org) | 4 | * Written and (C) 1999 by Joshua M. Thompson (funaho@jurai.org) |
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c index 039dc8285fc5..289800b5235d 100644 --- a/drivers/macintosh/adb.c +++ b/drivers/macintosh/adb.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Device driver for the Apple Desktop Bus | 3 | * Device driver for the Apple Desktop Bus |
| 3 | * and the /dev/adb device on macintoshes. | 4 | * and the /dev/adb device on macintoshes. |
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index 09d72bb00d12..e091193104f7 100644 --- a/drivers/macintosh/adbhid.c +++ b/drivers/macintosh/adbhid.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * drivers/macintosh/adbhid.c | 3 | * drivers/macintosh/adbhid.c |
| 3 | * | 4 | * |
diff --git a/drivers/macintosh/ams/ams.h b/drivers/macintosh/ams/ams.h index 90f094d45450..fe8d596f9845 100644 --- a/drivers/macintosh/ams/ams.h +++ b/drivers/macintosh/ams/ams.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/i2c.h> | 2 | #include <linux/i2c.h> |
| 2 | #include <linux/input-polldev.h> | 3 | #include <linux/input-polldev.h> |
| 3 | #include <linux/kthread.h> | 4 | #include <linux/kthread.h> |
diff --git a/drivers/macintosh/ans-lcd.c b/drivers/macintosh/ans-lcd.c index 281fa9e6fc1f..1de81d922d8a 100644 --- a/drivers/macintosh/ans-lcd.c +++ b/drivers/macintosh/ans-lcd.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * /dev/lcd driver for Apple Network Servers. | 3 | * /dev/lcd driver for Apple Network Servers. |
| 3 | */ | 4 | */ |
diff --git a/drivers/macintosh/ans-lcd.h b/drivers/macintosh/ans-lcd.h index d795b9fd2db6..f0a6e4c68557 100644 --- a/drivers/macintosh/ans-lcd.h +++ b/drivers/macintosh/ans-lcd.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _PPC_ANS_LCD_H | 2 | #ifndef _PPC_ANS_LCD_H |
| 2 | #define _PPC_ANS_LCD_H | 3 | #define _PPC_ANS_LCD_H |
| 3 | 4 | ||
diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c index 87de8d9bcfad..9a6223add30e 100644 --- a/drivers/macintosh/macio-adb.c +++ b/drivers/macintosh/macio-adb.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Driver for the ADB controller in the Mac I/O (Hydra) chip. | 3 | * Driver for the ADB controller in the Mac I/O (Hydra) chip. |
| 3 | */ | 4 | */ |
diff --git a/drivers/macintosh/macio_sysfs.c b/drivers/macintosh/macio_sysfs.c index 281f5345661e..ca4fcffe454b 100644 --- a/drivers/macintosh/macio_sysfs.c +++ b/drivers/macintosh/macio_sysfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/stat.h> | 3 | #include <linux/stat.h> |
| 3 | #include <asm/macio.h> | 4 | #include <asm/macio.h> |
diff --git a/drivers/macintosh/via-cuda.c b/drivers/macintosh/via-cuda.c index 147da4edd021..98dd702eb867 100644 --- a/drivers/macintosh/via-cuda.c +++ b/drivers/macintosh/via-cuda.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Device driver for the Cuda and Egret system controllers found on PowerMacs | 3 | * Device driver for the Cuda and Egret system controllers found on PowerMacs |
| 3 | * and 68k Macs. | 4 | * and 68k Macs. |
diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c index 415c145c8299..4ba06a1695ea 100644 --- a/drivers/macintosh/via-macii.c +++ b/drivers/macintosh/via-macii.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Device driver for the via ADB on (many) Mac II-class machines | 3 | * Device driver for the via ADB on (many) Mac II-class machines |
| 3 | * | 4 | * |
diff --git a/drivers/macintosh/via-pmu-backlight.c b/drivers/macintosh/via-pmu-backlight.c index 6f68537c93ce..89ed51571b62 100644 --- a/drivers/macintosh/via-pmu-backlight.c +++ b/drivers/macintosh/via-pmu-backlight.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Backlight code for via-pmu | 3 | * Backlight code for via-pmu |
| 3 | * | 4 | * |
diff --git a/drivers/macintosh/via-pmu-event.h b/drivers/macintosh/via-pmu-event.h index 72c54de408e8..5e52109eb9a6 100644 --- a/drivers/macintosh/via-pmu-event.h +++ b/drivers/macintosh/via-pmu-event.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __VIA_PMU_EVENT_H | 2 | #ifndef __VIA_PMU_EVENT_H |
| 2 | #define __VIA_PMU_EVENT_H | 3 | #define __VIA_PMU_EVENT_H |
| 3 | 4 | ||
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index cce99f72e4ae..c4c2b3b85ebc 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Device driver for the via-pmu on Apple Powermacs. | 3 | * Device driver for the via-pmu on Apple Powermacs. |
| 3 | * | 4 | * |
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c index a411c5cb77a1..25465fb91ec9 100644 --- a/drivers/macintosh/via-pmu68k.c +++ b/drivers/macintosh/via-pmu68k.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Device driver for the PMU on 68K-based Apple PowerBooks | 3 | * Device driver for the PMU on 68K-based Apple PowerBooks |
| 3 | * | 4 | * |
diff --git a/drivers/mailbox/Makefile b/drivers/mailbox/Makefile index d54e41206e17..4896f8dcae95 100644 --- a/drivers/mailbox/Makefile +++ b/drivers/mailbox/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Generic MAILBOX API | 2 | # Generic MAILBOX API |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_MAILBOX) += mailbox.o | 4 | obj-$(CONFIG_MAILBOX) += mailbox.o |
diff --git a/drivers/mcb/Makefile b/drivers/mcb/Makefile index bcc7745774ab..77073c5928f4 100644 --- a/drivers/mcb/Makefile +++ b/drivers/mcb/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | obj-$(CONFIG_MCB) += mcb.o | 3 | obj-$(CONFIG_MCB) += mcb.o |
| 3 | 4 | ||
diff --git a/drivers/mcb/mcb-internal.h b/drivers/mcb/mcb-internal.h index d6e6933b19f1..3602cb3b2021 100644 --- a/drivers/mcb/mcb-internal.h +++ b/drivers/mcb/mcb-internal.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MCB_INTERNAL | 2 | #ifndef __MCB_INTERNAL |
| 2 | #define __MCB_INTERNAL | 3 | #define __MCB_INTERNAL |
| 3 | 4 | ||
diff --git a/drivers/md/Makefile b/drivers/md/Makefile index 786ec9e86d65..e94b6f9be941 100644 --- a/drivers/md/Makefile +++ b/drivers/md/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel software RAID and LVM drivers. | 3 | # Makefile for the kernel software RAID and LVM drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/md/bcache/Makefile b/drivers/md/bcache/Makefile index c488b846f831..d26b35195825 100644 --- a/drivers/md/bcache/Makefile +++ b/drivers/md/bcache/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | obj-$(CONFIG_BCACHE) += bcache.o | 3 | obj-$(CONFIG_BCACHE) += bcache.o |
| 3 | 4 | ||
diff --git a/drivers/md/bcache/alloc.c b/drivers/md/bcache/alloc.c index cacbe2dbd5c3..08035634795c 100644 --- a/drivers/md/bcache/alloc.c +++ b/drivers/md/bcache/alloc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Primary bucket allocation code | 3 | * Primary bucket allocation code |
| 3 | * | 4 | * |
diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h index 2ed9bd231d84..abd31e847f96 100644 --- a/drivers/md/bcache/bcache.h +++ b/drivers/md/bcache/bcache.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BCACHE_H | 2 | #ifndef _BCACHE_H |
| 2 | #define _BCACHE_H | 3 | #define _BCACHE_H |
| 3 | 4 | ||
diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c index 18526d44688d..e56d3ecdbfcb 100644 --- a/drivers/md/bcache/bset.c +++ b/drivers/md/bcache/bset.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Code for working with individual keys, and sorted sets of keys with in a | 3 | * Code for working with individual keys, and sorted sets of keys with in a |
| 3 | * btree node | 4 | * btree node |
diff --git a/drivers/md/bcache/bset.h b/drivers/md/bcache/bset.h index ae964624efb2..fa506c1aa524 100644 --- a/drivers/md/bcache/bset.h +++ b/drivers/md/bcache/bset.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BCACHE_BSET_H | 2 | #ifndef _BCACHE_BSET_H |
| 2 | #define _BCACHE_BSET_H | 3 | #define _BCACHE_BSET_H |
| 3 | 4 | ||
diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c index 866dcf78ff8e..658c54b3b07a 100644 --- a/drivers/md/bcache/btree.c +++ b/drivers/md/bcache/btree.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 2010 Kent Overstreet <kent.overstreet@gmail.com> | 3 | * Copyright (C) 2010 Kent Overstreet <kent.overstreet@gmail.com> |
| 3 | * | 4 | * |
diff --git a/drivers/md/bcache/btree.h b/drivers/md/bcache/btree.h index 73da1f5626cb..42204d61bc95 100644 --- a/drivers/md/bcache/btree.h +++ b/drivers/md/bcache/btree.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BCACHE_BTREE_H | 2 | #ifndef _BCACHE_BTREE_H |
| 2 | #define _BCACHE_BTREE_H | 3 | #define _BCACHE_BTREE_H |
| 3 | 4 | ||
diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h index 295b7e43f92c..965907ce1e20 100644 --- a/drivers/md/bcache/closure.h +++ b/drivers/md/bcache/closure.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _LINUX_CLOSURE_H | 2 | #ifndef _LINUX_CLOSURE_H |
| 2 | #define _LINUX_CLOSURE_H | 3 | #define _LINUX_CLOSURE_H |
| 3 | 4 | ||
diff --git a/drivers/md/bcache/debug.c b/drivers/md/bcache/debug.c index 61076eda2e6d..c7a02c4900da 100644 --- a/drivers/md/bcache/debug.c +++ b/drivers/md/bcache/debug.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Assorted bcache debug code | 3 | * Assorted bcache debug code |
| 3 | * | 4 | * |
diff --git a/drivers/md/bcache/debug.h b/drivers/md/bcache/debug.h index 1f63c195d247..acc48d3fa274 100644 --- a/drivers/md/bcache/debug.h +++ b/drivers/md/bcache/debug.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BCACHE_DEBUG_H | 2 | #ifndef _BCACHE_DEBUG_H |
| 2 | #define _BCACHE_DEBUG_H | 3 | #define _BCACHE_DEBUG_H |
| 3 | 4 | ||
diff --git a/drivers/md/bcache/extents.c b/drivers/md/bcache/extents.c index 243de0bf15cd..41c238fc3733 100644 --- a/drivers/md/bcache/extents.c +++ b/drivers/md/bcache/extents.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 2010 Kent Overstreet <kent.overstreet@gmail.com> | 3 | * Copyright (C) 2010 Kent Overstreet <kent.overstreet@gmail.com> |
| 3 | * | 4 | * |
diff --git a/drivers/md/bcache/extents.h b/drivers/md/bcache/extents.h index e2ed54054e7a..0cd3575afa1d 100644 --- a/drivers/md/bcache/extents.h +++ b/drivers/md/bcache/extents.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BCACHE_EXTENTS_H | 2 | #ifndef _BCACHE_EXTENTS_H |
| 2 | #define _BCACHE_EXTENTS_H | 3 | #define _BCACHE_EXTENTS_H |
| 3 | 4 | ||
diff --git a/drivers/md/bcache/io.c b/drivers/md/bcache/io.c index 7e871bdc0097..fac97ec2d0e2 100644 --- a/drivers/md/bcache/io.c +++ b/drivers/md/bcache/io.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Some low level IO code, and hacks for various block layer limitations | 3 | * Some low level IO code, and hacks for various block layer limitations |
| 3 | * | 4 | * |
diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c index 7e1d1c3ba33a..02a98ddb592d 100644 --- a/drivers/md/bcache/journal.c +++ b/drivers/md/bcache/journal.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * bcache journalling code, for btree insertions | 3 | * bcache journalling code, for btree insertions |
| 3 | * | 4 | * |
diff --git a/drivers/md/bcache/journal.h b/drivers/md/bcache/journal.h index e3c39457afbb..b5788199188f 100644 --- a/drivers/md/bcache/journal.h +++ b/drivers/md/bcache/journal.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BCACHE_JOURNAL_H | 2 | #ifndef _BCACHE_JOURNAL_H |
| 2 | #define _BCACHE_JOURNAL_H | 3 | #define _BCACHE_JOURNAL_H |
| 3 | 4 | ||
diff --git a/drivers/md/bcache/movinggc.c b/drivers/md/bcache/movinggc.c index f633b30c962e..d50c1c97da68 100644 --- a/drivers/md/bcache/movinggc.c +++ b/drivers/md/bcache/movinggc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Moving/copying garbage collector | 3 | * Moving/copying garbage collector |
| 3 | * | 4 | * |
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index 681b4f12b05a..3475d6628e21 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Main bcache entry point - handle a read or a write request and decide what to | 3 | * Main bcache entry point - handle a read or a write request and decide what to |
| 3 | * do with it; the make_request functions are called by the block layer. | 4 | * do with it; the make_request functions are called by the block layer. |
diff --git a/drivers/md/bcache/request.h b/drivers/md/bcache/request.h index 7689176951ce..dea0886b81c1 100644 --- a/drivers/md/bcache/request.h +++ b/drivers/md/bcache/request.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BCACHE_REQUEST_H_ | 2 | #ifndef _BCACHE_REQUEST_H_ |
| 2 | #define _BCACHE_REQUEST_H_ | 3 | #define _BCACHE_REQUEST_H_ |
| 3 | 4 | ||
diff --git a/drivers/md/bcache/stats.c b/drivers/md/bcache/stats.c index 0ca072c20d0d..d0831d5bcc87 100644 --- a/drivers/md/bcache/stats.c +++ b/drivers/md/bcache/stats.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * bcache stats code | 3 | * bcache stats code |
| 3 | * | 4 | * |
diff --git a/drivers/md/bcache/stats.h b/drivers/md/bcache/stats.h index adbff141c887..0b70f9de0c03 100644 --- a/drivers/md/bcache/stats.h +++ b/drivers/md/bcache/stats.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BCACHE_STATS_H_ | 2 | #ifndef _BCACHE_STATS_H_ |
| 2 | #define _BCACHE_STATS_H_ | 3 | #define _BCACHE_STATS_H_ |
| 3 | 4 | ||
diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c index 104c57cd666c..234b2f5b286d 100644 --- a/drivers/md/bcache/sysfs.c +++ b/drivers/md/bcache/sysfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * bcache sysfs interfaces | 3 | * bcache sysfs interfaces |
| 3 | * | 4 | * |
diff --git a/drivers/md/bcache/sysfs.h b/drivers/md/bcache/sysfs.h index 0526fe92a683..b54fe9602529 100644 --- a/drivers/md/bcache/sysfs.h +++ b/drivers/md/bcache/sysfs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BCACHE_SYSFS_H_ | 2 | #ifndef _BCACHE_SYSFS_H_ |
| 2 | #define _BCACHE_SYSFS_H_ | 3 | #define _BCACHE_SYSFS_H_ |
| 3 | 4 | ||
diff --git a/drivers/md/bcache/trace.c b/drivers/md/bcache/trace.c index b7820b0d2621..a9a73f560c04 100644 --- a/drivers/md/bcache/trace.c +++ b/drivers/md/bcache/trace.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "bcache.h" | 2 | #include "bcache.h" |
| 2 | #include "btree.h" | 3 | #include "btree.h" |
| 3 | 4 | ||
diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h index cb8d2ccbb6c6..f54b58282f77 100644 --- a/drivers/md/bcache/util.h +++ b/drivers/md/bcache/util.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #ifndef _BCACHE_UTIL_H | 3 | #ifndef _BCACHE_UTIL_H |
| 3 | #define _BCACHE_UTIL_H | 4 | #define _BCACHE_UTIL_H |
diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c index e663ca082183..70454f2ad2fa 100644 --- a/drivers/md/bcache/writeback.c +++ b/drivers/md/bcache/writeback.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * background writeback - scan btree for dirty data and write it to the backing | 3 | * background writeback - scan btree for dirty data and write it to the backing |
| 3 | * device | 4 | * device |
diff --git a/drivers/md/bcache/writeback.h b/drivers/md/bcache/writeback.h index e35421d20d2e..151544740148 100644 --- a/drivers/md/bcache/writeback.h +++ b/drivers/md/bcache/writeback.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BCACHE_WRITEBACK_H | 2 | #ifndef _BCACHE_WRITEBACK_H |
| 2 | #define _BCACHE_WRITEBACK_H | 3 | #define _BCACHE_WRITEBACK_H |
| 3 | 4 | ||
diff --git a/drivers/md/bitmap.h b/drivers/md/bitmap.h index d15721ac07a6..5df35ca90f58 100644 --- a/drivers/md/bitmap.h +++ b/drivers/md/bitmap.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * bitmap.h: Copyright (C) Peter T. Breuer (ptb@ot.uc3m.es) 2003 | 3 | * bitmap.h: Copyright (C) Peter T. Breuer (ptb@ot.uc3m.es) 2003 |
| 3 | * | 4 | * |
diff --git a/drivers/md/dm-builtin.c b/drivers/md/dm-builtin.c index f092771878c2..8eb52e425141 100644 --- a/drivers/md/dm-builtin.c +++ b/drivers/md/dm-builtin.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "dm-core.h" | 2 | #include "dm-core.h" |
| 2 | 3 | ||
| 3 | /* | 4 | /* |
diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c index a1a5eec783cc..29bc51084c82 100644 --- a/drivers/md/dm-stats.c +++ b/drivers/md/dm-stats.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/errno.h> | 2 | #include <linux/errno.h> |
| 2 | #include <linux/numa.h> | 3 | #include <linux/numa.h> |
| 3 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
diff --git a/drivers/md/dm-stats.h b/drivers/md/dm-stats.h index f1c0956e3843..2ddfae678f32 100644 --- a/drivers/md/dm-stats.h +++ b/drivers/md/dm-stats.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DM_STATS_H | 2 | #ifndef DM_STATS_H |
| 2 | #define DM_STATS_H | 3 | #define DM_STATS_H |
| 3 | 4 | ||
diff --git a/drivers/md/linear.h b/drivers/md/linear.h index 8d392e6098b3..8381d651d4ed 100644 --- a/drivers/md/linear.h +++ b/drivers/md/linear.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _LINEAR_H | 2 | #ifndef _LINEAR_H |
| 2 | #define _LINEAR_H | 3 | #define _LINEAR_H |
| 3 | 4 | ||
diff --git a/drivers/md/md-cluster.h b/drivers/md/md-cluster.h index 274016177983..c0240708f443 100644 --- a/drivers/md/md-cluster.h +++ b/drivers/md/md-cluster.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | 3 | ||
| 3 | #ifndef _MD_CLUSTER_H | 4 | #ifndef _MD_CLUSTER_H |
diff --git a/drivers/md/multipath.h b/drivers/md/multipath.h index 717c60f62898..0adb941f485a 100644 --- a/drivers/md/multipath.h +++ b/drivers/md/multipath.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _MULTIPATH_H | 2 | #ifndef _MULTIPATH_H |
| 2 | #define _MULTIPATH_H | 3 | #define _MULTIPATH_H |
| 3 | 4 | ||
diff --git a/drivers/md/persistent-data/Makefile b/drivers/md/persistent-data/Makefile index ff528792c358..66be7c66479a 100644 --- a/drivers/md/persistent-data/Makefile +++ b/drivers/md/persistent-data/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_DM_PERSISTENT_DATA) += dm-persistent-data.o | 2 | obj-$(CONFIG_DM_PERSISTENT_DATA) += dm-persistent-data.o |
| 2 | dm-persistent-data-objs := \ | 3 | dm-persistent-data-objs := \ |
| 3 | dm-array.o \ | 4 | dm-array.o \ |
diff --git a/drivers/md/raid0.h b/drivers/md/raid0.h index 7127a623f5da..540e65d92642 100644 --- a/drivers/md/raid0.h +++ b/drivers/md/raid0.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _RAID0_H | 2 | #ifndef _RAID0_H |
| 2 | #define _RAID0_H | 3 | #define _RAID0_H |
| 3 | 4 | ||
diff --git a/drivers/md/raid1-10.c b/drivers/md/raid1-10.c index 9f2670b45f31..400001b815db 100644 --- a/drivers/md/raid1-10.c +++ b/drivers/md/raid1-10.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* Maximum size of each resync request */ | 2 | /* Maximum size of each resync request */ |
| 2 | #define RESYNC_BLOCK_SIZE (64*1024) | 3 | #define RESYNC_BLOCK_SIZE (64*1024) |
| 3 | #define RESYNC_PAGES ((RESYNC_BLOCK_SIZE + PAGE_SIZE-1) / PAGE_SIZE) | 4 | #define RESYNC_PAGES ((RESYNC_BLOCK_SIZE + PAGE_SIZE-1) / PAGE_SIZE) |
diff --git a/drivers/md/raid1.h b/drivers/md/raid1.h index c8894ef1e9d2..c7294e7557e0 100644 --- a/drivers/md/raid1.h +++ b/drivers/md/raid1.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _RAID1_H | 2 | #ifndef _RAID1_H |
| 2 | #define _RAID1_H | 3 | #define _RAID1_H |
| 3 | 4 | ||
diff --git a/drivers/md/raid10.h b/drivers/md/raid10.h index 735ce1a3d260..abceccab6671 100644 --- a/drivers/md/raid10.h +++ b/drivers/md/raid10.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _RAID10_H | 2 | #ifndef _RAID10_H |
| 2 | #define _RAID10_H | 3 | #define _RAID10_H |
| 3 | 4 | ||
diff --git a/drivers/md/raid5-log.h b/drivers/md/raid5-log.h index 328d67aedda4..7f9ad5f7cda0 100644 --- a/drivers/md/raid5-log.h +++ b/drivers/md/raid5-log.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _RAID5_LOG_H | 2 | #ifndef _RAID5_LOG_H |
| 2 | #define _RAID5_LOG_H | 3 | #define _RAID5_LOG_H |
| 3 | 4 | ||
diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h index f6536399677a..2e6123825095 100644 --- a/drivers/md/raid5.h +++ b/drivers/md/raid5.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _RAID5_H | 2 | #ifndef _RAID5_H |
| 2 | #define _RAID5_H | 3 | #define _RAID5_H |
| 3 | 4 | ||
diff --git a/drivers/media/Makefile b/drivers/media/Makefile index 044503aa8801..594b462ddf0e 100644 --- a/drivers/media/Makefile +++ b/drivers/media/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel multimedia device drivers. | 3 | # Makefile for the kernel multimedia device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/media/cec/Makefile b/drivers/media/cec/Makefile index 3353c1741961..41ee3325e1ea 100644 --- a/drivers/media/cec/Makefile +++ b/drivers/media/cec/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | cec-objs := cec-core.o cec-adap.o cec-api.o cec-edid.o | 2 | cec-objs := cec-core.o cec-adap.o cec-api.o cec-edid.o |
| 2 | 3 | ||
| 3 | ifeq ($(CONFIG_CEC_NOTIFIER),y) | 4 | ifeq ($(CONFIG_CEC_NOTIFIER),y) |
diff --git a/drivers/media/common/b2c2/Makefile b/drivers/media/common/b2c2/Makefile index 24993a5b38ba..73df4a334eda 100644 --- a/drivers/media/common/b2c2/Makefile +++ b/drivers/media/common/b2c2/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | b2c2-flexcop-objs += flexcop.o flexcop-fe-tuner.o flexcop-i2c.o | 2 | b2c2-flexcop-objs += flexcop.o flexcop-fe-tuner.o flexcop-i2c.o |
| 2 | b2c2-flexcop-objs += flexcop-sram.o flexcop-eeprom.o flexcop-misc.o | 3 | b2c2-flexcop-objs += flexcop-sram.o flexcop-eeprom.o flexcop-misc.o |
| 3 | b2c2-flexcop-objs += flexcop-hw-filter.o | 4 | b2c2-flexcop-objs += flexcop-hw-filter.o |
diff --git a/drivers/media/common/b2c2/flexcop-common.h b/drivers/media/common/b2c2/flexcop-common.h index 2533574c0cf4..b7e5e4c17acb 100644 --- a/drivers/media/common/b2c2/flexcop-common.h +++ b/drivers/media/common/b2c2/flexcop-common.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III | 3 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III |
| 3 | * flexcop-common.h - common header file for device-specific source files | 4 | * flexcop-common.h - common header file for device-specific source files |
diff --git a/drivers/media/common/b2c2/flexcop-eeprom.c b/drivers/media/common/b2c2/flexcop-eeprom.c index 844c7836c2a6..0f2151cd36f2 100644 --- a/drivers/media/common/b2c2/flexcop-eeprom.c +++ b/drivers/media/common/b2c2/flexcop-eeprom.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III | 3 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III |
| 3 | * flexcop-eeprom.c - eeprom access methods (currently only MAC address reading) | 4 | * flexcop-eeprom.c - eeprom access methods (currently only MAC address reading) |
diff --git a/drivers/media/common/b2c2/flexcop-fe-tuner.c b/drivers/media/common/b2c2/flexcop-fe-tuner.c index 7636606f0be5..a1ce3e8eb1d3 100644 --- a/drivers/media/common/b2c2/flexcop-fe-tuner.c +++ b/drivers/media/common/b2c2/flexcop-fe-tuner.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III | 3 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III |
| 3 | * flexcop-fe-tuner.c - methods for frontend attachment and DiSEqC controlling | 4 | * flexcop-fe-tuner.c - methods for frontend attachment and DiSEqC controlling |
diff --git a/drivers/media/common/b2c2/flexcop-hw-filter.c b/drivers/media/common/b2c2/flexcop-hw-filter.c index 8220257903ef..335f30a54ba8 100644 --- a/drivers/media/common/b2c2/flexcop-hw-filter.c +++ b/drivers/media/common/b2c2/flexcop-hw-filter.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III | 3 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III |
| 3 | * flexcop-hw-filter.c - pid and mac address filtering and control functions | 4 | * flexcop-hw-filter.c - pid and mac address filtering and control functions |
diff --git a/drivers/media/common/b2c2/flexcop-i2c.c b/drivers/media/common/b2c2/flexcop-i2c.c index 58d39a59fc09..564da6fa900d 100644 --- a/drivers/media/common/b2c2/flexcop-i2c.c +++ b/drivers/media/common/b2c2/flexcop-i2c.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III | 3 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III |
| 3 | * flexcop-i2c.c - flexcop internal 2Wire bus (I2C) and dvb i2c initialization | 4 | * flexcop-i2c.c - flexcop internal 2Wire bus (I2C) and dvb i2c initialization |
diff --git a/drivers/media/common/b2c2/flexcop-misc.c b/drivers/media/common/b2c2/flexcop-misc.c index bb0d95fe64f9..83d01d3a81cc 100644 --- a/drivers/media/common/b2c2/flexcop-misc.c +++ b/drivers/media/common/b2c2/flexcop-misc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III | 3 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III |
| 3 | * flexcop-misc.c - miscellaneous functions | 4 | * flexcop-misc.c - miscellaneous functions |
diff --git a/drivers/media/common/b2c2/flexcop-reg.h b/drivers/media/common/b2c2/flexcop-reg.h index 835c54d60e74..dd7c962db565 100644 --- a/drivers/media/common/b2c2/flexcop-reg.h +++ b/drivers/media/common/b2c2/flexcop-reg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III | 3 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III |
| 3 | * flexcop-reg.h - register abstraction for FlexCopII, FlexCopIIb and FlexCopIII | 4 | * flexcop-reg.h - register abstraction for FlexCopII, FlexCopIIb and FlexCopIII |
diff --git a/drivers/media/common/b2c2/flexcop-sram.c b/drivers/media/common/b2c2/flexcop-sram.c index 185c285f70fc..d97962eb0112 100644 --- a/drivers/media/common/b2c2/flexcop-sram.c +++ b/drivers/media/common/b2c2/flexcop-sram.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III | 3 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III |
| 3 | * flexcop-sram.c - functions for controlling the SRAM | 4 | * flexcop-sram.c - functions for controlling the SRAM |
diff --git a/drivers/media/common/b2c2/flexcop.h b/drivers/media/common/b2c2/flexcop.h index 8942bdacbf61..911ece59ea02 100644 --- a/drivers/media/common/b2c2/flexcop.h +++ b/drivers/media/common/b2c2/flexcop.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III | 3 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III |
| 3 | * flexcop.h - private header file for all flexcop-chip-source files | 4 | * flexcop.h - private header file for all flexcop-chip-source files |
diff --git a/drivers/media/common/b2c2/flexcop_ibi_value_be.h b/drivers/media/common/b2c2/flexcop_ibi_value_be.h index 8f64bdbd72bb..c97a0d6d7b3a 100644 --- a/drivers/media/common/b2c2/flexcop_ibi_value_be.h +++ b/drivers/media/common/b2c2/flexcop_ibi_value_be.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III | 2 | /* Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III |
| 2 | * register descriptions | 3 | * register descriptions |
| 3 | * see flexcop.c for copyright information | 4 | * see flexcop.c for copyright information |
diff --git a/drivers/media/common/b2c2/flexcop_ibi_value_le.h b/drivers/media/common/b2c2/flexcop_ibi_value_le.h index c75830d7d942..5db3b46f21ee 100644 --- a/drivers/media/common/b2c2/flexcop_ibi_value_le.h +++ b/drivers/media/common/b2c2/flexcop_ibi_value_le.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III | 2 | /* Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III |
| 2 | * register descriptions | 3 | * register descriptions |
| 3 | * see flexcop.c for copyright information | 4 | * see flexcop.c for copyright information |
diff --git a/drivers/media/common/btcx-risc.h b/drivers/media/common/btcx-risc.h index 03583ef90506..76dc16f402b9 100644 --- a/drivers/media/common/btcx-risc.h +++ b/drivers/media/common/btcx-risc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | */ | 3 | */ |
| 3 | struct btcx_riscmem { | 4 | struct btcx_riscmem { |
diff --git a/drivers/media/common/cypress_firmware.h b/drivers/media/common/cypress_firmware.h index 1e4f27356205..0aa46e602b07 100644 --- a/drivers/media/common/cypress_firmware.h +++ b/drivers/media/common/cypress_firmware.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) | 3 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) |
| 3 | * see dvb-usb-init.c for copyright information. | 4 | * see dvb-usb-init.c for copyright information. |
diff --git a/drivers/media/common/saa7146/saa7146_i2c.c b/drivers/media/common/saa7146/saa7146_i2c.c index 75897f95e4b4..f9e099d812c8 100644 --- a/drivers/media/common/saa7146/saa7146_i2c.c +++ b/drivers/media/common/saa7146/saa7146_i2c.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | 2 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 2 | 3 | ||
| 3 | #include <media/drv-intf/saa7146_vv.h> | 4 | #include <media/drv-intf/saa7146_vv.h> |
diff --git a/drivers/media/common/saa7146/saa7146_vbi.c b/drivers/media/common/saa7146/saa7146_vbi.c index d79e4d7ecd9f..371c6f8606de 100644 --- a/drivers/media/common/saa7146/saa7146_vbi.c +++ b/drivers/media/common/saa7146/saa7146_vbi.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <media/drv-intf/saa7146_vv.h> | 2 | #include <media/drv-intf/saa7146_vv.h> |
| 2 | 3 | ||
| 3 | static int vbi_pixel_to_capture = 720 * 2; | 4 | static int vbi_pixel_to_capture = 720 * 2; |
diff --git a/drivers/media/common/siano/Makefile b/drivers/media/common/siano/Makefile index 4c0567f106b2..88e2b7ffc537 100644 --- a/drivers/media/common/siano/Makefile +++ b/drivers/media/common/siano/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | smsmdtv-objs := smscoreapi.o sms-cards.o smsendian.o | 2 | smsmdtv-objs := smscoreapi.o sms-cards.o smsendian.o |
| 2 | smsdvb-objs := smsdvb-main.o | 3 | smsdvb-objs := smsdvb-main.o |
| 3 | 4 | ||
diff --git a/drivers/media/dvb-core/Makefile b/drivers/media/dvb-core/Makefile index 281bc89576e6..47e2e391bfb8 100644 --- a/drivers/media/dvb-core/Makefile +++ b/drivers/media/dvb-core/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel DVB device drivers. | 3 | # Makefile for the kernel DVB device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/media/dvb-core/dvb-usb-ids.h b/drivers/media/dvb-core/dvb-usb-ids.h index 5b6041d462bc..54d7d8a48b18 100644 --- a/drivers/media/dvb-core/dvb-usb-ids.h +++ b/drivers/media/dvb-core/dvb-usb-ids.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* dvb-usb-ids.h is part of the DVB USB library. | 2 | /* dvb-usb-ids.h is part of the DVB USB library. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de) see | 4 | * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de) see |
diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile index f45f6a4a4371..d025eb373842 100644 --- a/drivers/media/dvb-frontends/Makefile +++ b/drivers/media/dvb-frontends/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel DVB frontend device drivers. | 3 | # Makefile for the kernel DVB frontend device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/media/dvb-frontends/dib7000m.h b/drivers/media/dvb-frontends/dib7000m.h index 8f84dfa9bb58..df7ecb4314cd 100644 --- a/drivers/media/dvb-frontends/dib7000m.h +++ b/drivers/media/dvb-frontends/dib7000m.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DIB7000M_H | 2 | #ifndef DIB7000M_H |
| 2 | #define DIB7000M_H | 3 | #define DIB7000M_H |
| 3 | 4 | ||
diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h index 205fbbff632b..2e10b5ccce67 100644 --- a/drivers/media/dvb-frontends/dib7000p.h +++ b/drivers/media/dvb-frontends/dib7000p.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DIB7000P_H | 2 | #ifndef DIB7000P_H |
| 2 | #define DIB7000P_H | 3 | #define DIB7000P_H |
| 3 | 4 | ||
diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h index 75cc8e47ec8f..b920fe769021 100644 --- a/drivers/media/dvb-frontends/dib8000.h +++ b/drivers/media/dvb-frontends/dib8000.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DIB8000_H | 2 | #ifndef DIB8000_H |
| 2 | #define DIB8000_H | 3 | #define DIB8000_H |
| 3 | 4 | ||
diff --git a/drivers/media/dvb-frontends/dib9000.h b/drivers/media/dvb-frontends/dib9000.h index 40883b41e66b..bb03362ac7a3 100644 --- a/drivers/media/dvb-frontends/dib9000.h +++ b/drivers/media/dvb-frontends/dib9000.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DIB9000_H | 2 | #ifndef DIB9000_H |
| 2 | #define DIB9000_H | 3 | #define DIB9000_H |
| 3 | 4 | ||
diff --git a/drivers/media/dvb-frontends/dibx000_common.h b/drivers/media/dvb-frontends/dibx000_common.h index 61f4152f24ee..8784af962eba 100644 --- a/drivers/media/dvb-frontends/dibx000_common.h +++ b/drivers/media/dvb-frontends/dibx000_common.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DIBX000_COMMON_H | 2 | #ifndef DIBX000_COMMON_H |
| 2 | #define DIBX000_COMMON_H | 3 | #define DIBX000_COMMON_H |
| 3 | 4 | ||
diff --git a/drivers/media/dvb-frontends/drxk.h b/drivers/media/dvb-frontends/drxk.h index a629897eb905..eb9bdc9f59c4 100644 --- a/drivers/media/dvb-frontends/drxk.h +++ b/drivers/media/dvb-frontends/drxk.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _DRXK_H_ | 2 | #ifndef _DRXK_H_ |
| 2 | #define _DRXK_H_ | 3 | #define _DRXK_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/dvb-frontends/drxk_hard.h b/drivers/media/dvb-frontends/drxk_hard.h index 9ed88e014942..a850a876deee 100644 --- a/drivers/media/dvb-frontends/drxk_hard.h +++ b/drivers/media/dvb-frontends/drxk_hard.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include "drxk_map.h" | 2 | #include "drxk_map.h" |
| 2 | 3 | ||
| 3 | #define DRXK_VERSION_MAJOR 0 | 4 | #define DRXK_VERSION_MAJOR 0 |
diff --git a/drivers/media/dvb-frontends/drxk_map.h b/drivers/media/dvb-frontends/drxk_map.h index 761613f9fd5a..9234ef4fb68d 100644 --- a/drivers/media/dvb-frontends/drxk_map.h +++ b/drivers/media/dvb-frontends/drxk_map.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #define AUD_COMM_EXEC__A 0x1000000 | 2 | #define AUD_COMM_EXEC__A 0x1000000 |
| 2 | #define AUD_COMM_EXEC_STOP 0x0 | 3 | #define AUD_COMM_EXEC_STOP 0x0 |
| 3 | #define FEC_COMM_EXEC__A 0x1C00000 | 4 | #define FEC_COMM_EXEC__A 0x1C00000 |
diff --git a/drivers/media/dvb-frontends/dvb-pll.h b/drivers/media/dvb-frontends/dvb-pll.h index bf9602a88b6c..6aaa9c6bff9c 100644 --- a/drivers/media/dvb-frontends/dvb-pll.h +++ b/drivers/media/dvb-frontends/dvb-pll.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * descriptions + helper functions for simple dvb plls. | 3 | * descriptions + helper functions for simple dvb plls. |
| 3 | */ | 4 | */ |
diff --git a/drivers/media/dvb-frontends/nxt6000_priv.h b/drivers/media/dvb-frontends/nxt6000_priv.h index 0422e580038a..d317df02c8d7 100644 --- a/drivers/media/dvb-frontends/nxt6000_priv.h +++ b/drivers/media/dvb-frontends/nxt6000_priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Public Include File for DRV6000 users | 3 | * Public Include File for DRV6000 users |
| 3 | * (ie. NxtWave Communications - NXT6000 demodulator driver) | 4 | * (ie. NxtWave Communications - NXT6000 demodulator driver) |
diff --git a/drivers/media/dvb-frontends/si21xx.h b/drivers/media/dvb-frontends/si21xx.h index b1be62f1983a..43d480bb6ea2 100644 --- a/drivers/media/dvb-frontends/si21xx.h +++ b/drivers/media/dvb-frontends/si21xx.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef SI21XX_H | 2 | #ifndef SI21XX_H |
| 2 | #define SI21XX_H | 3 | #define SI21XX_H |
| 3 | 4 | ||
diff --git a/drivers/media/dvb-frontends/sp887x.h b/drivers/media/dvb-frontends/sp887x.h index 412f011e6dfd..a680cc22379c 100644 --- a/drivers/media/dvb-frontends/sp887x.h +++ b/drivers/media/dvb-frontends/sp887x.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | Driver for the Spase sp887x demodulator | 3 | Driver for the Spase sp887x demodulator |
| 3 | */ | 4 | */ |
diff --git a/drivers/media/dvb-frontends/tda18271c2dd.h b/drivers/media/dvb-frontends/tda18271c2dd.h index e6ccf240f54c..289653db68e4 100644 --- a/drivers/media/dvb-frontends/tda18271c2dd.h +++ b/drivers/media/dvb-frontends/tda18271c2dd.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _TDA18271C2DD_H_ | 2 | #ifndef _TDA18271C2DD_H_ |
| 2 | #define _TDA18271C2DD_H_ | 3 | #define _TDA18271C2DD_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/dvb-frontends/tda18271c2dd_maps.h b/drivers/media/dvb-frontends/tda18271c2dd_maps.h index f3bca5c237d7..5f75516bc0cb 100644 --- a/drivers/media/dvb-frontends/tda18271c2dd_maps.h +++ b/drivers/media/dvb-frontends/tda18271c2dd_maps.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | enum HF_S { | 2 | enum HF_S { |
| 2 | HF_None = 0, HF_B, HF_DK, HF_G, HF_I, HF_L, HF_L1, HF_MN, HF_FM_Radio, | 3 | HF_None = 0, HF_B, HF_DK, HF_G, HF_I, HF_L, HF_L1, HF_MN, HF_FM_Radio, |
| 3 | HF_AnalogMax, HF_DVBT_6MHZ, HF_DVBT_7MHZ, HF_DVBT_8MHZ, | 4 | HF_AnalogMax, HF_DVBT_6MHZ, HF_DVBT_7MHZ, HF_DVBT_8MHZ, |
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile index c843c181dfb9..f104650d6000 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | msp3400-objs := msp3400-driver.o msp3400-kthreads.o | 2 | msp3400-objs := msp3400-driver.o msp3400-kthreads.o |
| 2 | obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o | 3 | obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o |
| 3 | 4 | ||
diff --git a/drivers/media/i2c/msp3400-driver.h b/drivers/media/i2c/msp3400-driver.h index a8702aca187a..b6c7698bce5a 100644 --- a/drivers/media/i2c/msp3400-driver.h +++ b/drivers/media/i2c/msp3400-driver.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | */ | 3 | */ |
| 3 | 4 | ||
diff --git a/drivers/media/i2c/soc_camera/Makefile b/drivers/media/i2c/soc_camera/Makefile index 78532a7fb8e2..faa2df8901d2 100644 --- a/drivers/media/i2c/soc_camera/Makefile +++ b/drivers/media/i2c/soc_camera/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074.o | 2 | obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074.o |
| 2 | obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o | 3 | obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o |
| 3 | obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o | 4 | obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o |
diff --git a/drivers/media/i2c/tea6415c.h b/drivers/media/i2c/tea6415c.h index 3a47d697536e..f43228207445 100644 --- a/drivers/media/i2c/tea6415c.h +++ b/drivers/media/i2c/tea6415c.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __INCLUDED_TEA6415C__ | 2 | #ifndef __INCLUDED_TEA6415C__ |
| 2 | #define __INCLUDED_TEA6415C__ | 3 | #define __INCLUDED_TEA6415C__ |
| 3 | 4 | ||
diff --git a/drivers/media/i2c/tea6420.h b/drivers/media/i2c/tea6420.h index 4aa3edb3e193..07f9d72a86bb 100644 --- a/drivers/media/i2c/tea6420.h +++ b/drivers/media/i2c/tea6420.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __INCLUDED_TEA6420__ | 2 | #ifndef __INCLUDED_TEA6420__ |
| 2 | #define __INCLUDED_TEA6420__ | 3 | #define __INCLUDED_TEA6420__ |
| 3 | 4 | ||
diff --git a/drivers/media/mmc/Makefile b/drivers/media/mmc/Makefile index 31e297a202fb..e847aa82ae41 100644 --- a/drivers/media/mmc/Makefile +++ b/drivers/media/mmc/Makefile | |||
| @@ -1 +1,2 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-y += siano/ | 2 | obj-y += siano/ |
diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile index a7e8af0f64a7..1ab759e9b1bb 100644 --- a/drivers/media/pci/Makefile +++ b/drivers/media/pci/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel multimedia device drivers. | 3 | # Makefile for the kernel multimedia device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/media/pci/b2c2/Makefile b/drivers/media/pci/b2c2/Makefile index b894320a5f21..35d6835ae43e 100644 --- a/drivers/media/pci/b2c2/Makefile +++ b/drivers/media/pci/b2c2/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ifneq ($(CONFIG_DVB_B2C2_FLEXCOP_PCI),) | 2 | ifneq ($(CONFIG_DVB_B2C2_FLEXCOP_PCI),) |
| 2 | b2c2-flexcop-pci-objs += flexcop-dma.o | 3 | b2c2-flexcop-pci-objs += flexcop-dma.o |
| 3 | endif | 4 | endif |
diff --git a/drivers/media/pci/b2c2/flexcop-dma.c b/drivers/media/pci/b2c2/flexcop-dma.c index 913dc97f8b49..f07610a1646d 100644 --- a/drivers/media/pci/b2c2/flexcop-dma.c +++ b/drivers/media/pci/b2c2/flexcop-dma.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III | 3 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III |
| 3 | * flexcop-dma.c - configuring and controlling the DMA of the FlexCop | 4 | * flexcop-dma.c - configuring and controlling the DMA of the FlexCop |
diff --git a/drivers/media/pci/bt8xx/Makefile b/drivers/media/pci/bt8xx/Makefile index 2d4c3dd88be1..009f1dc1521f 100644 --- a/drivers/media/pci/bt8xx/Makefile +++ b/drivers/media/pci/bt8xx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \ | 2 | bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \ |
| 2 | bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o \ | 3 | bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o \ |
| 3 | bttv-input.o bttv-audio-hook.o btcx-risc.o | 4 | bttv-input.o bttv-audio-hook.o btcx-risc.o |
diff --git a/drivers/media/pci/bt8xx/btcx-risc.h b/drivers/media/pci/bt8xx/btcx-risc.h index 1ed7a000160a..dc774a64cd1f 100644 --- a/drivers/media/pci/bt8xx/btcx-risc.h +++ b/drivers/media/pci/bt8xx/btcx-risc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | struct btcx_riscmem { | 2 | struct btcx_riscmem { |
| 2 | unsigned int size; | 3 | unsigned int size; |
| 3 | __le32 *cpu; | 4 | __le32 *cpu; |
diff --git a/drivers/media/pci/bt8xx/bttv.h b/drivers/media/pci/bt8xx/bttv.h index 91301c3cad1e..eb67e362acf7 100644 --- a/drivers/media/pci/bt8xx/bttv.h +++ b/drivers/media/pci/bt8xx/bttv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * | 3 | * |
| 3 | * bttv - Bt848 frame grabber driver | 4 | * bttv - Bt848 frame grabber driver |
diff --git a/drivers/media/pci/bt8xx/dst_priv.h b/drivers/media/pci/bt8xx/dst_priv.h index 3974a4c6ebe7..a4319d41d141 100644 --- a/drivers/media/pci/bt8xx/dst_priv.h +++ b/drivers/media/pci/bt8xx/dst_priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * dst-bt878.h: part of the DST driver for the TwinHan DST Frontend | 3 | * dst-bt878.h: part of the DST driver for the TwinHan DST Frontend |
| 3 | * | 4 | * |
diff --git a/drivers/media/pci/cx18/Makefile b/drivers/media/pci/cx18/Makefile index d3ff1545c2c5..98914a40f6ac 100644 --- a/drivers/media/pci/cx18/Makefile +++ b/drivers/media/pci/cx18/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | cx18-objs := cx18-driver.o cx18-cards.o cx18-i2c.o cx18-firmware.o cx18-gpio.o \ | 2 | cx18-objs := cx18-driver.o cx18-cards.o cx18-i2c.o cx18-firmware.o cx18-gpio.o \ |
| 2 | cx18-queue.o cx18-streams.o cx18-fileops.o cx18-ioctl.o cx18-controls.o \ | 3 | cx18-queue.o cx18-streams.o cx18-fileops.o cx18-ioctl.o cx18-controls.o \ |
| 3 | cx18-mailbox.o cx18-vbi.o cx18-audio.o cx18-video.o cx18-irq.o \ | 4 | cx18-mailbox.o cx18-vbi.o cx18-audio.o cx18-video.o cx18-irq.o \ |
diff --git a/drivers/media/pci/cx23885/Makefile b/drivers/media/pci/cx23885/Makefile index a2cbdcf15a8c..b8bf7806124b 100644 --- a/drivers/media/pci/cx23885/Makefile +++ b/drivers/media/pci/cx23885/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | cx23885-objs := cx23885-cards.o cx23885-video.o cx23885-vbi.o \ | 2 | cx23885-objs := cx23885-cards.o cx23885-video.o cx23885-vbi.o \ |
| 2 | cx23885-core.o cx23885-i2c.o cx23885-dvb.o cx23885-417.o \ | 3 | cx23885-core.o cx23885-i2c.o cx23885-dvb.o cx23885-417.o \ |
| 3 | cx23885-ioctl.o cx23885-ir.o cx23885-av.o cx23885-input.o \ | 4 | cx23885-ioctl.o cx23885-ir.o cx23885-av.o cx23885-input.o \ |
diff --git a/drivers/media/pci/cx23885/cx23885-f300.h b/drivers/media/pci/cx23885/cx23885-f300.h index be14d7de7cd8..34aef3610aa9 100644 --- a/drivers/media/pci/cx23885/cx23885-f300.h +++ b/drivers/media/pci/cx23885/cx23885-f300.h | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | extern int f300_set_voltage(struct dvb_frontend *fe, | 2 | extern int f300_set_voltage(struct dvb_frontend *fe, |
| 2 | enum fe_sec_voltage voltage); | 3 | enum fe_sec_voltage voltage); |
diff --git a/drivers/media/pci/cx25821/Makefile b/drivers/media/pci/cx25821/Makefile index c8f8598a2b86..d14d65b1b042 100644 --- a/drivers/media/pci/cx25821/Makefile +++ b/drivers/media/pci/cx25821/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | cx25821-y := cx25821-core.o cx25821-cards.o cx25821-i2c.o \ | 2 | cx25821-y := cx25821-core.o cx25821-cards.o cx25821-i2c.o \ |
| 2 | cx25821-gpio.o cx25821-medusa-video.o \ | 3 | cx25821-gpio.o cx25821-medusa-video.o \ |
| 3 | cx25821-video.o | 4 | cx25821-video.o |
diff --git a/drivers/media/pci/cx88/Makefile b/drivers/media/pci/cx88/Makefile index d3679c3ee248..86646eee4e6b 100644 --- a/drivers/media/pci/cx88/Makefile +++ b/drivers/media/pci/cx88/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | cx88xx-objs := cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o \ | 2 | cx88xx-objs := cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o \ |
| 2 | cx88-dsp.o cx88-input.o | 3 | cx88-dsp.o cx88-input.o |
| 3 | cx8800-objs := cx88-video.o cx88-vbi.o | 4 | cx8800-objs := cx88-video.o cx88-vbi.o |
diff --git a/drivers/media/pci/cx88/cx88-vbi.c b/drivers/media/pci/cx88/cx88-vbi.c index 2d0ef19e6d65..c637679b01b2 100644 --- a/drivers/media/pci/cx88/cx88-vbi.c +++ b/drivers/media/pci/cx88/cx88-vbi.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | */ | 3 | */ |
| 3 | 4 | ||
diff --git a/drivers/media/pci/ddbridge/Makefile b/drivers/media/pci/ddbridge/Makefile index 09703312a3f1..7453b65104ff 100644 --- a/drivers/media/pci/ddbridge/Makefile +++ b/drivers/media/pci/ddbridge/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the ddbridge device driver | 3 | # Makefile for the ddbridge device driver |
| 3 | # | 4 | # |
diff --git a/drivers/media/pci/ivtv/Makefile b/drivers/media/pci/ivtv/Makefile index 0eaa88298b7e..48f8a23f9a0f 100644 --- a/drivers/media/pci/ivtv/Makefile +++ b/drivers/media/pci/ivtv/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ivtv-objs := ivtv-routing.o ivtv-cards.o ivtv-controls.o \ | 2 | ivtv-objs := ivtv-routing.o ivtv-cards.o ivtv-controls.o \ |
| 2 | ivtv-driver.o ivtv-fileops.o ivtv-firmware.o \ | 3 | ivtv-driver.o ivtv-fileops.o ivtv-firmware.o \ |
| 3 | ivtv-gpio.o ivtv-i2c.o ivtv-ioctl.o ivtv-irq.o \ | 4 | ivtv-gpio.o ivtv-i2c.o ivtv-ioctl.o ivtv-irq.o \ |
diff --git a/drivers/media/pci/mantis/Makefile b/drivers/media/pci/mantis/Makefile index f715051e4453..a684dc2ec79e 100644 --- a/drivers/media/pci/mantis/Makefile +++ b/drivers/media/pci/mantis/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | mantis_core-objs := mantis_ioc.o \ | 2 | mantis_core-objs := mantis_ioc.o \ |
| 2 | mantis_uart.o \ | 3 | mantis_uart.o \ |
| 3 | mantis_dma.o \ | 4 | mantis_dma.o \ |
diff --git a/drivers/media/pci/netup_unidvb/Makefile b/drivers/media/pci/netup_unidvb/Makefile index ee6ae0501eae..07d3f1eb728b 100644 --- a/drivers/media/pci/netup_unidvb/Makefile +++ b/drivers/media/pci/netup_unidvb/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | netup-unidvb-objs += netup_unidvb_core.o | 2 | netup-unidvb-objs += netup_unidvb_core.o |
| 2 | netup-unidvb-objs += netup_unidvb_i2c.o | 3 | netup-unidvb-objs += netup_unidvb_i2c.o |
| 3 | netup-unidvb-objs += netup_unidvb_ci.o | 4 | netup-unidvb-objs += netup_unidvb_ci.o |
diff --git a/drivers/media/pci/ngene/Makefile b/drivers/media/pci/ngene/Makefile index 5c0b5d6b9d69..dbdf284970f8 100644 --- a/drivers/media/pci/ngene/Makefile +++ b/drivers/media/pci/ngene/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the nGene device driver | 3 | # Makefile for the nGene device driver |
| 3 | # | 4 | # |
diff --git a/drivers/media/pci/pt3/Makefile b/drivers/media/pci/pt3/Makefile index 396f146b1c18..aded8752ac2b 100644 --- a/drivers/media/pci/pt3/Makefile +++ b/drivers/media/pci/pt3/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | earth-pt3-objs += pt3.o pt3_i2c.o pt3_dma.o | 3 | earth-pt3-objs += pt3.o pt3_i2c.o pt3_dma.o |
| 3 | 4 | ||
diff --git a/drivers/media/pci/saa7134/Makefile b/drivers/media/pci/saa7134/Makefile index 09c43da67588..dbaadddf4320 100644 --- a/drivers/media/pci/saa7134/Makefile +++ b/drivers/media/pci/saa7134/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | saa7134-y += saa7134-cards.o saa7134-core.o saa7134-i2c.o | 3 | saa7134-y += saa7134-cards.o saa7134-core.o saa7134-i2c.o |
| 3 | saa7134-y += saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o | 4 | saa7134-y += saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o |
diff --git a/drivers/media/pci/saa7134/saa7134-reg.h b/drivers/media/pci/saa7134/saa7134-reg.h index b6ea6f4f9b6c..56b12641d733 100644 --- a/drivers/media/pci/saa7134/saa7134-reg.h +++ b/drivers/media/pci/saa7134/saa7134-reg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * | 3 | * |
| 3 | * philips saa7134 registers | 4 | * philips saa7134 registers |
diff --git a/drivers/media/pci/saa7164/Makefile b/drivers/media/pci/saa7164/Makefile index ba0e33a1ee24..3896bcdb99d2 100644 --- a/drivers/media/pci/saa7164/Makefile +++ b/drivers/media/pci/saa7164/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | saa7164-objs := saa7164-cards.o saa7164-core.o saa7164-i2c.o saa7164-dvb.o \ | 2 | saa7164-objs := saa7164-cards.o saa7164-core.o saa7164-i2c.o saa7164-dvb.o \ |
| 2 | saa7164-fw.o saa7164-bus.o saa7164-cmd.o saa7164-api.o \ | 3 | saa7164-fw.o saa7164-bus.o saa7164-cmd.o saa7164-api.o \ |
| 3 | saa7164-buffer.o saa7164-encoder.o saa7164-vbi.o | 4 | saa7164-buffer.o saa7164-encoder.o saa7164-vbi.o |
diff --git a/drivers/media/pci/smipcie/Makefile b/drivers/media/pci/smipcie/Makefile index 013bc3fe4294..6006aac3c41f 100644 --- a/drivers/media/pci/smipcie/Makefile +++ b/drivers/media/pci/smipcie/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | smipcie-objs := smipcie-main.o smipcie-ir.o | 3 | smipcie-objs := smipcie-main.o smipcie-ir.o |
| 3 | 4 | ||
diff --git a/drivers/media/pci/ttpci/Makefile b/drivers/media/pci/ttpci/Makefile index 3cf617737f7c..0b805339c123 100644 --- a/drivers/media/pci/ttpci/Makefile +++ b/drivers/media/pci/ttpci/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel SAA7146 FULL TS DVB device driver | 3 | # Makefile for the kernel SAA7146 FULL TS DVB device driver |
| 3 | # and the AV7110 DVB device driver | 4 | # and the AV7110 DVB device driver |
diff --git a/drivers/media/pci/ttpci/av7110.h b/drivers/media/pci/ttpci/av7110.h index 347827925c14..cd09fd6e6548 100644 --- a/drivers/media/pci/ttpci/av7110.h +++ b/drivers/media/pci/ttpci/av7110.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _AV7110_H_ | 2 | #ifndef _AV7110_H_ |
| 2 | #define _AV7110_H_ | 3 | #define _AV7110_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/pci/ttpci/av7110_av.h b/drivers/media/pci/ttpci/av7110_av.h index f52276f47709..71bbd4391f57 100644 --- a/drivers/media/pci/ttpci/av7110_av.h +++ b/drivers/media/pci/ttpci/av7110_av.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _AV7110_AV_H_ | 2 | #ifndef _AV7110_AV_H_ |
| 2 | #define _AV7110_AV_H_ | 3 | #define _AV7110_AV_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/pci/ttpci/av7110_ca.h b/drivers/media/pci/ttpci/av7110_ca.h index 70ee855ece1b..a6e3f2955730 100644 --- a/drivers/media/pci/ttpci/av7110_ca.h +++ b/drivers/media/pci/ttpci/av7110_ca.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _AV7110_CA_H_ | 2 | #ifndef _AV7110_CA_H_ |
| 2 | #define _AV7110_CA_H_ | 3 | #define _AV7110_CA_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/pci/ttpci/av7110_hw.h b/drivers/media/pci/ttpci/av7110_hw.h index ccb148059406..6380d8950c69 100644 --- a/drivers/media/pci/ttpci/av7110_hw.h +++ b/drivers/media/pci/ttpci/av7110_hw.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _AV7110_HW_H_ | 2 | #ifndef _AV7110_HW_H_ |
| 2 | #define _AV7110_HW_H_ | 3 | #define _AV7110_HW_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/pci/ttpci/av7110_ipack.c b/drivers/media/pci/ttpci/av7110_ipack.c index 699ef8b5b99a..5aff26574fe1 100644 --- a/drivers/media/pci/ttpci/av7110_ipack.c +++ b/drivers/media/pci/ttpci/av7110_ipack.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "dvb_filter.h" | 2 | #include "dvb_filter.h" |
| 2 | #include "av7110_ipack.h" | 3 | #include "av7110_ipack.h" |
| 3 | #include <linux/string.h> /* for memcpy() */ | 4 | #include <linux/string.h> /* for memcpy() */ |
diff --git a/drivers/media/pci/ttpci/av7110_ipack.h b/drivers/media/pci/ttpci/av7110_ipack.h index becf94d3fdfa..943ec899bb93 100644 --- a/drivers/media/pci/ttpci/av7110_ipack.h +++ b/drivers/media/pci/ttpci/av7110_ipack.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _AV7110_IPACK_H_ | 2 | #ifndef _AV7110_IPACK_H_ |
| 2 | #define _AV7110_IPACK_H_ | 3 | #define _AV7110_IPACK_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/pci/ttpci/budget.h b/drivers/media/pci/ttpci/budget.h index d5ae4438153e..fae83866b199 100644 --- a/drivers/media/pci/ttpci/budget.h +++ b/drivers/media/pci/ttpci/budget.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #ifndef __BUDGET_DVB__ | 3 | #ifndef __BUDGET_DVB__ |
| 3 | #define __BUDGET_DVB__ | 4 | #define __BUDGET_DVB__ |
diff --git a/drivers/media/pci/ttpci/dvb_filter.c b/drivers/media/pci/ttpci/dvb_filter.c index b67127b67d4e..8c2eca5dcdc9 100644 --- a/drivers/media/pci/ttpci/dvb_filter.c +++ b/drivers/media/pci/ttpci/dvb_filter.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/module.h> | 3 | #include <linux/module.h> |
| 3 | #include <linux/string.h> | 4 | #include <linux/string.h> |
diff --git a/drivers/media/pci/tw5864/tw5864-util.c b/drivers/media/pci/tw5864/tw5864-util.c index 771eef235755..b9cebe9d1740 100644 --- a/drivers/media/pci/tw5864/tw5864-util.c +++ b/drivers/media/pci/tw5864/tw5864-util.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "tw5864.h" | 2 | #include "tw5864.h" |
| 2 | 3 | ||
| 3 | void tw5864_indir_writeb(struct tw5864_dev *dev, u16 addr, u8 data) | 4 | void tw5864_indir_writeb(struct tw5864_dev *dev, u16 addr, u8 data) |
diff --git a/drivers/media/pci/tw686x/tw686x-regs.h b/drivers/media/pci/tw686x/tw686x-regs.h index 15a956642ef4..8adacc928be1 100644 --- a/drivers/media/pci/tw686x/tw686x-regs.h +++ b/drivers/media/pci/tw686x/tw686x-regs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* DMA controller registers */ | 2 | /* DMA controller registers */ |
| 2 | #define REG8_1(a0) ((const u16[8]) { a0, a0 + 1, a0 + 2, a0 + 3, \ | 3 | #define REG8_1(a0) ((const u16[8]) { a0, a0 + 1, a0 + 2, a0 + 3, \ |
| 3 | a0 + 4, a0 + 5, a0 + 6, a0 + 7}) | 4 | a0 + 4, a0 + 5, a0 + 6, a0 + 7}) |
diff --git a/drivers/media/pci/zoran/Makefile b/drivers/media/pci/zoran/Makefile index 44cc13352c88..21ac29a71458 100644 --- a/drivers/media/pci/zoran/Makefile +++ b/drivers/media/pci/zoran/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | zr36067-objs := zoran_procfs.o zoran_device.o \ | 2 | zr36067-objs := zoran_procfs.o zoran_device.o \ |
| 2 | zoran_driver.o zoran_card.o | 3 | zoran_driver.o zoran_card.o |
| 3 | 4 | ||
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index c1ef946bf032..327f80a6f82c 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the video capture/playback device drivers. | 3 | # Makefile for the video capture/playback device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/media/platform/atmel/atmel-isc-regs.h b/drivers/media/platform/atmel/atmel-isc-regs.h index 6936ac467609..e6cef966dcbf 100644 --- a/drivers/media/platform/atmel/atmel-isc-regs.h +++ b/drivers/media/platform/atmel/atmel-isc-regs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __ATMEL_ISC_REGS_H | 2 | #ifndef __ATMEL_ISC_REGS_H |
| 2 | #define __ATMEL_ISC_REGS_H | 3 | #define __ATMEL_ISC_REGS_H |
| 3 | 4 | ||
diff --git a/drivers/media/platform/coda/trace.h b/drivers/media/platform/coda/trace.h index f20666a4aa89..ca671e315ad0 100644 --- a/drivers/media/platform/coda/trace.h +++ b/drivers/media/platform/coda/trace.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #undef TRACE_SYSTEM | 2 | #undef TRACE_SYSTEM |
| 2 | #define TRACE_SYSTEM coda | 3 | #define TRACE_SYSTEM coda |
| 3 | 4 | ||
diff --git a/drivers/media/platform/davinci/Makefile b/drivers/media/platform/davinci/Makefile index d74d9eeb0e9e..05c45bf371aa 100644 --- a/drivers/media/platform/davinci/Makefile +++ b/drivers/media/platform/davinci/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the davinci video device drivers. | 3 | # Makefile for the davinci video device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/media/platform/exynos4-is/Makefile b/drivers/media/platform/exynos4-is/Makefile index eed1b185d813..a5ab01c73b95 100644 --- a/drivers/media/platform/exynos4-is/Makefile +++ b/drivers/media/platform/exynos4-is/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | s5p-fimc-objs := fimc-core.o fimc-reg.o fimc-m2m.o fimc-capture.o media-dev.o | 2 | s5p-fimc-objs := fimc-core.o fimc-reg.o fimc-m2m.o fimc-capture.o media-dev.o |
| 2 | exynos-fimc-lite-objs += fimc-lite-reg.o fimc-lite.o | 3 | exynos-fimc-lite-objs += fimc-lite-reg.o fimc-lite.o |
| 3 | s5p-csis-objs := mipi-csis.o | 4 | s5p-csis-objs := mipi-csis.o |
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c index b07a251e8857..7b7250b1cff8 100644 --- a/drivers/media/platform/marvell-ccic/mcam-core.c +++ b/drivers/media/platform/marvell-ccic/mcam-core.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * The Marvell camera core. This device appears in a number of settings, | 3 | * The Marvell camera core. This device appears in a number of settings, |
| 3 | * so it needs platform-specific support outside of the core. | 4 | * so it needs platform-specific support outside of the core. |
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell-ccic/mcam-core.h index beb339f5561f..ad8955f9f0a1 100644 --- a/drivers/media/platform/marvell-ccic/mcam-core.h +++ b/drivers/media/platform/marvell-ccic/mcam-core.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Marvell camera core structures. | 3 | * Marvell camera core structures. |
| 3 | * | 4 | * |
diff --git a/drivers/media/platform/mtk-mdp/Makefile b/drivers/media/platform/mtk-mdp/Makefile index f8025699af99..5982d65c9971 100644 --- a/drivers/media/platform/mtk-mdp/Makefile +++ b/drivers/media/platform/mtk-mdp/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | mtk-mdp-y += mtk_mdp_core.o | 2 | mtk-mdp-y += mtk_mdp_core.o |
| 2 | mtk-mdp-y += mtk_mdp_comp.o | 3 | mtk-mdp-y += mtk_mdp_comp.o |
| 3 | mtk-mdp-y += mtk_mdp_m2m.o | 4 | mtk-mdp-y += mtk_mdp_m2m.o |
diff --git a/drivers/media/platform/mtk-vcodec/Makefile b/drivers/media/platform/mtk-vcodec/Makefile index 852d9697ccfa..37b94b555fa1 100644 --- a/drivers/media/platform/mtk-vcodec/Makefile +++ b/drivers/media/platform/mtk-vcodec/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk-vcodec-dec.o \ | 3 | obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk-vcodec-dec.o \ |
| 3 | mtk-vcodec-enc.o \ | 4 | mtk-vcodec-enc.o \ |
diff --git a/drivers/media/platform/omap3isp/Makefile b/drivers/media/platform/omap3isp/Makefile index 254975a9174e..56e99b4f7d23 100644 --- a/drivers/media/platform/omap3isp/Makefile +++ b/drivers/media/platform/omap3isp/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for OMAP3 ISP driver | 2 | # Makefile for OMAP3 ISP driver |
| 2 | 3 | ||
| 3 | ccflags-$(CONFIG_VIDEO_OMAP3_DEBUG) += -DDEBUG | 4 | ccflags-$(CONFIG_VIDEO_OMAP3_DEBUG) += -DDEBUG |
diff --git a/drivers/media/platform/qcom/venus/Makefile b/drivers/media/platform/qcom/venus/Makefile index 0fe9afb83697..bfd4edf7c83f 100644 --- a/drivers/media/platform/qcom/venus/Makefile +++ b/drivers/media/platform/qcom/venus/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for Qualcomm Venus driver | 2 | # Makefile for Qualcomm Venus driver |
| 2 | 3 | ||
| 3 | venus-core-objs += core.o helpers.o firmware.o \ | 4 | venus-core-objs += core.o helpers.o firmware.o \ |
diff --git a/drivers/media/platform/s5p-mfc/Makefile b/drivers/media/platform/s5p-mfc/Makefile index 15f59b324fef..0b324af2ab00 100644 --- a/drivers/media/platform/s5p-mfc/Makefile +++ b/drivers/media/platform/s5p-mfc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc.o | 2 | obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc.o |
| 2 | s5p-mfc-y += s5p_mfc.o s5p_mfc_intr.o | 3 | s5p-mfc-y += s5p_mfc.o s5p_mfc_intr.o |
| 3 | s5p-mfc-y += s5p_mfc_dec.o s5p_mfc_enc.o | 4 | s5p-mfc-y += s5p_mfc_dec.o s5p_mfc_enc.o |
diff --git a/drivers/media/platform/sti/c8sectpfe/Makefile b/drivers/media/platform/sti/c8sectpfe/Makefile index b578c7cb4c34..b642b4fd5045 100644 --- a/drivers/media/platform/sti/c8sectpfe/Makefile +++ b/drivers/media/platform/sti/c8sectpfe/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | c8sectpfe-y += c8sectpfe-core.o c8sectpfe-common.o c8sectpfe-dvb.o \ | 2 | c8sectpfe-y += c8sectpfe-core.o c8sectpfe-common.o c8sectpfe-dvb.o \ |
| 2 | c8sectpfe-debugfs.o | 3 | c8sectpfe-debugfs.o |
| 3 | 4 | ||
diff --git a/drivers/media/platform/ti-vpe/Makefile b/drivers/media/platform/ti-vpe/Makefile index 32504b724b5d..886ac5ec073f 100644 --- a/drivers/media/platform/ti-vpe/Makefile +++ b/drivers/media/platform/ti-vpe/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_VIDEO_TI_VPE) += ti-vpe.o | 2 | obj-$(CONFIG_VIDEO_TI_VPE) += ti-vpe.o |
| 2 | obj-$(CONFIG_VIDEO_TI_VPDMA) += ti-vpdma.o | 3 | obj-$(CONFIG_VIDEO_TI_VPDMA) += ti-vpdma.o |
| 3 | obj-$(CONFIG_VIDEO_TI_SC) += ti-sc.o | 4 | obj-$(CONFIG_VIDEO_TI_SC) += ti-sc.o |
diff --git a/drivers/media/platform/via-camera.h b/drivers/media/platform/via-camera.h index b12a4b3d616f..2d67f8ce258d 100644 --- a/drivers/media/platform/via-camera.h +++ b/drivers/media/platform/via-camera.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * VIA Camera register definitions. | 3 | * VIA Camera register definitions. |
| 3 | */ | 4 | */ |
diff --git a/drivers/media/platform/vimc/Makefile b/drivers/media/platform/vimc/Makefile index 68c5d9804c11..4b2e3de7856e 100644 --- a/drivers/media/platform/vimc/Makefile +++ b/drivers/media/platform/vimc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | vimc-objs := vimc-core.o | 2 | vimc-objs := vimc-core.o |
| 2 | vimc_capture-objs := vimc-capture.o | 3 | vimc_capture-objs := vimc-capture.o |
| 3 | vimc_common-objs := vimc-common.o | 4 | vimc_common-objs := vimc-common.o |
diff --git a/drivers/media/platform/vivid/Makefile b/drivers/media/platform/vivid/Makefile index 29738810e3ee..2f5762e3309a 100644 --- a/drivers/media/platform/vivid/Makefile +++ b/drivers/media/platform/vivid/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ | 2 | vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ |
| 2 | vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ | 3 | vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ |
| 3 | vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ | 4 | vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ |
diff --git a/drivers/media/platform/vsp1/Makefile b/drivers/media/platform/vsp1/Makefile index a33afc385a48..f5cd6f0491cb 100644 --- a/drivers/media/platform/vsp1/Makefile +++ b/drivers/media/platform/vsp1/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | vsp1-y := vsp1_drv.o vsp1_entity.o vsp1_pipe.o | 2 | vsp1-y := vsp1_drv.o vsp1_entity.o vsp1_pipe.o |
| 2 | vsp1-y += vsp1_dl.o vsp1_drm.o vsp1_video.o | 3 | vsp1-y += vsp1_dl.o vsp1_drm.o vsp1_video.o |
| 3 | vsp1-y += vsp1_rpf.o vsp1_rwpf.o vsp1_wpf.o | 4 | vsp1-y += vsp1_rpf.o vsp1_rwpf.o vsp1_wpf.o |
diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile index 120e791199b2..37e6e8255b57 100644 --- a/drivers/media/radio/Makefile +++ b/drivers/media/radio/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel character device drivers. | 3 | # Makefile for the kernel character device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/media/radio/lm7000.h b/drivers/media/radio/lm7000.h index 139cd6b68824..adb217965620 100644 --- a/drivers/media/radio/lm7000.h +++ b/drivers/media/radio/lm7000.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __LM7000_H | 2 | #ifndef __LM7000_H |
| 2 | #define __LM7000_H | 3 | #define __LM7000_H |
| 3 | 4 | ||
diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile index 9bc6a3980ed0..ab3d5a135453 100644 --- a/drivers/media/rc/Makefile +++ b/drivers/media/rc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rc-core-objs := rc-main.o rc-ir-raw.o | 2 | rc-core-objs := rc-main.o rc-ir-raw.o |
| 2 | 3 | ||
| 3 | obj-y += keymaps/ | 4 | obj-y += keymaps/ |
diff --git a/drivers/media/rc/img-ir/Makefile b/drivers/media/rc/img-ir/Makefile index 8e6d458e66ad..741fedc5dceb 100644 --- a/drivers/media/rc/img-ir/Makefile +++ b/drivers/media/rc/img-ir/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | img-ir-y := img-ir-core.o | 2 | img-ir-y := img-ir-core.o |
| 2 | img-ir-$(CONFIG_IR_IMG_RAW) += img-ir-raw.o | 3 | img-ir-$(CONFIG_IR_IMG_RAW) += img-ir-raw.o |
| 3 | img-ir-$(CONFIG_IR_IMG_HW) += img-ir-hw.o | 4 | img-ir-$(CONFIG_IR_IMG_HW) += img-ir-hw.o |
diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile index af6496d709fb..2d0b26bf2051 100644 --- a/drivers/media/rc/keymaps/Makefile +++ b/drivers/media/rc/keymaps/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \ | 2 | obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \ |
| 2 | rc-alink-dtu-m.o \ | 3 | rc-alink-dtu-m.o \ |
| 3 | rc-anysee.o \ | 4 | rc-anysee.o \ |
diff --git a/drivers/media/tuners/Makefile b/drivers/media/tuners/Makefile index 06a9ab65e5fa..7be96511532d 100644 --- a/drivers/media/tuners/Makefile +++ b/drivers/media/tuners/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for common V4L/DVB tuners | 3 | # Makefile for common V4L/DVB tuners |
| 3 | # | 4 | # |
diff --git a/drivers/media/tuners/fc0011.h b/drivers/media/tuners/fc0011.h index 438cf897acd1..a36871c44c8c 100644 --- a/drivers/media/tuners/fc0011.h +++ b/drivers/media/tuners/fc0011.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef LINUX_FC0011_H_ | 2 | #ifndef LINUX_FC0011_H_ |
| 2 | #define LINUX_FC0011_H_ | 3 | #define LINUX_FC0011_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/tuners/mt2063.h b/drivers/media/tuners/mt2063.h index e55e0a6dd1be..0e3e3b0525bb 100644 --- a/drivers/media/tuners/mt2063.h +++ b/drivers/media/tuners/mt2063.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MT2063_H__ | 2 | #ifndef __MT2063_H__ |
| 2 | #define __MT2063_H__ | 3 | #define __MT2063_H__ |
| 3 | 4 | ||
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile index 738b993ec8b0..21e46b10caa5 100644 --- a/drivers/media/usb/Makefile +++ b/drivers/media/usb/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the USB media device drivers | 3 | # Makefile for the USB media device drivers |
| 3 | # | 4 | # |
diff --git a/drivers/media/usb/as102/Makefile b/drivers/media/usb/as102/Makefile index 22f43eee4a3b..56bd2d00b920 100644 --- a/drivers/media/usb/as102/Makefile +++ b/drivers/media/usb/as102/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | dvb-as102-objs := as102_drv.o as102_fw.o as10x_cmd.o as10x_cmd_stream.o \ | 2 | dvb-as102-objs := as102_drv.o as102_fw.o as10x_cmd.o as10x_cmd_stream.o \ |
| 2 | as102_usb_drv.o as10x_cmd_cfg.o | 3 | as102_usb_drv.o as10x_cmd_cfg.o |
| 3 | 4 | ||
diff --git a/drivers/media/usb/au0828/Makefile b/drivers/media/usb/au0828/Makefile index 3dc7539a5c4e..c06ef6601f2d 100644 --- a/drivers/media/usb/au0828/Makefile +++ b/drivers/media/usb/au0828/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | au0828-objs := au0828-core.o au0828-i2c.o au0828-cards.o au0828-dvb.o | 2 | au0828-objs := au0828-core.o au0828-i2c.o au0828-cards.o au0828-dvb.o |
| 2 | 3 | ||
| 3 | ifeq ($(CONFIG_VIDEO_AU0828_V4L2),y) | 4 | ifeq ($(CONFIG_VIDEO_AU0828_V4L2),y) |
diff --git a/drivers/media/usb/b2c2/flexcop-usb.h b/drivers/media/usb/b2c2/flexcop-usb.h index 25ad43166e78..e86faa0e06ca 100644 --- a/drivers/media/usb/b2c2/flexcop-usb.h +++ b/drivers/media/usb/b2c2/flexcop-usb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III | 3 | * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III |
| 3 | * flexcop-usb.h - header file for the USB part | 4 | * flexcop-usb.h - header file for the USB part |
diff --git a/drivers/media/usb/cx231xx/Makefile b/drivers/media/usb/cx231xx/Makefile index 52cf76935e69..19e8c35d6a77 100644 --- a/drivers/media/usb/cx231xx/Makefile +++ b/drivers/media/usb/cx231xx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | cx231xx-y += cx231xx-video.o cx231xx-i2c.o cx231xx-cards.o cx231xx-core.o | 2 | cx231xx-y += cx231xx-video.o cx231xx-i2c.o cx231xx-cards.o cx231xx-core.o |
| 2 | cx231xx-y += cx231xx-avcore.o cx231xx-417.o cx231xx-pcb-cfg.o cx231xx-vbi.o | 3 | cx231xx-y += cx231xx-avcore.o cx231xx-417.o cx231xx-pcb-cfg.o cx231xx-vbi.o |
| 3 | cx231xx-$(CONFIG_VIDEO_CX231XX_RC) += cx231xx-input.o | 4 | cx231xx-$(CONFIG_VIDEO_CX231XX_RC) += cx231xx-input.o |
diff --git a/drivers/media/usb/dvb-usb-v2/Makefile b/drivers/media/usb/dvb-usb-v2/Makefile index 969f68e55265..bed44601f324 100644 --- a/drivers/media/usb/dvb-usb-v2/Makefile +++ b/drivers/media/usb/dvb-usb-v2/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | dvb_usb_v2-objs := dvb_usb_core.o dvb_usb_urb.o usb_urb.o | 2 | dvb_usb_v2-objs := dvb_usb_core.o dvb_usb_urb.o usb_urb.o |
| 2 | obj-$(CONFIG_DVB_USB_V2) += dvb_usb_v2.o | 3 | obj-$(CONFIG_DVB_USB_V2) += dvb_usb_v2.o |
| 3 | 4 | ||
diff --git a/drivers/media/usb/dvb-usb-v2/gl861.h b/drivers/media/usb/dvb-usb-v2/gl861.h index b0b80d87bb7e..b651b857e034 100644 --- a/drivers/media/usb/dvb-usb-v2/gl861.h +++ b/drivers/media/usb/dvb-usb-v2/gl861.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _DVB_USB_GL861_H_ | 2 | #ifndef _DVB_USB_GL861_H_ |
| 2 | #define _DVB_USB_GL861_H_ | 3 | #define _DVB_USB_GL861_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/usb/dvb-usb-v2/usb_urb.c b/drivers/media/usb/dvb-usb-v2/usb_urb.c index 55136cde38f5..dce2b97efce4 100644 --- a/drivers/media/usb/dvb-usb-v2/usb_urb.c +++ b/drivers/media/usb/dvb-usb-v2/usb_urb.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* usb-urb.c is part of the DVB USB library. | 2 | /* usb-urb.c is part of the DVB USB library. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) | 4 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) |
diff --git a/drivers/media/usb/dvb-usb/Makefile b/drivers/media/usb/dvb-usb/Makefile index 3b3f32b426d1..16de1e4f36a4 100644 --- a/drivers/media/usb/dvb-usb/Makefile +++ b/drivers/media/usb/dvb-usb/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | dvb-usb-objs += dvb-usb-firmware.o dvb-usb-init.o dvb-usb-urb.o dvb-usb-i2c.o | 2 | dvb-usb-objs += dvb-usb-firmware.o dvb-usb-init.o dvb-usb-urb.o dvb-usb-i2c.o |
| 2 | dvb-usb-objs += dvb-usb-dvb.o dvb-usb-remote.o usb-urb.o | 3 | dvb-usb-objs += dvb-usb-dvb.o dvb-usb-remote.o usb-urb.o |
| 3 | obj-$(CONFIG_DVB_USB) += dvb-usb.o | 4 | obj-$(CONFIG_DVB_USB) += dvb-usb.o |
diff --git a/drivers/media/usb/dvb-usb/af9005-script.h b/drivers/media/usb/dvb-usb/af9005-script.h index 4d69045426dd..870cb59cd904 100644 --- a/drivers/media/usb/dvb-usb/af9005-script.h +++ b/drivers/media/usb/dvb-usb/af9005-script.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | File automatically generated by createinit.py using data | 3 | File automatically generated by createinit.py using data |
| 3 | extracted from AF05BDA.sys (windows driver): | 4 | extracted from AF05BDA.sys (windows driver): |
diff --git a/drivers/media/usb/dvb-usb/az6027.h b/drivers/media/usb/dvb-usb/az6027.h index f3afe17f3f3d..95b056b36030 100644 --- a/drivers/media/usb/dvb-usb/az6027.h +++ b/drivers/media/usb/dvb-usb/az6027.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _DVB_USB_VP6027_H_ | 2 | #ifndef _DVB_USB_VP6027_H_ |
| 2 | #define _DVB_USB_VP6027_H_ | 3 | #define _DVB_USB_VP6027_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/usb/dvb-usb/cxusb.h b/drivers/media/usb/dvb-usb/cxusb.h index 66429d7f69b5..88f9b9804b25 100644 --- a/drivers/media/usb/dvb-usb/cxusb.h +++ b/drivers/media/usb/dvb-usb/cxusb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _DVB_USB_CXUSB_H_ | 2 | #ifndef _DVB_USB_CXUSB_H_ |
| 2 | #define _DVB_USB_CXUSB_H_ | 3 | #define _DVB_USB_CXUSB_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/usb/dvb-usb/dib07x0.h b/drivers/media/usb/dvb-usb/dib07x0.h index 7e62c1018520..2e67f794fe37 100644 --- a/drivers/media/usb/dvb-usb/dib07x0.h +++ b/drivers/media/usb/dvb-usb/dib07x0.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _DIB07X0_H_ | 2 | #ifndef _DIB07X0_H_ |
| 2 | #define _DIB07X0_H_ | 3 | #define _DIB07X0_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/usb/dvb-usb/digitv.h b/drivers/media/usb/dvb-usb/digitv.h index 581e09c25491..2af9fedfad70 100644 --- a/drivers/media/usb/dvb-usb/digitv.h +++ b/drivers/media/usb/dvb-usb/digitv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _DVB_USB_DIGITV_H_ | 2 | #ifndef _DVB_USB_DIGITV_H_ |
| 2 | #define _DVB_USB_DIGITV_H_ | 3 | #define _DVB_USB_DIGITV_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-common.h b/drivers/media/usb/dvb-usb/dvb-usb-common.h index 7e619d638809..8c51ac4493dd 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-common.h +++ b/drivers/media/usb/dvb-usb/dvb-usb-common.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* dvb-usb-common.h is part of the DVB USB library. | 2 | /* dvb-usb-common.h is part of the DVB USB library. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de) | 4 | * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de) |
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c index e5675da286cb..3a66e732e0d8 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* dvb-usb-dvb.c is part of the DVB USB library. | 2 | /* dvb-usb-dvb.c is part of the DVB USB library. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) | 4 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) |
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c index 04033efe7ad5..15c153e49382 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* dvb-usb-firmware.c is part of the DVB USB library. | 2 | /* dvb-usb-firmware.c is part of the DVB USB library. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) | 4 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) |
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-i2c.c b/drivers/media/usb/dvb-usb/dvb-usb-i2c.c index 4f0b0adce7f5..ca0b734e009b 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-i2c.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-i2c.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* dvb-usb-i2c.c is part of the DVB USB library. | 2 | /* dvb-usb-i2c.c is part of the DVB USB library. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) | 4 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) |
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-remote.c b/drivers/media/usb/dvb-usb/dvb-usb-remote.c index 0b03f9bd9c26..701c10835482 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-remote.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-remote.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* dvb-usb-remote.c is part of the DVB USB library. | 2 | /* dvb-usb-remote.c is part of the DVB USB library. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) | 4 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) |
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-urb.c b/drivers/media/usb/dvb-usb/dvb-usb-urb.c index 95f9097498cb..c1b4e94a37f8 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-urb.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-urb.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* dvb-usb-urb.c is part of the DVB USB library. | 2 | /* dvb-usb-urb.c is part of the DVB USB library. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) | 4 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) |
diff --git a/drivers/media/usb/dvb-usb/dvb-usb.h b/drivers/media/usb/dvb-usb/dvb-usb.h index 72468fdffa18..6c7c4637530f 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb.h +++ b/drivers/media/usb/dvb-usb/dvb-usb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* dvb-usb.h is part of the DVB USB library. | 2 | /* dvb-usb.h is part of the DVB USB library. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) | 4 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) |
diff --git a/drivers/media/usb/dvb-usb/dw2102.h b/drivers/media/usb/dvb-usb/dw2102.h index 5cd0b0eb6ce1..f64cf79b7934 100644 --- a/drivers/media/usb/dvb-usb/dw2102.h +++ b/drivers/media/usb/dvb-usb/dw2102.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _DW2102_H_ | 2 | #ifndef _DW2102_H_ |
| 2 | #define _DW2102_H_ | 3 | #define _DW2102_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/usb/dvb-usb/m920x.h b/drivers/media/usb/dvb-usb/m920x.h index 3c061518ffc1..bab3c6ac7084 100644 --- a/drivers/media/usb/dvb-usb/m920x.h +++ b/drivers/media/usb/dvb-usb/m920x.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _DVB_USB_M920X_H_ | 2 | #ifndef _DVB_USB_M920X_H_ |
| 2 | #define _DVB_USB_M920X_H_ | 3 | #define _DVB_USB_M920X_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/usb/dvb-usb/usb-urb.c b/drivers/media/usb/dvb-usb/usb-urb.c index 89173603be67..2804d2d0e83a 100644 --- a/drivers/media/usb/dvb-usb/usb-urb.c +++ b/drivers/media/usb/dvb-usb/usb-urb.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* usb-urb.c is part of the DVB USB library. | 2 | /* usb-urb.c is part of the DVB USB library. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) | 4 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de) |
diff --git a/drivers/media/usb/dvb-usb/vp702x.h b/drivers/media/usb/dvb-usb/vp702x.h index 20b90055e7ac..18ad7ced2045 100644 --- a/drivers/media/usb/dvb-usb/vp702x.h +++ b/drivers/media/usb/dvb-usb/vp702x.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _DVB_USB_VP7021_H_ | 2 | #ifndef _DVB_USB_VP7021_H_ |
| 2 | #define _DVB_USB_VP7021_H_ | 3 | #define _DVB_USB_VP7021_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/usb/em28xx/Makefile b/drivers/media/usb/em28xx/Makefile index 3f850d5063d0..86bfc35e2ed4 100644 --- a/drivers/media/usb/em28xx/Makefile +++ b/drivers/media/usb/em28xx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | em28xx-y += em28xx-core.o em28xx-i2c.o em28xx-cards.o em28xx-camera.o | 2 | em28xx-y += em28xx-core.o em28xx-i2c.o em28xx-cards.o em28xx-camera.o |
| 2 | 3 | ||
| 3 | em28xx-v4l-objs := em28xx-video.o em28xx-vbi.o | 4 | em28xx-v4l-objs := em28xx-video.o em28xx-vbi.o |
diff --git a/drivers/media/usb/em28xx/em28xx-reg.h b/drivers/media/usb/em28xx/em28xx-reg.h index 747525ca7ed5..9e5cdfb25a73 100644 --- a/drivers/media/usb/em28xx/em28xx-reg.h +++ b/drivers/media/usb/em28xx/em28xx-reg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #define EM_GPIO_0 (1 << 0) | 2 | #define EM_GPIO_0 (1 << 0) |
| 2 | #define EM_GPIO_1 (1 << 1) | 3 | #define EM_GPIO_1 (1 << 1) |
| 3 | #define EM_GPIO_2 (1 << 2) | 4 | #define EM_GPIO_2 (1 << 2) |
diff --git a/drivers/media/usb/go7007/Makefile b/drivers/media/usb/go7007/Makefile index e99287c3b828..3d95bbc4192c 100644 --- a/drivers/media/usb/go7007/Makefile +++ b/drivers/media/usb/go7007/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_VIDEO_GO7007) += go7007.o | 2 | obj-$(CONFIG_VIDEO_GO7007) += go7007.o |
| 2 | obj-$(CONFIG_VIDEO_GO7007_USB) += go7007-usb.o | 3 | obj-$(CONFIG_VIDEO_GO7007_USB) += go7007-usb.o |
| 3 | obj-$(CONFIG_VIDEO_GO7007_LOADER) += go7007-loader.o | 4 | obj-$(CONFIG_VIDEO_GO7007_LOADER) += go7007-loader.o |
diff --git a/drivers/media/usb/gspca/Makefile b/drivers/media/usb/gspca/Makefile index 9f5ccecb9c8a..3e3ecbffdf9f 100644 --- a/drivers/media/usb/gspca/Makefile +++ b/drivers/media/usb/gspca/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_USB_GSPCA) += gspca_main.o | 2 | obj-$(CONFIG_USB_GSPCA) += gspca_main.o |
| 2 | obj-$(CONFIG_USB_GSPCA_BENQ) += gspca_benq.o | 3 | obj-$(CONFIG_USB_GSPCA_BENQ) += gspca_benq.o |
| 3 | obj-$(CONFIG_USB_GSPCA_CONEX) += gspca_conex.o | 4 | obj-$(CONFIG_USB_GSPCA_CONEX) += gspca_conex.o |
diff --git a/drivers/media/usb/gspca/gl860/Makefile b/drivers/media/usb/gspca/gl860/Makefile index cf6397415aad..7bcfa36f12ac 100644 --- a/drivers/media/usb/gspca/gl860/Makefile +++ b/drivers/media/usb/gspca/gl860/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_USB_GL860) += gspca_gl860.o | 2 | obj-$(CONFIG_USB_GL860) += gspca_gl860.o |
| 2 | 3 | ||
| 3 | gspca_gl860-objs := gl860.o \ | 4 | gspca_gl860-objs := gl860.o \ |
diff --git a/drivers/media/usb/gspca/gspca.h b/drivers/media/usb/gspca/gspca.h index d39adf90303b..9e0cf711642b 100644 --- a/drivers/media/usb/gspca/gspca.h +++ b/drivers/media/usb/gspca/gspca.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef GSPCAV2_H | 2 | #ifndef GSPCAV2_H |
| 2 | #define GSPCAV2_H | 3 | #define GSPCAV2_H |
| 3 | 4 | ||
diff --git a/drivers/media/usb/gspca/m5602/Makefile b/drivers/media/usb/gspca/m5602/Makefile index 8e1fb5a1d2a1..95c9db6dc59c 100644 --- a/drivers/media/usb/gspca/m5602/Makefile +++ b/drivers/media/usb/gspca/m5602/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_USB_M5602) += gspca_m5602.o | 2 | obj-$(CONFIG_USB_M5602) += gspca_m5602.o |
| 2 | 3 | ||
| 3 | gspca_m5602-objs := m5602_core.o \ | 4 | gspca_m5602-objs := m5602_core.o \ |
diff --git a/drivers/media/usb/gspca/stv06xx/Makefile b/drivers/media/usb/gspca/stv06xx/Makefile index 3a4b2f899049..c4d7206e0c92 100644 --- a/drivers/media/usb/gspca/stv06xx/Makefile +++ b/drivers/media/usb/gspca/stv06xx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_USB_STV06XX) += gspca_stv06xx.o | 2 | obj-$(CONFIG_USB_STV06XX) += gspca_stv06xx.o |
| 2 | 3 | ||
| 3 | gspca_stv06xx-objs := stv06xx.o \ | 4 | gspca_stv06xx-objs := stv06xx.o \ |
diff --git a/drivers/media/usb/pvrusb2/Makefile b/drivers/media/usb/pvrusb2/Makefile index ad705547bdce..0d84064036b2 100644 --- a/drivers/media/usb/pvrusb2/Makefile +++ b/drivers/media/usb/pvrusb2/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-pvrusb2-sysfs-$(CONFIG_VIDEO_PVRUSB2_SYSFS) := pvrusb2-sysfs.o | 2 | obj-pvrusb2-sysfs-$(CONFIG_VIDEO_PVRUSB2_SYSFS) := pvrusb2-sysfs.o |
| 2 | obj-pvrusb2-debugifc-$(CONFIG_VIDEO_PVRUSB2_DEBUGIFC) := pvrusb2-debugifc.o | 3 | obj-pvrusb2-debugifc-$(CONFIG_VIDEO_PVRUSB2_DEBUGIFC) := pvrusb2-debugifc.o |
| 3 | obj-pvrusb2-dvb-$(CONFIG_VIDEO_PVRUSB2_DVB) := pvrusb2-dvb.o | 4 | obj-pvrusb2-dvb-$(CONFIG_VIDEO_PVRUSB2_DVB) := pvrusb2-dvb.o |
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-dvb.h b/drivers/media/usb/pvrusb2/pvrusb2-dvb.h index 884ff916a352..b500c86d4178 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-dvb.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-dvb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __PVRUSB2_DVB_H__ | 2 | #ifndef __PVRUSB2_DVB_H__ |
| 2 | #define __PVRUSB2_DVB_H__ | 3 | #define __PVRUSB2_DVB_H__ |
| 3 | 4 | ||
diff --git a/drivers/media/usb/pwc/pwc-nala.h b/drivers/media/usb/pwc/pwc-nala.h index 168c73ef75d8..0fe9d473f4e9 100644 --- a/drivers/media/usb/pwc/pwc-nala.h +++ b/drivers/media/usb/pwc/pwc-nala.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* SQCIF */ | 2 | /* SQCIF */ |
| 2 | { | 3 | { |
| 3 | {0, 0, {0x04, 0x01, 0x03}}, | 4 | {0, 0, {0x04, 0x01, 0x03}}, |
diff --git a/drivers/media/usb/stk1160/Makefile b/drivers/media/usb/stk1160/Makefile index 42d05463b353..613471528749 100644 --- a/drivers/media/usb/stk1160/Makefile +++ b/drivers/media/usb/stk1160/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | stk1160-y := stk1160-core.o \ | 2 | stk1160-y := stk1160-core.o \ |
| 2 | stk1160-v4l.o \ | 3 | stk1160-v4l.o \ |
| 3 | stk1160-video.o \ | 4 | stk1160-video.o \ |
diff --git a/drivers/media/usb/tm6000/Makefile b/drivers/media/usb/tm6000/Makefile index f2644933b8d1..05322a72e862 100644 --- a/drivers/media/usb/tm6000/Makefile +++ b/drivers/media/usb/tm6000/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | tm6000-y := tm6000-cards.o \ | 2 | tm6000-y := tm6000-cards.o \ |
| 2 | tm6000-core.o \ | 3 | tm6000-core.o \ |
| 3 | tm6000-i2c.o \ | 4 | tm6000-i2c.o \ |
diff --git a/drivers/media/usb/usbvision/usbvision-cards.h b/drivers/media/usb/usbvision/usbvision-cards.h index a51cc1185cce..07ec83512743 100644 --- a/drivers/media/usb/usbvision/usbvision-cards.h +++ b/drivers/media/usb/usbvision/usbvision-cards.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #define XANBOO 0 | 2 | #define XANBOO 0 |
| 2 | #define BELKIN_VIDEOBUS_II 1 | 3 | #define BELKIN_VIDEOBUS_II 1 |
| 3 | #define BELKIN_VIDEOBUS 2 | 4 | #define BELKIN_VIDEOBUS 2 |
diff --git a/drivers/media/usb/uvc/Makefile b/drivers/media/usb/uvc/Makefile index c26d12fdb8f4..a4fe5b5d533f 100644 --- a/drivers/media/usb/uvc/Makefile +++ b/drivers/media/usb/uvc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | uvcvideo-objs := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \ | 2 | uvcvideo-objs := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \ |
| 2 | uvc_status.o uvc_isight.o uvc_debugfs.o | 3 | uvc_status.o uvc_isight.o uvc_debugfs.o |
| 3 | ifeq ($(CONFIG_MEDIA_CONTROLLER),y) | 4 | ifeq ($(CONFIG_MEDIA_CONTROLLER),y) |
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 34c7ee6cc9e5..05398784d1c8 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _USB_VIDEO_H_ | 2 | #ifndef _USB_VIDEO_H_ |
| 2 | #define _USB_VIDEO_H_ | 3 | #define _USB_VIDEO_H_ |
| 3 | 4 | ||
diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile index 098ad5fd5231..77303286aef7 100644 --- a/drivers/media/v4l2-core/Makefile +++ b/drivers/media/v4l2-core/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the V4L2 core | 3 | # Makefile for the V4L2 core |
| 3 | # | 4 | # |
diff --git a/drivers/media/v4l2-core/v4l2-trace.c b/drivers/media/v4l2-core/v4l2-trace.c index 7416010542c1..95f3b02e1f84 100644 --- a/drivers/media/v4l2-core/v4l2-trace.c +++ b/drivers/media/v4l2-core/v4l2-trace.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <media/v4l2-common.h> | 2 | #include <media/v4l2-common.h> |
| 2 | #include <media/v4l2-fh.h> | 3 | #include <media/v4l2-fh.h> |
| 3 | #include <media/videobuf2-v4l2.h> | 4 | #include <media/videobuf2-v4l2.h> |
diff --git a/drivers/media/v4l2-core/vb2-trace.c b/drivers/media/v4l2-core/vb2-trace.c index 61e74f5936b3..4c0f39d271f0 100644 --- a/drivers/media/v4l2-core/vb2-trace.c +++ b/drivers/media/v4l2-core/vb2-trace.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <media/videobuf2-core.h> | 2 | #include <media/videobuf2-core.h> |
| 2 | 3 | ||
| 3 | #define CREATE_TRACE_POINTS | 4 | #define CREATE_TRACE_POINTS |
diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile index e88097fbc085..470b93e3858d 100644 --- a/drivers/memory/Makefile +++ b/drivers/memory/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for memory devices | 3 | # Makefile for memory devices |
| 3 | # | 4 | # |
diff --git a/drivers/memory/tegra/Makefile b/drivers/memory/tegra/Makefile index c2cb671ffc4a..b44e8627a5e0 100644 --- a/drivers/memory/tegra/Makefile +++ b/drivers/memory/tegra/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | tegra-mc-y := mc.o | 2 | tegra-mc-y := mc.o |
| 2 | 3 | ||
| 3 | tegra-mc-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30.o | 4 | tegra-mc-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30.o |
diff --git a/drivers/memstick/host/Makefile b/drivers/memstick/host/Makefile index 491c9557441d..1abaa03ee68c 100644 --- a/drivers/memstick/host/Makefile +++ b/drivers/memstick/host/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for MemoryStick host controller drivers | 3 | # Makefile for MemoryStick host controller drivers |
| 3 | # | 4 | # |
diff --git a/drivers/message/fusion/Makefile b/drivers/message/fusion/Makefile index d182a24b3195..e2d98b5c6f98 100644 --- a/drivers/message/fusion/Makefile +++ b/drivers/message/fusion/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Fusion MPT drivers; recognized debug defines... | 2 | # Fusion MPT drivers; recognized debug defines... |
| 2 | 3 | ||
| 3 | # enable verbose logging | 4 | # enable verbose logging |
diff --git a/drivers/message/fusion/lsi/mpi.h b/drivers/message/fusion/lsi/mpi.h index 11c0f461320e..a575545d681f 100644 --- a/drivers/message/fusion/lsi/mpi.h +++ b/drivers/message/fusion/lsi/mpi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (c) 2000-2008 LSI Corporation. | 3 | * Copyright (c) 2000-2008 LSI Corporation. |
| 3 | * | 4 | * |
diff --git a/drivers/message/fusion/lsi/mpi_cnfg.h b/drivers/message/fusion/lsi/mpi_cnfg.h index d9bcfba6b049..4e9c0ce94f27 100644 --- a/drivers/message/fusion/lsi/mpi_cnfg.h +++ b/drivers/message/fusion/lsi/mpi_cnfg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (c) 2000-2008 LSI Corporation. | 3 | * Copyright (c) 2000-2008 LSI Corporation. |
| 3 | * | 4 | * |
diff --git a/drivers/message/fusion/lsi/mpi_fc.h b/drivers/message/fusion/lsi/mpi_fc.h index 7d663ce76f8c..bdea95e0cde2 100644 --- a/drivers/message/fusion/lsi/mpi_fc.h +++ b/drivers/message/fusion/lsi/mpi_fc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (c) 2000-2008 LSI Corporation. | 3 | * Copyright (c) 2000-2008 LSI Corporation. |
| 3 | * | 4 | * |
diff --git a/drivers/message/fusion/lsi/mpi_init.h b/drivers/message/fusion/lsi/mpi_init.h index 4295d062caa7..bc6326ff2f22 100644 --- a/drivers/message/fusion/lsi/mpi_init.h +++ b/drivers/message/fusion/lsi/mpi_init.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (c) 2000-2008 LSI Corporation. | 3 | * Copyright (c) 2000-2008 LSI Corporation. |
| 3 | * | 4 | * |
diff --git a/drivers/message/fusion/lsi/mpi_ioc.h b/drivers/message/fusion/lsi/mpi_ioc.h index 19fb21b8f0ce..c249f2994fc1 100644 --- a/drivers/message/fusion/lsi/mpi_ioc.h +++ b/drivers/message/fusion/lsi/mpi_ioc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (c) 2000-2008 LSI Corporation. | 3 | * Copyright (c) 2000-2008 LSI Corporation. |
| 3 | * | 4 | * |
diff --git a/drivers/message/fusion/lsi/mpi_lan.h b/drivers/message/fusion/lsi/mpi_lan.h index f41fcb69b359..d06f9928684a 100644 --- a/drivers/message/fusion/lsi/mpi_lan.h +++ b/drivers/message/fusion/lsi/mpi_lan.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (c) 2000-2008 LSI Corporation. | 3 | * Copyright (c) 2000-2008 LSI Corporation. |
| 3 | * | 4 | * |
diff --git a/drivers/message/fusion/lsi/mpi_log_fc.h b/drivers/message/fusion/lsi/mpi_log_fc.h index 03be8b217709..f1e75dd5dd58 100644 --- a/drivers/message/fusion/lsi/mpi_log_fc.h +++ b/drivers/message/fusion/lsi/mpi_log_fc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (c) 2000-2008 LSI Corporation. All rights reserved. | 3 | * Copyright (c) 2000-2008 LSI Corporation. All rights reserved. |
| 3 | * | 4 | * |
diff --git a/drivers/message/fusion/lsi/mpi_log_sas.h b/drivers/message/fusion/lsi/mpi_log_sas.h index f62960b5d527..27fe17a75eaa 100644 --- a/drivers/message/fusion/lsi/mpi_log_sas.h +++ b/drivers/message/fusion/lsi/mpi_log_sas.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /*************************************************************************** | 2 | /*************************************************************************** |
| 2 | * * | 3 | * * |
| 3 | * Copyright (c) 2000-2008 LSI Corporation. All rights reserved. * | 4 | * Copyright (c) 2000-2008 LSI Corporation. All rights reserved. * |
diff --git a/drivers/message/fusion/lsi/mpi_raid.h b/drivers/message/fusion/lsi/mpi_raid.h index add60cc85be1..36688a921ef2 100644 --- a/drivers/message/fusion/lsi/mpi_raid.h +++ b/drivers/message/fusion/lsi/mpi_raid.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (c) 2001-2008 LSI Corporation. | 3 | * Copyright (c) 2001-2008 LSI Corporation. |
| 3 | * | 4 | * |
diff --git a/drivers/message/fusion/lsi/mpi_sas.h b/drivers/message/fusion/lsi/mpi_sas.h index ab410036bbfc..56013f288aaa 100644 --- a/drivers/message/fusion/lsi/mpi_sas.h +++ b/drivers/message/fusion/lsi/mpi_sas.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (c) 2004-2008 LSI Corporation. | 3 | * Copyright (c) 2004-2008 LSI Corporation. |
| 3 | * | 4 | * |
diff --git a/drivers/message/fusion/lsi/mpi_targ.h b/drivers/message/fusion/lsi/mpi_targ.h index c3dea7f6909d..97e6eead6cb4 100644 --- a/drivers/message/fusion/lsi/mpi_targ.h +++ b/drivers/message/fusion/lsi/mpi_targ.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (c) 2000-2008 LSI Corporation. | 3 | * Copyright (c) 2000-2008 LSI Corporation. |
| 3 | * | 4 | * |
diff --git a/drivers/message/fusion/lsi/mpi_tool.h b/drivers/message/fusion/lsi/mpi_tool.h index 53cd715aa7e4..b11456fb8277 100644 --- a/drivers/message/fusion/lsi/mpi_tool.h +++ b/drivers/message/fusion/lsi/mpi_tool.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (c) 2001-2008 LSI Corporation. | 3 | * Copyright (c) 2001-2008 LSI Corporation. |
| 3 | * | 4 | * |
diff --git a/drivers/message/fusion/lsi/mpi_type.h b/drivers/message/fusion/lsi/mpi_type.h index 888b26dbc413..073e637cfdb4 100644 --- a/drivers/message/fusion/lsi/mpi_type.h +++ b/drivers/message/fusion/lsi/mpi_type.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (c) 2000-2008 LSI Corporation. | 3 | * Copyright (c) 2000-2008 LSI Corporation. |
| 3 | * | 4 | * |
diff --git a/drivers/message/fusion/mptdebug.h b/drivers/message/fusion/mptdebug.h index 28e478879284..2205dcab0adb 100644 --- a/drivers/message/fusion/mptdebug.h +++ b/drivers/message/fusion/mptdebug.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * linux/drivers/message/fusion/mptdebug.h | 3 | * linux/drivers/message/fusion/mptdebug.h |
| 3 | * For use with LSI PCI chip/adapter(s) | 4 | * For use with LSI PCI chip/adapter(s) |
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index c3d0a1b39bb6..8703ff17998e 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for multifunction miscellaneous devices | 3 | # Makefile for multifunction miscellaneous devices |
| 3 | # | 4 | # |
diff --git a/drivers/mfd/twl-core.h b/drivers/mfd/twl-core.h index 6ff99dce714f..6f96c2009a9f 100644 --- a/drivers/mfd/twl-core.h +++ b/drivers/mfd/twl-core.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __TWL_CORE_H__ | 2 | #ifndef __TWL_CORE_H__ |
| 2 | #define __TWL_CORE_H__ | 3 | #define __TWL_CORE_H__ |
| 3 | 4 | ||
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index d84819dc2468..ad0e64fdba34 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for misc devices that really don't fit anywhere else. | 3 | # Makefile for misc devices that really don't fit anywhere else. |
| 3 | # | 4 | # |
diff --git a/drivers/misc/cxl/Makefile b/drivers/misc/cxl/Makefile index 0b5fd749d96d..502d41fc9ea5 100644 --- a/drivers/misc/cxl/Makefile +++ b/drivers/misc/cxl/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ccflags-y := $(call cc-disable-warning, unused-const-variable) | 2 | ccflags-y := $(call cc-disable-warning, unused-const-variable) |
| 2 | ccflags-$(CONFIG_PPC_WERROR) += -Werror | 3 | ccflags-$(CONFIG_PPC_WERROR) += -Werror |
| 3 | 4 | ||
diff --git a/drivers/misc/cxl/flash.c b/drivers/misc/cxl/flash.c index 3aa216bf0939..43917898fb9a 100644 --- a/drivers/misc/cxl/flash.c +++ b/drivers/misc/cxl/flash.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/fs.h> | 3 | #include <linux/fs.h> |
| 3 | #include <linux/semaphore.h> | 4 | #include <linux/semaphore.h> |
diff --git a/drivers/misc/eeprom/Makefile b/drivers/misc/eeprom/Makefile index 90a52624ddeb..2aab60ef3e3e 100644 --- a/drivers/misc/eeprom/Makefile +++ b/drivers/misc/eeprom/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_EEPROM_AT24) += at24.o | 2 | obj-$(CONFIG_EEPROM_AT24) += at24.o |
| 2 | obj-$(CONFIG_EEPROM_AT25) += at25.o | 3 | obj-$(CONFIG_EEPROM_AT25) += at25.o |
| 3 | obj-$(CONFIG_EEPROM_LEGACY) += eeprom.o | 4 | obj-$(CONFIG_EEPROM_LEGACY) += eeprom.o |
diff --git a/drivers/misc/ibmasm/Makefile b/drivers/misc/ibmasm/Makefile index 9e63ade5ffd6..1b9dd0f44411 100644 --- a/drivers/misc/ibmasm/Makefile +++ b/drivers/misc/ibmasm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | obj-$(CONFIG_IBM_ASM) := ibmasm.o | 3 | obj-$(CONFIG_IBM_ASM) := ibmasm.o |
| 3 | 4 | ||
diff --git a/drivers/misc/lkdtm.h b/drivers/misc/lkdtm.h index bfb6c45b6130..687a0dbbe199 100644 --- a/drivers/misc/lkdtm.h +++ b/drivers/misc/lkdtm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __LKDTM_H | 2 | #ifndef __LKDTM_H |
| 2 | #define __LKDTM_H | 3 | #define __LKDTM_H |
| 3 | 4 | ||
diff --git a/drivers/misc/lkdtm_bugs.c b/drivers/misc/lkdtm_bugs.c index 9e0b4f959987..b0f7af872bb5 100644 --- a/drivers/misc/lkdtm_bugs.c +++ b/drivers/misc/lkdtm_bugs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * This is for all the tests related to logic bugs (e.g. bad dereferences, | 3 | * This is for all the tests related to logic bugs (e.g. bad dereferences, |
| 3 | * bad alignment, bad loops, bad locking, bad scheduling, deep stacks, and | 4 | * bad alignment, bad loops, bad locking, bad scheduling, deep stacks, and |
diff --git a/drivers/misc/lkdtm_heap.c b/drivers/misc/lkdtm_heap.c index ffb6aeac07b3..f5494a6d4be5 100644 --- a/drivers/misc/lkdtm_heap.c +++ b/drivers/misc/lkdtm_heap.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * This is for all the tests relating directly to heap memory, including | 3 | * This is for all the tests relating directly to heap memory, including |
| 3 | * page allocation and slab allocations. | 4 | * page allocation and slab allocations. |
diff --git a/drivers/misc/lkdtm_perms.c b/drivers/misc/lkdtm_perms.c index c7635a79341f..53b85c9d16b8 100644 --- a/drivers/misc/lkdtm_perms.c +++ b/drivers/misc/lkdtm_perms.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * This is for all the tests related to validating kernel memory | 3 | * This is for all the tests related to validating kernel memory |
| 3 | * permissions: non-executable regions, non-writable regions, and | 4 | * permissions: non-executable regions, non-writable regions, and |
diff --git a/drivers/misc/lkdtm_rodata.c b/drivers/misc/lkdtm_rodata.c index 3564477b8c2d..58d180af72cf 100644 --- a/drivers/misc/lkdtm_rodata.c +++ b/drivers/misc/lkdtm_rodata.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * This includes functions that are meant to live entirely in .rodata | 3 | * This includes functions that are meant to live entirely in .rodata |
| 3 | * (via objcopy tricks), to validate the non-executability of .rodata. | 4 | * (via objcopy tricks), to validate the non-executability of .rodata. |
diff --git a/drivers/misc/lkdtm_usercopy.c b/drivers/misc/lkdtm_usercopy.c index df6ac985fbb5..a64372cc148d 100644 --- a/drivers/misc/lkdtm_usercopy.c +++ b/drivers/misc/lkdtm_usercopy.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * This is for all the tests related to copy_to_user() and copy_from_user() | 3 | * This is for all the tests related to copy_to_user() and copy_from_user() |
| 3 | * hardening. | 4 | * hardening. |
diff --git a/drivers/misc/mei/Makefile b/drivers/misc/mei/Makefile index 12cceb011a23..cd6825afa8e1 100644 --- a/drivers/misc/mei/Makefile +++ b/drivers/misc/mei/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile - Intel Management Engine Interface (Intel MEI) Linux driver | 3 | # Makefile - Intel Management Engine Interface (Intel MEI) Linux driver |
| 3 | # Copyright (c) 2010-2014, Intel Corporation. | 4 | # Copyright (c) 2010-2014, Intel Corporation. |
diff --git a/drivers/misc/mic/Makefile b/drivers/misc/mic/Makefile index f2b1323ff96c..1a43622b183f 100644 --- a/drivers/misc/mic/Makefile +++ b/drivers/misc/mic/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile - Intel MIC Linux driver. | 3 | # Makefile - Intel MIC Linux driver. |
| 3 | # Copyright(c) 2013, Intel Corporation. | 4 | # Copyright(c) 2013, Intel Corporation. |
diff --git a/drivers/misc/mic/card/Makefile b/drivers/misc/mic/card/Makefile index 6e9675e12a09..921a7e7e0fbd 100644 --- a/drivers/misc/mic/card/Makefile +++ b/drivers/misc/mic/card/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile - Intel MIC Linux driver. | 3 | # Makefile - Intel MIC Linux driver. |
| 3 | # Copyright(c) 2013, Intel Corporation. | 4 | # Copyright(c) 2013, Intel Corporation. |
diff --git a/drivers/misc/mic/cosm/Makefile b/drivers/misc/mic/cosm/Makefile index b85d4d49df46..97d74cb12030 100644 --- a/drivers/misc/mic/cosm/Makefile +++ b/drivers/misc/mic/cosm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile - Intel MIC Coprocessor State Management (COSM) Driver | 3 | # Makefile - Intel MIC Coprocessor State Management (COSM) Driver |
| 3 | # Copyright(c) 2015, Intel Corporation. | 4 | # Copyright(c) 2015, Intel Corporation. |
diff --git a/drivers/misc/mic/host/Makefile b/drivers/misc/mic/host/Makefile index f3b502333ded..25f153367980 100644 --- a/drivers/misc/mic/host/Makefile +++ b/drivers/misc/mic/host/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile - Intel MIC Linux driver. | 3 | # Makefile - Intel MIC Linux driver. |
| 3 | # Copyright(c) 2013, Intel Corporation. | 4 | # Copyright(c) 2013, Intel Corporation. |
diff --git a/drivers/misc/mic/scif/Makefile b/drivers/misc/mic/scif/Makefile index 29cfc3e51ac9..ff372555d118 100644 --- a/drivers/misc/mic/scif/Makefile +++ b/drivers/misc/mic/scif/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile - SCIF driver. | 3 | # Makefile - SCIF driver. |
| 3 | # Copyright(c) 2014, Intel Corporation. | 4 | # Copyright(c) 2014, Intel Corporation. |
diff --git a/drivers/misc/sgi-xp/Makefile b/drivers/misc/sgi-xp/Makefile index 4fc40d8e1bcc..bbb622c19c06 100644 --- a/drivers/misc/sgi-xp/Makefile +++ b/drivers/misc/sgi-xp/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for SGI's XP devices. | 3 | # Makefile for SGI's XP devices. |
| 3 | # | 4 | # |
diff --git a/drivers/mmc/core/Makefile b/drivers/mmc/core/Makefile index 7e3ed1aeada2..abba078f7f49 100644 --- a/drivers/mmc/core/Makefile +++ b/drivers/mmc/core/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel mmc core. | 3 | # Makefile for the kernel mmc core. |
| 3 | # | 4 | # |
diff --git a/drivers/mmc/core/block.h b/drivers/mmc/core/block.h index 860ca7c8df86..5946636101ef 100644 --- a/drivers/mmc/core/block.h +++ b/drivers/mmc/core/block.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _MMC_CORE_BLOCK_H | 2 | #ifndef _MMC_CORE_BLOCK_H |
| 2 | #define _MMC_CORE_BLOCK_H | 3 | #define _MMC_CORE_BLOCK_H |
| 3 | 4 | ||
diff --git a/drivers/mmc/core/queue.h b/drivers/mmc/core/queue.h index f18d3f656baa..6bfba32ffa66 100644 --- a/drivers/mmc/core/queue.h +++ b/drivers/mmc/core/queue.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef MMC_QUEUE_H | 2 | #ifndef MMC_QUEUE_H |
| 2 | #define MMC_QUEUE_H | 3 | #define MMC_QUEUE_H |
| 3 | 4 | ||
diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h index fb725934fa21..f664e9cbc9f8 100644 --- a/drivers/mmc/core/quirks.h +++ b/drivers/mmc/core/quirks.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * This file contains work-arounds for many known SD/MMC | 3 | * This file contains work-arounds for many known SD/MMC |
| 3 | * and SDIO hardware bugs. | 4 | * and SDIO hardware bugs. |
diff --git a/drivers/mmc/core/sd.h b/drivers/mmc/core/sd.h index 1ada9808c329..497c026a5c5a 100644 --- a/drivers/mmc/core/sd.h +++ b/drivers/mmc/core/sd.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _MMC_CORE_SD_H | 2 | #ifndef _MMC_CORE_SD_H |
| 2 | #define _MMC_CORE_SD_H | 3 | #define _MMC_CORE_SD_H |
| 3 | 4 | ||
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index 303f5cd46cd9..7c7b29ff591a 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for MMC/SD host controller drivers | 3 | # Makefile for MMC/SD host controller drivers |
| 3 | # | 4 | # |
diff --git a/drivers/mmc/host/dw_mmc-zx.h b/drivers/mmc/host/dw_mmc-zx.h index f369997a39ec..09ac52766f14 100644 --- a/drivers/mmc/host/dw_mmc-zx.h +++ b/drivers/mmc/host/dw_mmc-zx.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _DW_MMC_ZX_H_ | 2 | #ifndef _DW_MMC_ZX_H_ |
| 2 | #define _DW_MMC_ZX_H_ | 3 | #define _DW_MMC_ZX_H_ |
| 3 | 4 | ||
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 860313bd952a..4f2806720c5c 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c | |||
| @@ -401,16 +401,37 @@ static u32 dw_mci_prep_stop_abort(struct dw_mci *host, struct mmc_command *cmd) | |||
| 401 | static inline void dw_mci_set_cto(struct dw_mci *host) | 401 | static inline void dw_mci_set_cto(struct dw_mci *host) |
| 402 | { | 402 | { |
| 403 | unsigned int cto_clks; | 403 | unsigned int cto_clks; |
| 404 | unsigned int cto_div; | ||
| 404 | unsigned int cto_ms; | 405 | unsigned int cto_ms; |
| 406 | unsigned long irqflags; | ||
| 405 | 407 | ||
| 406 | cto_clks = mci_readl(host, TMOUT) & 0xff; | 408 | cto_clks = mci_readl(host, TMOUT) & 0xff; |
| 407 | cto_ms = DIV_ROUND_UP(cto_clks, host->bus_hz / 1000); | 409 | cto_div = (mci_readl(host, CLKDIV) & 0xff) * 2; |
| 410 | if (cto_div == 0) | ||
| 411 | cto_div = 1; | ||
| 412 | cto_ms = DIV_ROUND_UP(MSEC_PER_SEC * cto_clks * cto_div, host->bus_hz); | ||
| 408 | 413 | ||
| 409 | /* add a bit spare time */ | 414 | /* add a bit spare time */ |
| 410 | cto_ms += 10; | 415 | cto_ms += 10; |
| 411 | 416 | ||
| 412 | mod_timer(&host->cto_timer, | 417 | /* |
| 413 | jiffies + msecs_to_jiffies(cto_ms) + 1); | 418 | * The durations we're working with are fairly short so we have to be |
| 419 | * extra careful about synchronization here. Specifically in hardware a | ||
| 420 | * command timeout is _at most_ 5.1 ms, so that means we expect an | ||
| 421 | * interrupt (either command done or timeout) to come rather quickly | ||
| 422 | * after the mci_writel. ...but just in case we have a long interrupt | ||
| 423 | * latency let's add a bit of paranoia. | ||
| 424 | * | ||
| 425 | * In general we'll assume that at least an interrupt will be asserted | ||
| 426 | * in hardware by the time the cto_timer runs. ...and if it hasn't | ||
| 427 | * been asserted in hardware by that time then we'll assume it'll never | ||
| 428 | * come. | ||
| 429 | */ | ||
| 430 | spin_lock_irqsave(&host->irq_lock, irqflags); | ||
| 431 | if (!test_bit(EVENT_CMD_COMPLETE, &host->pending_events)) | ||
| 432 | mod_timer(&host->cto_timer, | ||
| 433 | jiffies + msecs_to_jiffies(cto_ms) + 1); | ||
| 434 | spin_unlock_irqrestore(&host->irq_lock, irqflags); | ||
| 414 | } | 435 | } |
| 415 | 436 | ||
| 416 | static void dw_mci_start_command(struct dw_mci *host, | 437 | static void dw_mci_start_command(struct dw_mci *host, |
| @@ -425,11 +446,11 @@ static void dw_mci_start_command(struct dw_mci *host, | |||
| 425 | wmb(); /* drain writebuffer */ | 446 | wmb(); /* drain writebuffer */ |
| 426 | dw_mci_wait_while_busy(host, cmd_flags); | 447 | dw_mci_wait_while_busy(host, cmd_flags); |
| 427 | 448 | ||
| 449 | mci_writel(host, CMD, cmd_flags | SDMMC_CMD_START); | ||
| 450 | |||
| 428 | /* response expected command only */ | 451 | /* response expected command only */ |
| 429 | if (cmd_flags & SDMMC_CMD_RESP_EXP) | 452 | if (cmd_flags & SDMMC_CMD_RESP_EXP) |
| 430 | dw_mci_set_cto(host); | 453 | dw_mci_set_cto(host); |
| 431 | |||
| 432 | mci_writel(host, CMD, cmd_flags | SDMMC_CMD_START); | ||
| 433 | } | 454 | } |
| 434 | 455 | ||
| 435 | static inline void send_stop_abort(struct dw_mci *host, struct mmc_data *data) | 456 | static inline void send_stop_abort(struct dw_mci *host, struct mmc_data *data) |
| @@ -1915,10 +1936,15 @@ static int dw_mci_data_complete(struct dw_mci *host, struct mmc_data *data) | |||
| 1915 | static void dw_mci_set_drto(struct dw_mci *host) | 1936 | static void dw_mci_set_drto(struct dw_mci *host) |
| 1916 | { | 1937 | { |
| 1917 | unsigned int drto_clks; | 1938 | unsigned int drto_clks; |
| 1939 | unsigned int drto_div; | ||
| 1918 | unsigned int drto_ms; | 1940 | unsigned int drto_ms; |
| 1919 | 1941 | ||
| 1920 | drto_clks = mci_readl(host, TMOUT) >> 8; | 1942 | drto_clks = mci_readl(host, TMOUT) >> 8; |
| 1921 | drto_ms = DIV_ROUND_UP(drto_clks, host->bus_hz / 1000); | 1943 | drto_div = (mci_readl(host, CLKDIV) & 0xff) * 2; |
| 1944 | if (drto_div == 0) | ||
| 1945 | drto_div = 1; | ||
| 1946 | drto_ms = DIV_ROUND_UP(MSEC_PER_SEC * drto_clks * drto_div, | ||
| 1947 | host->bus_hz); | ||
| 1922 | 1948 | ||
| 1923 | /* add a bit spare time */ | 1949 | /* add a bit spare time */ |
| 1924 | drto_ms += 10; | 1950 | drto_ms += 10; |
| @@ -1926,6 +1952,24 @@ static void dw_mci_set_drto(struct dw_mci *host) | |||
| 1926 | mod_timer(&host->dto_timer, jiffies + msecs_to_jiffies(drto_ms)); | 1952 | mod_timer(&host->dto_timer, jiffies + msecs_to_jiffies(drto_ms)); |
| 1927 | } | 1953 | } |
| 1928 | 1954 | ||
| 1955 | static bool dw_mci_clear_pending_cmd_complete(struct dw_mci *host) | ||
| 1956 | { | ||
| 1957 | if (!test_bit(EVENT_CMD_COMPLETE, &host->pending_events)) | ||
| 1958 | return false; | ||
| 1959 | |||
| 1960 | /* | ||
| 1961 | * Really be certain that the timer has stopped. This is a bit of | ||
| 1962 | * paranoia and could only really happen if we had really bad | ||
| 1963 | * interrupt latency and the interrupt routine and timeout were | ||
| 1964 | * running concurrently so that the del_timer() in the interrupt | ||
| 1965 | * handler couldn't run. | ||
| 1966 | */ | ||
| 1967 | WARN_ON(del_timer_sync(&host->cto_timer)); | ||
| 1968 | clear_bit(EVENT_CMD_COMPLETE, &host->pending_events); | ||
| 1969 | |||
| 1970 | return true; | ||
| 1971 | } | ||
| 1972 | |||
| 1929 | static void dw_mci_tasklet_func(unsigned long priv) | 1973 | static void dw_mci_tasklet_func(unsigned long priv) |
| 1930 | { | 1974 | { |
| 1931 | struct dw_mci *host = (struct dw_mci *)priv; | 1975 | struct dw_mci *host = (struct dw_mci *)priv; |
| @@ -1952,8 +1996,7 @@ static void dw_mci_tasklet_func(unsigned long priv) | |||
| 1952 | 1996 | ||
| 1953 | case STATE_SENDING_CMD11: | 1997 | case STATE_SENDING_CMD11: |
| 1954 | case STATE_SENDING_CMD: | 1998 | case STATE_SENDING_CMD: |
| 1955 | if (!test_and_clear_bit(EVENT_CMD_COMPLETE, | 1999 | if (!dw_mci_clear_pending_cmd_complete(host)) |
| 1956 | &host->pending_events)) | ||
| 1957 | break; | 2000 | break; |
| 1958 | 2001 | ||
| 1959 | cmd = host->cmd; | 2002 | cmd = host->cmd; |
| @@ -2122,8 +2165,7 @@ static void dw_mci_tasklet_func(unsigned long priv) | |||
| 2122 | /* fall through */ | 2165 | /* fall through */ |
| 2123 | 2166 | ||
| 2124 | case STATE_SENDING_STOP: | 2167 | case STATE_SENDING_STOP: |
| 2125 | if (!test_and_clear_bit(EVENT_CMD_COMPLETE, | 2168 | if (!dw_mci_clear_pending_cmd_complete(host)) |
| 2126 | &host->pending_events)) | ||
| 2127 | break; | 2169 | break; |
| 2128 | 2170 | ||
| 2129 | /* CMD error in data command */ | 2171 | /* CMD error in data command */ |
| @@ -2570,6 +2612,8 @@ done: | |||
| 2570 | 2612 | ||
| 2571 | static void dw_mci_cmd_interrupt(struct dw_mci *host, u32 status) | 2613 | static void dw_mci_cmd_interrupt(struct dw_mci *host, u32 status) |
| 2572 | { | 2614 | { |
| 2615 | del_timer(&host->cto_timer); | ||
| 2616 | |||
| 2573 | if (!host->cmd_status) | 2617 | if (!host->cmd_status) |
| 2574 | host->cmd_status = status; | 2618 | host->cmd_status = status; |
| 2575 | 2619 | ||
| @@ -2594,6 +2638,7 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) | |||
| 2594 | struct dw_mci *host = dev_id; | 2638 | struct dw_mci *host = dev_id; |
| 2595 | u32 pending; | 2639 | u32 pending; |
| 2596 | struct dw_mci_slot *slot = host->slot; | 2640 | struct dw_mci_slot *slot = host->slot; |
| 2641 | unsigned long irqflags; | ||
| 2597 | 2642 | ||
| 2598 | pending = mci_readl(host, MINTSTS); /* read-only mask reg */ | 2643 | pending = mci_readl(host, MINTSTS); /* read-only mask reg */ |
| 2599 | 2644 | ||
| @@ -2601,8 +2646,6 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) | |||
| 2601 | /* Check volt switch first, since it can look like an error */ | 2646 | /* Check volt switch first, since it can look like an error */ |
| 2602 | if ((host->state == STATE_SENDING_CMD11) && | 2647 | if ((host->state == STATE_SENDING_CMD11) && |
| 2603 | (pending & SDMMC_INT_VOLT_SWITCH)) { | 2648 | (pending & SDMMC_INT_VOLT_SWITCH)) { |
| 2604 | unsigned long irqflags; | ||
| 2605 | |||
| 2606 | mci_writel(host, RINTSTS, SDMMC_INT_VOLT_SWITCH); | 2649 | mci_writel(host, RINTSTS, SDMMC_INT_VOLT_SWITCH); |
| 2607 | pending &= ~SDMMC_INT_VOLT_SWITCH; | 2650 | pending &= ~SDMMC_INT_VOLT_SWITCH; |
| 2608 | 2651 | ||
| @@ -2618,11 +2661,15 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) | |||
| 2618 | } | 2661 | } |
| 2619 | 2662 | ||
| 2620 | if (pending & DW_MCI_CMD_ERROR_FLAGS) { | 2663 | if (pending & DW_MCI_CMD_ERROR_FLAGS) { |
| 2664 | spin_lock_irqsave(&host->irq_lock, irqflags); | ||
| 2665 | |||
| 2621 | del_timer(&host->cto_timer); | 2666 | del_timer(&host->cto_timer); |
| 2622 | mci_writel(host, RINTSTS, DW_MCI_CMD_ERROR_FLAGS); | 2667 | mci_writel(host, RINTSTS, DW_MCI_CMD_ERROR_FLAGS); |
| 2623 | host->cmd_status = pending; | 2668 | host->cmd_status = pending; |
| 2624 | smp_wmb(); /* drain writebuffer */ | 2669 | smp_wmb(); /* drain writebuffer */ |
| 2625 | set_bit(EVENT_CMD_COMPLETE, &host->pending_events); | 2670 | set_bit(EVENT_CMD_COMPLETE, &host->pending_events); |
| 2671 | |||
| 2672 | spin_unlock_irqrestore(&host->irq_lock, irqflags); | ||
| 2626 | } | 2673 | } |
| 2627 | 2674 | ||
| 2628 | if (pending & DW_MCI_DATA_ERROR_FLAGS) { | 2675 | if (pending & DW_MCI_DATA_ERROR_FLAGS) { |
| @@ -2662,9 +2709,12 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) | |||
| 2662 | } | 2709 | } |
| 2663 | 2710 | ||
| 2664 | if (pending & SDMMC_INT_CMD_DONE) { | 2711 | if (pending & SDMMC_INT_CMD_DONE) { |
| 2665 | del_timer(&host->cto_timer); | 2712 | spin_lock_irqsave(&host->irq_lock, irqflags); |
| 2713 | |||
| 2666 | mci_writel(host, RINTSTS, SDMMC_INT_CMD_DONE); | 2714 | mci_writel(host, RINTSTS, SDMMC_INT_CMD_DONE); |
| 2667 | dw_mci_cmd_interrupt(host, pending); | 2715 | dw_mci_cmd_interrupt(host, pending); |
| 2716 | |||
| 2717 | spin_unlock_irqrestore(&host->irq_lock, irqflags); | ||
| 2668 | } | 2718 | } |
| 2669 | 2719 | ||
| 2670 | if (pending & SDMMC_INT_CD) { | 2720 | if (pending & SDMMC_INT_CD) { |
| @@ -2938,7 +2988,35 @@ static void dw_mci_cmd11_timer(unsigned long arg) | |||
| 2938 | static void dw_mci_cto_timer(unsigned long arg) | 2988 | static void dw_mci_cto_timer(unsigned long arg) |
| 2939 | { | 2989 | { |
| 2940 | struct dw_mci *host = (struct dw_mci *)arg; | 2990 | struct dw_mci *host = (struct dw_mci *)arg; |
| 2991 | unsigned long irqflags; | ||
| 2992 | u32 pending; | ||
| 2941 | 2993 | ||
| 2994 | spin_lock_irqsave(&host->irq_lock, irqflags); | ||
| 2995 | |||
| 2996 | /* | ||
| 2997 | * If somehow we have very bad interrupt latency it's remotely possible | ||
| 2998 | * that the timer could fire while the interrupt is still pending or | ||
| 2999 | * while the interrupt is midway through running. Let's be paranoid | ||
| 3000 | * and detect those two cases. Note that this is paranoia is somewhat | ||
| 3001 | * justified because in this function we don't actually cancel the | ||
| 3002 | * pending command in the controller--we just assume it will never come. | ||
| 3003 | */ | ||
| 3004 | pending = mci_readl(host, MINTSTS); /* read-only mask reg */ | ||
| 3005 | if (pending & (DW_MCI_CMD_ERROR_FLAGS | SDMMC_INT_CMD_DONE)) { | ||
| 3006 | /* The interrupt should fire; no need to act but we can warn */ | ||
| 3007 | dev_warn(host->dev, "Unexpected interrupt latency\n"); | ||
| 3008 | goto exit; | ||
| 3009 | } | ||
| 3010 | if (test_bit(EVENT_CMD_COMPLETE, &host->pending_events)) { | ||
| 3011 | /* Presumably interrupt handler couldn't delete the timer */ | ||
| 3012 | dev_warn(host->dev, "CTO timeout when already completed\n"); | ||
| 3013 | goto exit; | ||
| 3014 | } | ||
| 3015 | |||
| 3016 | /* | ||
| 3017 | * Continued paranoia to make sure we're in the state we expect. | ||
| 3018 | * This paranoia isn't really justified but it seems good to be safe. | ||
| 3019 | */ | ||
| 2942 | switch (host->state) { | 3020 | switch (host->state) { |
| 2943 | case STATE_SENDING_CMD11: | 3021 | case STATE_SENDING_CMD11: |
| 2944 | case STATE_SENDING_CMD: | 3022 | case STATE_SENDING_CMD: |
| @@ -2957,6 +3035,9 @@ static void dw_mci_cto_timer(unsigned long arg) | |||
| 2957 | host->state); | 3035 | host->state); |
| 2958 | break; | 3036 | break; |
| 2959 | } | 3037 | } |
| 3038 | |||
| 3039 | exit: | ||
| 3040 | spin_unlock_irqrestore(&host->irq_lock, irqflags); | ||
| 2960 | } | 3041 | } |
| 2961 | 3042 | ||
| 2962 | static void dw_mci_dto_timer(unsigned long arg) | 3043 | static void dw_mci_dto_timer(unsigned long arg) |
diff --git a/drivers/mmc/host/pxamci.h b/drivers/mmc/host/pxamci.h index f6c2e2fcce37..d301ca18c5d4 100644 --- a/drivers/mmc/host/pxamci.h +++ b/drivers/mmc/host/pxamci.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #define MMC_STRPCL 0x0000 | 2 | #define MMC_STRPCL 0x0000 |
| 2 | #define STOP_CLOCK (1 << 0) | 3 | #define STOP_CLOCK (1 << 0) |
| 3 | #define START_CLOCK (2 << 0) | 4 | #define START_CLOCK (2 << 0) |
diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c index f905f2361d12..8bae88a150fd 100644 --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c | |||
| @@ -146,11 +146,8 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host, | |||
| 146 | WARN_ON(host->sg_len > 1); | 146 | WARN_ON(host->sg_len > 1); |
| 147 | 147 | ||
| 148 | /* This DMAC cannot handle if buffer is not 8-bytes alignment */ | 148 | /* This DMAC cannot handle if buffer is not 8-bytes alignment */ |
| 149 | if (!IS_ALIGNED(sg->offset, 8)) { | 149 | if (!IS_ALIGNED(sg->offset, 8)) |
| 150 | host->force_pio = true; | 150 | goto force_pio; |
| 151 | renesas_sdhi_internal_dmac_enable_dma(host, false); | ||
| 152 | return; | ||
| 153 | } | ||
| 154 | 151 | ||
| 155 | if (data->flags & MMC_DATA_READ) { | 152 | if (data->flags & MMC_DATA_READ) { |
| 156 | dtran_mode |= DTRAN_MODE_CH_NUM_CH1; | 153 | dtran_mode |= DTRAN_MODE_CH_NUM_CH1; |
| @@ -163,8 +160,8 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host, | |||
| 163 | } | 160 | } |
| 164 | 161 | ||
| 165 | ret = dma_map_sg(&host->pdev->dev, sg, host->sg_len, dir); | 162 | ret = dma_map_sg(&host->pdev->dev, sg, host->sg_len, dir); |
| 166 | if (ret < 0) | 163 | if (ret == 0) |
| 167 | return; | 164 | goto force_pio; |
| 168 | 165 | ||
| 169 | renesas_sdhi_internal_dmac_enable_dma(host, true); | 166 | renesas_sdhi_internal_dmac_enable_dma(host, true); |
| 170 | 167 | ||
| @@ -176,6 +173,12 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host, | |||
| 176 | dtran_mode); | 173 | dtran_mode); |
| 177 | renesas_sdhi_internal_dmac_dm_write(host, DM_DTRAN_ADDR, | 174 | renesas_sdhi_internal_dmac_dm_write(host, DM_DTRAN_ADDR, |
| 178 | sg->dma_address); | 175 | sg->dma_address); |
| 176 | |||
| 177 | return; | ||
| 178 | |||
| 179 | force_pio: | ||
| 180 | host->force_pio = true; | ||
| 181 | renesas_sdhi_internal_dmac_enable_dma(host, false); | ||
| 179 | } | 182 | } |
| 180 | 183 | ||
| 181 | static void renesas_sdhi_internal_dmac_issue_tasklet_fn(unsigned long arg) | 184 | static void renesas_sdhi_internal_dmac_issue_tasklet_fn(unsigned long arg) |
diff --git a/drivers/mmc/host/sdhci-pci.h b/drivers/mmc/host/sdhci-pci.h index 75196a2b5289..3e8ea3e566f6 100644 --- a/drivers/mmc/host/sdhci-pci.h +++ b/drivers/mmc/host/sdhci-pci.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __SDHCI_PCI_H | 2 | #ifndef __SDHCI_PCI_H |
| 2 | #define __SDHCI_PCI_H | 3 | #define __SDHCI_PCI_H |
| 3 | 4 | ||
diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index a7293e186e03..9c4e6199b854 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <linux/mmc/sdio.h> | 47 | #include <linux/mmc/sdio.h> |
| 48 | #include <linux/scatterlist.h> | 48 | #include <linux/scatterlist.h> |
| 49 | #include <linux/spinlock.h> | 49 | #include <linux/spinlock.h> |
| 50 | #include <linux/swiotlb.h> | ||
| 50 | #include <linux/workqueue.h> | 51 | #include <linux/workqueue.h> |
| 51 | 52 | ||
| 52 | #include "tmio_mmc.h" | 53 | #include "tmio_mmc.h" |
| @@ -1215,6 +1216,18 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, | |||
| 1215 | mmc->max_blk_count = pdata->max_blk_count ? : | 1216 | mmc->max_blk_count = pdata->max_blk_count ? : |
| 1216 | (PAGE_SIZE / mmc->max_blk_size) * mmc->max_segs; | 1217 | (PAGE_SIZE / mmc->max_blk_size) * mmc->max_segs; |
| 1217 | mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; | 1218 | mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; |
| 1219 | /* | ||
| 1220 | * Since swiotlb has memory size limitation, this will calculate | ||
| 1221 | * the maximum size locally (because we don't have any APIs for it now) | ||
| 1222 | * and check the current max_req_size. And then, this will update | ||
| 1223 | * the max_req_size if needed as a workaround. | ||
| 1224 | */ | ||
| 1225 | if (swiotlb_max_segment()) { | ||
| 1226 | unsigned int max_size = (1 << IO_TLB_SHIFT) * IO_TLB_SEGSIZE; | ||
| 1227 | |||
| 1228 | if (mmc->max_req_size > max_size) | ||
| 1229 | mmc->max_req_size = max_size; | ||
| 1230 | } | ||
| 1218 | mmc->max_seg_size = mmc->max_req_size; | 1231 | mmc->max_seg_size = mmc->max_req_size; |
| 1219 | 1232 | ||
| 1220 | _host->native_hotplug = !(pdata->flags & TMIO_MMC_USE_GPIO_CD || | 1233 | _host->native_hotplug = !(pdata->flags & TMIO_MMC_USE_GPIO_CD || |
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index 151d60df303a..d6f8f625e1ff 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the memory technology device drivers. | 3 | # Makefile for the memory technology device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/mtd/chips/Makefile b/drivers/mtd/chips/Makefile index 36582412ccda..1f4e84f1cd88 100644 --- a/drivers/mtd/chips/Makefile +++ b/drivers/mtd/chips/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # linux/drivers/chips/Makefile | 3 | # linux/drivers/chips/Makefile |
| 3 | # | 4 | # |
diff --git a/drivers/mtd/chips/fwh_lock.h b/drivers/mtd/chips/fwh_lock.h index 800b0e853e86..53e6b2d5932b 100644 --- a/drivers/mtd/chips/fwh_lock.h +++ b/drivers/mtd/chips/fwh_lock.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef FWH_LOCK_H | 2 | #ifndef FWH_LOCK_H |
| 2 | #define FWH_LOCK_H | 3 | #define FWH_LOCK_H |
| 3 | 4 | ||
diff --git a/drivers/mtd/devices/Makefile b/drivers/mtd/devices/Makefile index f0f767624cc6..94895eab3066 100644 --- a/drivers/mtd/devices/Makefile +++ b/drivers/mtd/devices/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # linux/drivers/mtd/devices/Makefile | 3 | # linux/drivers/mtd/devices/Makefile |
| 3 | # | 4 | # |
diff --git a/drivers/mtd/devices/bcm47xxsflash.h b/drivers/mtd/devices/bcm47xxsflash.h index b2d7b38f75fd..fef0d5e42e2a 100644 --- a/drivers/mtd/devices/bcm47xxsflash.h +++ b/drivers/mtd/devices/bcm47xxsflash.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __BCM47XXSFLASH_H | 2 | #ifndef __BCM47XXSFLASH_H |
| 2 | #define __BCM47XXSFLASH_H | 3 | #define __BCM47XXSFLASH_H |
| 3 | 4 | ||
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index 5a09a72ab112..b849aaf85c34 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # linux/drivers/maps/Makefile | 3 | # linux/drivers/maps/Makefile |
| 3 | # | 4 | # |
diff --git a/drivers/mtd/maps/physmap_of_gemini.c b/drivers/mtd/maps/physmap_of_gemini.c index 4ed1a6bb4d3c..830b1b7e702b 100644 --- a/drivers/mtd/maps/physmap_of_gemini.c +++ b/drivers/mtd/maps/physmap_of_gemini.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Cortina Systems Gemini OF physmap add-on | 3 | * Cortina Systems Gemini OF physmap add-on |
| 3 | * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org> | 4 | * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org> |
diff --git a/drivers/mtd/maps/physmap_of_gemini.h b/drivers/mtd/maps/physmap_of_gemini.h index c675025288dd..60e13a689d6a 100644 --- a/drivers/mtd/maps/physmap_of_gemini.h +++ b/drivers/mtd/maps/physmap_of_gemini.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/of.h> | 2 | #include <linux/of.h> |
| 2 | #include <linux/mtd/map.h> | 3 | #include <linux/mtd/map.h> |
| 3 | 4 | ||
diff --git a/drivers/mtd/maps/physmap_of_versatile.h b/drivers/mtd/maps/physmap_of_versatile.h index 5b86f6dc6b3d..0302502c9462 100644 --- a/drivers/mtd/maps/physmap_of_versatile.h +++ b/drivers/mtd/maps/physmap_of_versatile.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/of.h> | 2 | #include <linux/of.h> |
| 2 | #include <linux/mtd/map.h> | 3 | #include <linux/mtd/map.h> |
| 3 | 4 | ||
diff --git a/drivers/mtd/maps/tsunami_flash.c b/drivers/mtd/maps/tsunami_flash.c index da2cdb5fd6db..9fc1f727aa76 100644 --- a/drivers/mtd/maps/tsunami_flash.c +++ b/drivers/mtd/maps/tsunami_flash.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * tsunami_flash.c | 3 | * tsunami_flash.c |
| 3 | * | 4 | * |
diff --git a/drivers/mtd/mtdcore.h b/drivers/mtd/mtdcore.h index 55fdb8e1fd2a..37accfd0400e 100644 --- a/drivers/mtd/mtdcore.h +++ b/drivers/mtd/mtdcore.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * These are exported solely for the purpose of mtd_blkdevs.c and mtdchar.c. | 3 | * These are exported solely for the purpose of mtd_blkdevs.c and mtdchar.c. |
| 3 | * You should not use them for _anything_ else. | 4 | * You should not use them for _anything_ else. |
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index ade5fc4c3819..6e2db700d923 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # linux/drivers/nand/Makefile | 3 | # linux/drivers/nand/Makefile |
| 3 | # | 4 | # |
diff --git a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h index c8834767ab6d..201b9baa52a0 100644 --- a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h +++ b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __BCM47XXNFLASH_H | 2 | #ifndef __BCM47XXNFLASH_H |
| 2 | #define __BCM47XXNFLASH_H | 3 | #define __BCM47XXNFLASH_H |
| 3 | 4 | ||
diff --git a/drivers/mtd/nand/brcmnand/Makefile b/drivers/mtd/nand/brcmnand/Makefile index b28ffb59eb43..195b845e48b8 100644 --- a/drivers/mtd/nand/brcmnand/Makefile +++ b/drivers/mtd/nand/brcmnand/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # link order matters; don't link the more generic brcmstb_nand.o before the | 2 | # link order matters; don't link the more generic brcmstb_nand.o before the |
| 2 | # more specific iproc_nand.o, for instance | 3 | # more specific iproc_nand.o, for instance |
| 3 | obj-$(CONFIG_MTD_NAND_BRCMNAND) += iproc_nand.o | 4 | obj-$(CONFIG_MTD_NAND_BRCMNAND) += iproc_nand.o |
diff --git a/drivers/mtd/onenand/Makefile b/drivers/mtd/onenand/Makefile index 9d6540e8b3d2..f8b624aca9cc 100644 --- a/drivers/mtd/onenand/Makefile +++ b/drivers/mtd/onenand/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the OneNAND MTD | 3 | # Makefile for the OneNAND MTD |
| 3 | # | 4 | # |
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c index 680188a88130..420260c25ca0 100644 --- a/drivers/mtd/onenand/onenand_bbt.c +++ b/drivers/mtd/onenand/onenand_bbt.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * linux/drivers/mtd/onenand/onenand_bbt.c | 3 | * linux/drivers/mtd/onenand/onenand_bbt.c |
| 3 | * | 4 | * |
diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile index 7d84c5108e17..f4c61d282abd 100644 --- a/drivers/mtd/spi-nor/Makefile +++ b/drivers/mtd/spi-nor/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_MTD_SPI_NOR) += spi-nor.o | 2 | obj-$(CONFIG_MTD_SPI_NOR) += spi-nor.o |
| 2 | obj-$(CONFIG_SPI_ASPEED_SMC) += aspeed-smc.o | 3 | obj-$(CONFIG_SPI_ASPEED_SMC) += aspeed-smc.o |
| 3 | obj-$(CONFIG_SPI_ATMEL_QUADSPI) += atmel-quadspi.o | 4 | obj-$(CONFIG_SPI_ATMEL_QUADSPI) += atmel-quadspi.o |
diff --git a/drivers/mtd/tests/Makefile b/drivers/mtd/tests/Makefile index 937a829bb701..5de0378f90db 100644 --- a/drivers/mtd/tests/Makefile +++ b/drivers/mtd/tests/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_MTD_TESTS) += mtd_oobtest.o | 2 | obj-$(CONFIG_MTD_TESTS) += mtd_oobtest.o |
| 2 | obj-$(CONFIG_MTD_TESTS) += mtd_pagetest.o | 3 | obj-$(CONFIG_MTD_TESTS) += mtd_pagetest.o |
| 3 | obj-$(CONFIG_MTD_TESTS) += mtd_readtest.o | 4 | obj-$(CONFIG_MTD_TESTS) += mtd_readtest.o |
diff --git a/drivers/mtd/tests/mtd_test.c b/drivers/mtd/tests/mtd_test.c index 34736bbcc07b..3d0b8b5c1a53 100644 --- a/drivers/mtd/tests/mtd_test.c +++ b/drivers/mtd/tests/mtd_test.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #define pr_fmt(fmt) "mtd_test: " fmt | 2 | #define pr_fmt(fmt) "mtd_test: " fmt |
| 2 | 3 | ||
| 3 | #include <linux/module.h> | 4 | #include <linux/module.h> |
diff --git a/drivers/mtd/tests/mtd_test.h b/drivers/mtd/tests/mtd_test.h index 04afd0e7074f..5a6e3bbe0474 100644 --- a/drivers/mtd/tests/mtd_test.h +++ b/drivers/mtd/tests/mtd_test.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/mtd/mtd.h> | 2 | #include <linux/mtd/mtd.h> |
| 2 | #include <linux/sched/signal.h> | 3 | #include <linux/sched/signal.h> |
| 3 | 4 | ||
diff --git a/drivers/mtd/ubi/Makefile b/drivers/mtd/ubi/Makefile index 4e3c3d70d8c3..543673605ca7 100644 --- a/drivers/mtd/ubi/Makefile +++ b/drivers/mtd/ubi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_MTD_UBI) += ubi.o | 2 | obj-$(CONFIG_MTD_UBI) += ubi.o |
| 2 | 3 | ||
| 3 | ubi-y += vtbl.o vmt.o upd.o build.o cdev.o kapi.o eba.o io.o wl.o attach.o | 4 | ubi-y += vtbl.o vmt.o upd.o build.o cdev.o kapi.o eba.o io.o wl.o attach.o |
diff --git a/drivers/mtd/ubi/wl.h b/drivers/mtd/ubi/wl.h index bd1f07e5ce9a..2aaa3f7f2ba9 100644 --- a/drivers/mtd/ubi/wl.h +++ b/drivers/mtd/ubi/wl.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef UBI_WL_H | 2 | #ifndef UBI_WL_H |
| 2 | #define UBI_WL_H | 3 | #define UBI_WL_H |
| 3 | #ifdef CONFIG_MTD_UBI_FASTMAP | 4 | #ifdef CONFIG_MTD_UBI_FASTMAP |
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 8dff900085d6..676a75f4182a 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux network device drivers. | 3 | # Makefile for the Linux network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/appletalk/cops.h b/drivers/net/appletalk/cops.h index fd2750b269c8..7a0bfb351929 100644 --- a/drivers/net/appletalk/cops.h +++ b/drivers/net/appletalk/cops.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* cops.h: LocalTalk driver for Linux. | 2 | /* cops.h: LocalTalk driver for Linux. |
| 2 | * | 3 | * |
| 3 | * Authors: | 4 | * Authors: |
diff --git a/drivers/net/appletalk/ipddp.h b/drivers/net/appletalk/ipddp.h index 531519da99a3..9a8e45a46925 100644 --- a/drivers/net/appletalk/ipddp.h +++ b/drivers/net/appletalk/ipddp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * ipddp.h: Header for IP-over-DDP driver for Linux. | 3 | * ipddp.h: Header for IP-over-DDP driver for Linux. |
| 3 | */ | 4 | */ |
diff --git a/drivers/net/appletalk/ltpc.h b/drivers/net/appletalk/ltpc.h index cd30544a3729..58cf945732a4 100644 --- a/drivers/net/appletalk/ltpc.h +++ b/drivers/net/appletalk/ltpc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /*** ltpc.h | 2 | /*** ltpc.h |
| 2 | * | 3 | * |
| 3 | * | 4 | * |
diff --git a/drivers/net/arcnet/Makefile b/drivers/net/arcnet/Makefile index 5ce8ee63e435..53525e8ea130 100644 --- a/drivers/net/arcnet/Makefile +++ b/drivers/net/arcnet/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for linux/drivers/net/arcnet | 2 | # Makefile for linux/drivers/net/arcnet |
| 2 | # | 3 | # |
| 3 | 4 | ||
diff --git a/drivers/net/arcnet/com9026.h b/drivers/net/arcnet/com9026.h index efcaf6707214..6adbc18711e0 100644 --- a/drivers/net/arcnet/com9026.h +++ b/drivers/net/arcnet/com9026.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __COM9026_H | 2 | #ifndef __COM9026_H |
| 2 | #define __COM9026_H | 3 | #define __COM9026_H |
| 3 | 4 | ||
diff --git a/drivers/net/bonding/bond_debugfs.c b/drivers/net/bonding/bond_debugfs.c index e52e25a977fa..3868e1a5126d 100644 --- a/drivers/net/bonding/bond_debugfs.c +++ b/drivers/net/bonding/bond_debugfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/module.h> | 3 | #include <linux/module.h> |
| 3 | #include <linux/device.h> | 4 | #include <linux/device.h> |
diff --git a/drivers/net/bonding/bond_procfs.c b/drivers/net/bonding/bond_procfs.c index d8d4ada034b7..f7799321dffb 100644 --- a/drivers/net/bonding/bond_procfs.c +++ b/drivers/net/bonding/bond_procfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/proc_fs.h> | 2 | #include <linux/proc_fs.h> |
| 2 | #include <linux/export.h> | 3 | #include <linux/export.h> |
| 3 | #include <net/net_namespace.h> | 4 | #include <net/net_namespace.h> |
diff --git a/drivers/net/caif/Makefile b/drivers/net/caif/Makefile index 9bbd45391f6c..54ae1165d60a 100644 --- a/drivers/net/caif/Makefile +++ b/drivers/net/caif/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ccflags-$(CONFIG_CAIF_DEBUG) := -DDEBUG | 2 | ccflags-$(CONFIG_CAIF_DEBUG) := -DDEBUG |
| 2 | 3 | ||
| 3 | # Serial interface | 4 | # Serial interface |
diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile index 4aabbee133b8..02b8ed794564 100644 --- a/drivers/net/can/Makefile +++ b/drivers/net/can/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux Controller Area Network drivers. | 3 | # Makefile for the Linux Controller Area Network drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/can/sja1000/Makefile b/drivers/net/can/sja1000/Makefile index be11ddd11b87..9253aaf9e739 100644 --- a/drivers/net/can/sja1000/Makefile +++ b/drivers/net/can/sja1000/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the SJA1000 CAN controller drivers. | 3 | # Makefile for the SJA1000 CAN controller drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/can/softing/softing.h b/drivers/net/can/softing/softing.h index 35f062282dbd..2893007ea05e 100644 --- a/drivers/net/can/softing/softing.h +++ b/drivers/net/can/softing/softing.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * softing common interfaces | 3 | * softing common interfaces |
| 3 | * | 4 | * |
diff --git a/drivers/net/can/softing/softing_platform.h b/drivers/net/can/softing/softing_platform.h index ebbf69815623..68a161547644 100644 --- a/drivers/net/can/softing/softing_platform.h +++ b/drivers/net/can/softing/softing_platform.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #include <linux/platform_device.h> | 3 | #include <linux/platform_device.h> |
| 3 | 4 | ||
diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c index 68ef0a4cd821..b0c80859f746 100644 --- a/drivers/net/can/sun4i_can.c +++ b/drivers/net/can/sun4i_can.c | |||
| @@ -342,7 +342,7 @@ static int sun4i_can_start(struct net_device *dev) | |||
| 342 | 342 | ||
| 343 | /* enter the selected mode */ | 343 | /* enter the selected mode */ |
| 344 | mod_reg_val = readl(priv->base + SUN4I_REG_MSEL_ADDR); | 344 | mod_reg_val = readl(priv->base + SUN4I_REG_MSEL_ADDR); |
| 345 | if (priv->can.ctrlmode & CAN_CTRLMODE_PRESUME_ACK) | 345 | if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK) |
| 346 | mod_reg_val |= SUN4I_MSEL_LOOPBACK_MODE; | 346 | mod_reg_val |= SUN4I_MSEL_LOOPBACK_MODE; |
| 347 | else if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) | 347 | else if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) |
| 348 | mod_reg_val |= SUN4I_MSEL_LISTEN_ONLY_MODE; | 348 | mod_reg_val |= SUN4I_MSEL_LISTEN_ONLY_MODE; |
| @@ -811,7 +811,6 @@ static int sun4ican_probe(struct platform_device *pdev) | |||
| 811 | priv->can.ctrlmode_supported = CAN_CTRLMODE_BERR_REPORTING | | 811 | priv->can.ctrlmode_supported = CAN_CTRLMODE_BERR_REPORTING | |
| 812 | CAN_CTRLMODE_LISTENONLY | | 812 | CAN_CTRLMODE_LISTENONLY | |
| 813 | CAN_CTRLMODE_LOOPBACK | | 813 | CAN_CTRLMODE_LOOPBACK | |
| 814 | CAN_CTRLMODE_PRESUME_ACK | | ||
| 815 | CAN_CTRLMODE_3_SAMPLES; | 814 | CAN_CTRLMODE_3_SAMPLES; |
| 816 | priv->base = addr; | 815 | priv->base = addr; |
| 817 | priv->clk = clk; | 816 | priv->clk = clk; |
diff --git a/drivers/net/can/usb/Makefile b/drivers/net/can/usb/Makefile index 164453fd55d0..49ac7b99ba32 100644 --- a/drivers/net/can/usb/Makefile +++ b/drivers/net/can/usb/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux Controller Area Network USB drivers. | 3 | # Makefile for the Linux Controller Area Network USB drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c index 18cc529fb807..9b18d96ef526 100644 --- a/drivers/net/can/usb/kvaser_usb.c +++ b/drivers/net/can/usb/kvaser_usb.c | |||
| @@ -137,6 +137,7 @@ static inline bool kvaser_is_usbcan(const struct usb_device_id *id) | |||
| 137 | #define CMD_RESET_ERROR_COUNTER 49 | 137 | #define CMD_RESET_ERROR_COUNTER 49 |
| 138 | #define CMD_TX_ACKNOWLEDGE 50 | 138 | #define CMD_TX_ACKNOWLEDGE 50 |
| 139 | #define CMD_CAN_ERROR_EVENT 51 | 139 | #define CMD_CAN_ERROR_EVENT 51 |
| 140 | #define CMD_FLUSH_QUEUE_REPLY 68 | ||
| 140 | 141 | ||
| 141 | #define CMD_LEAF_USB_THROTTLE 77 | 142 | #define CMD_LEAF_USB_THROTTLE 77 |
| 142 | #define CMD_LEAF_LOG_MESSAGE 106 | 143 | #define CMD_LEAF_LOG_MESSAGE 106 |
| @@ -1301,6 +1302,11 @@ static void kvaser_usb_handle_message(const struct kvaser_usb *dev, | |||
| 1301 | goto warn; | 1302 | goto warn; |
| 1302 | break; | 1303 | break; |
| 1303 | 1304 | ||
| 1305 | case CMD_FLUSH_QUEUE_REPLY: | ||
| 1306 | if (dev->family != KVASER_LEAF) | ||
| 1307 | goto warn; | ||
| 1308 | break; | ||
| 1309 | |||
| 1304 | default: | 1310 | default: |
| 1305 | warn: dev_warn(dev->udev->dev.parent, | 1311 | warn: dev_warn(dev->udev->dev.parent, |
| 1306 | "Unhandled message (%d)\n", msg->id); | 1312 | "Unhandled message (%d)\n", msg->id); |
| @@ -1609,7 +1615,8 @@ static int kvaser_usb_close(struct net_device *netdev) | |||
| 1609 | if (err) | 1615 | if (err) |
| 1610 | netdev_warn(netdev, "Cannot flush queue, error %d\n", err); | 1616 | netdev_warn(netdev, "Cannot flush queue, error %d\n", err); |
| 1611 | 1617 | ||
| 1612 | if (kvaser_usb_send_simple_msg(dev, CMD_RESET_CHIP, priv->channel)) | 1618 | err = kvaser_usb_send_simple_msg(dev, CMD_RESET_CHIP, priv->channel); |
| 1619 | if (err) | ||
| 1613 | netdev_warn(netdev, "Cannot reset card, error %d\n", err); | 1620 | netdev_warn(netdev, "Cannot reset card, error %d\n", err); |
| 1614 | 1621 | ||
| 1615 | err = kvaser_usb_stop_chip(priv); | 1622 | err = kvaser_usb_stop_chip(priv); |
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c index 017f48cdcab9..1cbca8e5741e 100644 --- a/drivers/net/cris/eth_v10.c +++ b/drivers/net/cris/eth_v10.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * e100net.c: A network driver for the ETRAX 100LX network controller. | 3 | * e100net.c: A network driver for the ETRAX 100LX network controller. |
| 3 | * | 4 | * |
diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile index 4a5b5bd297ee..d040aeb45172 100644 --- a/drivers/net/dsa/Makefile +++ b/drivers/net/dsa/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_NET_DSA_BCM_SF2) += bcm-sf2.o | 2 | obj-$(CONFIG_NET_DSA_BCM_SF2) += bcm-sf2.o |
| 2 | bcm-sf2-objs := bcm_sf2.o bcm_sf2_cfp.o | 3 | bcm-sf2-objs := bcm_sf2.o bcm_sf2_cfp.o |
| 3 | obj-$(CONFIG_NET_DSA_LOOP) += dsa_loop.o dsa_loop_bdinfo.o | 4 | obj-$(CONFIG_NET_DSA_LOOP) += dsa_loop.o dsa_loop_bdinfo.o |
diff --git a/drivers/net/dsa/b53/Makefile b/drivers/net/dsa/b53/Makefile index 7e6f9a8bfd75..4256fb42a4dd 100644 --- a/drivers/net/dsa/b53/Makefile +++ b/drivers/net/dsa/b53/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_B53) += b53_common.o | 2 | obj-$(CONFIG_B53) += b53_common.o |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_B53_SPI_DRIVER) += b53_spi.o | 4 | obj-$(CONFIG_B53_SPI_DRIVER) += b53_spi.o |
diff --git a/drivers/net/dsa/dsa_loop.h b/drivers/net/dsa/dsa_loop.h index dc396877fc95..93e5c15d0efd 100644 --- a/drivers/net/dsa/dsa_loop.h +++ b/drivers/net/dsa/dsa_loop.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __DSA_LOOP_H | 2 | #ifndef __DSA_LOOP_H |
| 2 | #define __DSA_LOOP_H | 3 | #define __DSA_LOOP_H |
| 3 | 4 | ||
diff --git a/drivers/net/dsa/lan9303.h b/drivers/net/dsa/lan9303.h index 4d8be555ff4d..7df2ac77fc8f 100644 --- a/drivers/net/dsa/lan9303.h +++ b/drivers/net/dsa/lan9303.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/regmap.h> | 2 | #include <linux/regmap.h> |
| 2 | #include <linux/device.h> | 3 | #include <linux/device.h> |
| 3 | #include <net/dsa.h> | 4 | #include <net/dsa.h> |
diff --git a/drivers/net/dsa/mv88e6xxx/Makefile b/drivers/net/dsa/mv88e6xxx/Makefile index 5cd5551461e3..58a4a0014e59 100644 --- a/drivers/net/dsa/mv88e6xxx/Makefile +++ b/drivers/net/dsa/mv88e6xxx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o | 2 | obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o |
| 2 | mv88e6xxx-objs := chip.o | 3 | mv88e6xxx-objs := chip.o |
| 3 | mv88e6xxx-objs += global1.o | 4 | mv88e6xxx-objs += global1.o |
diff --git a/drivers/net/ethernet/3com/Makefile b/drivers/net/ethernet/3com/Makefile index 74046afab993..f8b73babc510 100644 --- a/drivers/net/ethernet/3com/Makefile +++ b/drivers/net/ethernet/3com/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the 3Com Ethernet device drivers | 3 | # Makefile for the 3Com Ethernet device drivers |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/8390/Makefile b/drivers/net/ethernet/8390/Makefile index ff3b31894188..f975c2fc88a3 100644 --- a/drivers/net/ethernet/8390/Makefile +++ b/drivers/net/ethernet/8390/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the 8390 network device drivers. | 3 | # Makefile for the 8390 network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index a0a03d4d939a..39f6273358ed 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux network Ethernet device drivers. | 3 | # Makefile for the Linux network Ethernet device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/aeroflex/greth.h b/drivers/net/ethernet/aeroflex/greth.h index 9c07140a5d8d..a1e04c9e932e 100644 --- a/drivers/net/ethernet/aeroflex/greth.h +++ b/drivers/net/ethernet/aeroflex/greth.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef GRETH_H | 2 | #ifndef GRETH_H |
| 2 | #define GRETH_H | 3 | #define GRETH_H |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/alacritech/slic.h b/drivers/net/ethernet/alacritech/slic.h index 08931b4afc96..d0c388cfd52f 100644 --- a/drivers/net/ethernet/alacritech/slic.h +++ b/drivers/net/ethernet/alacritech/slic.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #ifndef _SLIC_H | 3 | #ifndef _SLIC_H |
| 3 | #define _SLIC_H | 4 | #define _SLIC_H |
diff --git a/drivers/net/ethernet/alteon/acenic.h b/drivers/net/ethernet/alteon/acenic.h index 51c486cfbb8c..c670067b1541 100644 --- a/drivers/net/ethernet/alteon/acenic.h +++ b/drivers/net/ethernet/alteon/acenic.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _ACENIC_H_ | 2 | #ifndef _ACENIC_H_ |
| 2 | #define _ACENIC_H_ | 3 | #define _ACENIC_H_ |
| 3 | #include <linux/interrupt.h> | 4 | #include <linux/interrupt.h> |
diff --git a/drivers/net/ethernet/amd/7990.h b/drivers/net/ethernet/amd/7990.h index e9e0be313804..741cdc392c6b 100644 --- a/drivers/net/ethernet/amd/7990.h +++ b/drivers/net/ethernet/amd/7990.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * 7990.h -- LANCE ethernet IC generic routines. | 3 | * 7990.h -- LANCE ethernet IC generic routines. |
| 3 | * This is an attempt to separate out the bits of various ethernet | 4 | * This is an attempt to separate out the bits of various ethernet |
diff --git a/drivers/net/ethernet/amd/Makefile b/drivers/net/ethernet/amd/Makefile index a38a2dce3eb3..45f86822a5f7 100644 --- a/drivers/net/ethernet/amd/Makefile +++ b/drivers/net/ethernet/amd/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the AMD network device drivers. | 3 | # Makefile for the AMD network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/amd/hplance.h b/drivers/net/ethernet/amd/hplance.h index 04aee9e0376a..bc845a2c60c1 100644 --- a/drivers/net/ethernet/amd/hplance.h +++ b/drivers/net/ethernet/amd/hplance.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* Random defines and structures for the HP Lance driver. | 2 | /* Random defines and structures for the HP Lance driver. |
| 2 | * Copyright (C) 05/1998 Peter Maydell <pmaydell@chiark.greenend.org.uk> | 3 | * Copyright (C) 05/1998 Peter Maydell <pmaydell@chiark.greenend.org.uk> |
| 3 | * Based on the Sun Lance driver and the NetBSD HP Lance driver | 4 | * Based on the Sun Lance driver and the NetBSD HP Lance driver |
diff --git a/drivers/net/ethernet/amd/xgbe/Makefile b/drivers/net/ethernet/amd/xgbe/Makefile index 0dea8f5da899..620785ffbd51 100644 --- a/drivers/net/ethernet/amd/xgbe/Makefile +++ b/drivers/net/ethernet/amd/xgbe/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_AMD_XGBE) += amd-xgbe.o | 2 | obj-$(CONFIG_AMD_XGBE) += amd-xgbe.o |
| 2 | 3 | ||
| 3 | amd-xgbe-objs := xgbe-main.o xgbe-drv.o xgbe-dev.o \ | 4 | amd-xgbe-objs := xgbe-main.o xgbe-drv.o xgbe-dev.o \ |
diff --git a/drivers/net/ethernet/arc/emac.h b/drivers/net/ethernet/arc/emac.h index e4feb712d4f2..3c63b16d485f 100644 --- a/drivers/net/ethernet/arc/emac.h +++ b/drivers/net/ethernet/arc/emac.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 2004-2013 Synopsys, Inc. (www.synopsys.com) | 3 | * Copyright (C) 2004-2013 Synopsys, Inc. (www.synopsys.com) |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/arc/emac_mdio.c b/drivers/net/ethernet/arc/emac_mdio.c index a22403c688c9..0187dbf3b87d 100644 --- a/drivers/net/ethernet/arc/emac_mdio.c +++ b/drivers/net/ethernet/arc/emac_mdio.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 2004-2013 Synopsys, Inc. (www.synopsys.com) | 3 | * Copyright (C) 2004-2013 Synopsys, Inc. (www.synopsys.com) |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/atheros/Makefile b/drivers/net/ethernet/atheros/Makefile index 5cf1c65bbce9..aa3d394b87e6 100644 --- a/drivers/net/ethernet/atheros/Makefile +++ b/drivers/net/ethernet/atheros/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Atheros network device drivers. | 3 | # Makefile for the Atheros network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/aurora/nb8800.h b/drivers/net/ethernet/aurora/nb8800.h index 6ec4a956e1e5..aacc3cce2cc0 100644 --- a/drivers/net/ethernet/aurora/nb8800.h +++ b/drivers/net/ethernet/aurora/nb8800.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _NB8800_H_ | 2 | #ifndef _NB8800_H_ |
| 2 | #define _NB8800_H_ | 3 | #define _NB8800_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/broadcom/Makefile b/drivers/net/ethernet/broadcom/Makefile index 79f2372c66ec..7046ad6d3d0e 100644 --- a/drivers/net/ethernet/broadcom/Makefile +++ b/drivers/net/ethernet/broadcom/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Broadcom network device drivers. | 3 | # Makefile for the Broadcom network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/broadcom/b44.h b/drivers/net/ethernet/broadcom/b44.h index 89d2cf341163..b3e36ca0fd19 100644 --- a/drivers/net/ethernet/broadcom/b44.h +++ b/drivers/net/ethernet/broadcom/b44.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _B44_H | 2 | #ifndef _B44_H |
| 2 | #define _B44_H | 3 | #define _B44_H |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.h b/drivers/net/ethernet/broadcom/bcm63xx_enet.h index 0a1b7b2e55bd..c6f6f14e87ca 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef BCM63XX_ENET_H_ | 2 | #ifndef BCM63XX_ENET_H_ |
| 2 | #define BCM63XX_ENET_H_ | 3 | #define BCM63XX_ENET_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index 83eec9a8c275..eb441e5e2cd8 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c | |||
| @@ -1809,15 +1809,17 @@ static inline void bcm_sysport_mask_all_intrs(struct bcm_sysport_priv *priv) | |||
| 1809 | 1809 | ||
| 1810 | static inline void gib_set_pad_extension(struct bcm_sysport_priv *priv) | 1810 | static inline void gib_set_pad_extension(struct bcm_sysport_priv *priv) |
| 1811 | { | 1811 | { |
| 1812 | u32 __maybe_unused reg; | 1812 | u32 reg; |
| 1813 | 1813 | ||
| 1814 | /* Include Broadcom tag in pad extension */ | 1814 | reg = gib_readl(priv, GIB_CONTROL); |
| 1815 | /* Include Broadcom tag in pad extension and fix up IPG_LENGTH */ | ||
| 1815 | if (netdev_uses_dsa(priv->netdev)) { | 1816 | if (netdev_uses_dsa(priv->netdev)) { |
| 1816 | reg = gib_readl(priv, GIB_CONTROL); | ||
| 1817 | reg &= ~(GIB_PAD_EXTENSION_MASK << GIB_PAD_EXTENSION_SHIFT); | 1817 | reg &= ~(GIB_PAD_EXTENSION_MASK << GIB_PAD_EXTENSION_SHIFT); |
| 1818 | reg |= ENET_BRCM_TAG_LEN << GIB_PAD_EXTENSION_SHIFT; | 1818 | reg |= ENET_BRCM_TAG_LEN << GIB_PAD_EXTENSION_SHIFT; |
| 1819 | gib_writel(priv, reg, GIB_CONTROL); | ||
| 1820 | } | 1819 | } |
| 1820 | reg &= ~(GIB_IPG_LEN_MASK << GIB_IPG_LEN_SHIFT); | ||
| 1821 | reg |= 12 << GIB_IPG_LEN_SHIFT; | ||
| 1822 | gib_writel(priv, reg, GIB_CONTROL); | ||
| 1821 | } | 1823 | } |
| 1822 | 1824 | ||
| 1823 | static int bcm_sysport_open(struct net_device *dev) | 1825 | static int bcm_sysport_open(struct net_device *dev) |
diff --git a/drivers/net/ethernet/broadcom/bgmac.h b/drivers/net/ethernet/broadcom/bgmac.h index 443d57b10264..4040d846da8e 100644 --- a/drivers/net/ethernet/broadcom/bgmac.h +++ b/drivers/net/ethernet/broadcom/bgmac.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BGMAC_H | 2 | #ifndef _BGMAC_H |
| 2 | #define _BGMAC_H | 3 | #define _BGMAC_H |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h index 3b5e98ecba00..c2d02d02d1e6 100644 --- a/drivers/net/ethernet/broadcom/tg3.h +++ b/drivers/net/ethernet/broadcom/tg3.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: tg3.h,v 1.37.2.32 2002/03/11 12:18:18 davem Exp $ | 2 | /* $Id: tg3.h,v 1.37.2.32 2002/03/11 12:18:18 davem Exp $ |
| 2 | * tg3.h: Definitions for Broadcom Tigon3 ethernet driver. | 3 | * tg3.h: Definitions for Broadcom Tigon3 ethernet driver. |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/cadence/Makefile b/drivers/net/ethernet/cadence/Makefile index 1d66ddb68969..1f33cdca9a3c 100644 --- a/drivers/net/ethernet/cadence/Makefile +++ b/drivers/net/ethernet/cadence/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Atmel network device drivers. | 3 | # Makefile for the Atmel network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/cavium/liquidio/Makefile b/drivers/net/ethernet/cavium/liquidio/Makefile index c4d411d1aa28..b802896bb2e0 100644 --- a/drivers/net/ethernet/cavium/liquidio/Makefile +++ b/drivers/net/ethernet/cavium/liquidio/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Cavium Liquidio ethernet device driver | 3 | # Cavium Liquidio ethernet device driver |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/cavium/thunder/Makefile b/drivers/net/ethernet/cavium/thunder/Makefile index 6b4d4add7353..2fc6142d1634 100644 --- a/drivers/net/ethernet/cavium/thunder/Makefile +++ b/drivers/net/ethernet/cavium/thunder/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for Cavium's Thunder ethernet device | 3 | # Makefile for Cavium's Thunder ethernet device |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/chelsio/Makefile b/drivers/net/ethernet/chelsio/Makefile index b6a5eec6ed8e..c0f978d2e8a7 100644 --- a/drivers/net/ethernet/chelsio/Makefile +++ b/drivers/net/ethernet/chelsio/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Chelsio network device drivers. | 3 | # Makefile for the Chelsio network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/chelsio/cxgb/fpga_defs.h b/drivers/net/ethernet/chelsio/cxgb/fpga_defs.h index ccdb2bc9ae98..e9c65d812c4e 100644 --- a/drivers/net/ethernet/chelsio/cxgb/fpga_defs.h +++ b/drivers/net/ethernet/chelsio/cxgb/fpga_defs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Date: 2005/03/07 23:59:05 $ $RCSfile: fpga_defs.h,v $ $Revision: 1.4 $ */ | 2 | /* $Date: 2005/03/07 23:59:05 $ $RCSfile: fpga_defs.h,v $ $Revision: 1.4 $ */ |
| 2 | 3 | ||
| 3 | /* | 4 | /* |
diff --git a/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c index 76ce6e538326..30b003484fc1 100644 --- a/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c +++ b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* $Date: 2005/10/24 23:18:13 $ $RCSfile: mv88e1xxx.c,v $ $Revision: 1.49 $ */ | 2 | /* $Date: 2005/10/24 23:18:13 $ $RCSfile: mv88e1xxx.c,v $ $Revision: 1.49 $ */ |
| 2 | #include "common.h" | 3 | #include "common.h" |
| 3 | #include "mv88e1xxx.h" | 4 | #include "mv88e1xxx.h" |
diff --git a/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h index 967cc4286359..11bf0f7c2f90 100644 --- a/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h +++ b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Date: 2005/03/07 23:59:05 $ $RCSfile: mv88e1xxx.h,v $ $Revision: 1.13 $ */ | 2 | /* $Date: 2005/03/07 23:59:05 $ $RCSfile: mv88e1xxx.h,v $ $Revision: 1.13 $ */ |
| 2 | #ifndef CHELSIO_MV8E1XXX_H | 3 | #ifndef CHELSIO_MV8E1XXX_H |
| 3 | #define CHELSIO_MV8E1XXX_H | 4 | #define CHELSIO_MV8E1XXX_H |
diff --git a/drivers/net/ethernet/chelsio/cxgb/my3126.c b/drivers/net/ethernet/chelsio/cxgb/my3126.c index d546f46c8ef7..20c09cc4b323 100644 --- a/drivers/net/ethernet/chelsio/cxgb/my3126.c +++ b/drivers/net/ethernet/chelsio/cxgb/my3126.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* $Date: 2005/11/12 02:13:49 $ $RCSfile: my3126.c,v $ $Revision: 1.15 $ */ | 2 | /* $Date: 2005/11/12 02:13:49 $ $RCSfile: my3126.c,v $ $Revision: 1.15 $ */ |
| 2 | #include "cphy.h" | 3 | #include "cphy.h" |
| 3 | #include "elmer0.h" | 4 | #include "elmer0.h" |
diff --git a/drivers/net/ethernet/chelsio/cxgb/tp.c b/drivers/net/ethernet/chelsio/cxgb/tp.c index b146acabf982..4337cee0763e 100644 --- a/drivers/net/ethernet/chelsio/cxgb/tp.c +++ b/drivers/net/ethernet/chelsio/cxgb/tp.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* $Date: 2006/02/07 04:21:54 $ $RCSfile: tp.c,v $ $Revision: 1.73 $ */ | 2 | /* $Date: 2006/02/07 04:21:54 $ $RCSfile: tp.c,v $ $Revision: 1.73 $ */ |
| 2 | #include "common.h" | 3 | #include "common.h" |
| 3 | #include "regs.h" | 4 | #include "regs.h" |
diff --git a/drivers/net/ethernet/chelsio/cxgb/tp.h b/drivers/net/ethernet/chelsio/cxgb/tp.h index dfd8ce25106a..ba15675d56df 100644 --- a/drivers/net/ethernet/chelsio/cxgb/tp.h +++ b/drivers/net/ethernet/chelsio/cxgb/tp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Date: 2005/03/07 23:59:05 $ $RCSfile: tp.h,v $ $Revision: 1.20 $ */ | 2 | /* $Date: 2005/03/07 23:59:05 $ $RCSfile: tp.h,v $ $Revision: 1.20 $ */ |
| 2 | #ifndef CHELSIO_TP_H | 3 | #ifndef CHELSIO_TP_H |
| 3 | #define CHELSIO_TP_H | 4 | #define CHELSIO_TP_H |
diff --git a/drivers/net/ethernet/chelsio/cxgb/vsc7326.c b/drivers/net/ethernet/chelsio/cxgb/vsc7326.c index bdc895bd2a46..873c1c7b4ca0 100644 --- a/drivers/net/ethernet/chelsio/cxgb/vsc7326.c +++ b/drivers/net/ethernet/chelsio/cxgb/vsc7326.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* $Date: 2006/04/28 19:20:06 $ $RCSfile: vsc7326.c,v $ $Revision: 1.19 $ */ | 2 | /* $Date: 2006/04/28 19:20:06 $ $RCSfile: vsc7326.c,v $ $Revision: 1.19 $ */ |
| 2 | 3 | ||
| 3 | /* Driver for Vitesse VSC7326 (Schaumburg) MAC */ | 4 | /* Driver for Vitesse VSC7326 (Schaumburg) MAC */ |
diff --git a/drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h b/drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h index 479edbcabe68..04503857c6a9 100644 --- a/drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h +++ b/drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Date: 2006/04/28 19:20:17 $ $RCSfile: vsc7326_reg.h,v $ $Revision: 1.5 $ */ | 2 | /* $Date: 2006/04/28 19:20:17 $ $RCSfile: vsc7326_reg.h,v $ $Revision: 1.5 $ */ |
| 2 | #ifndef _VSC7321_REG_H_ | 3 | #ifndef _VSC7321_REG_H_ |
| 3 | #define _VSC7321_REG_H_ | 4 | #define _VSC7321_REG_H_ |
diff --git a/drivers/net/ethernet/chelsio/cxgb3/regs.h b/drivers/net/ethernet/chelsio/cxgb3/regs.h index 81029b872bdd..174eb45100a4 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/regs.h +++ b/drivers/net/ethernet/chelsio/cxgb3/regs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #define A_SG_CONTROL 0x0 | 2 | #define A_SG_CONTROL 0x0 |
| 2 | 3 | ||
| 3 | #define S_CONGMODE 29 | 4 | #define S_CONGMODE 29 |
diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge_defs.h b/drivers/net/ethernet/chelsio/cxgb3/sge_defs.h index 29b6c800b238..c31ce8dc95fb 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/sge_defs.h +++ b/drivers/net/ethernet/chelsio/cxgb3/sge_defs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * This file is automatically generated --- any changes will be lost. | 3 | * This file is automatically generated --- any changes will be lost. |
| 3 | */ | 4 | */ |
diff --git a/drivers/net/ethernet/chelsio/cxgb4/Makefile b/drivers/net/ethernet/chelsio/cxgb4/Makefile index 817212702f0a..24143c8abfdb 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/Makefile +++ b/drivers/net/ethernet/chelsio/cxgb4/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Chelsio T4 driver | 3 | # Chelsio T4 driver |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.c b/drivers/net/ethernet/cisco/enic/enic_clsf.c index 3c677ed3c29e..8dc21c9f9716 100644 --- a/drivers/net/ethernet/cisco/enic/enic_clsf.c +++ b/drivers/net/ethernet/cisco/enic/enic_clsf.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/if.h> | 2 | #include <linux/if.h> |
| 2 | #include <linux/if_ether.h> | 3 | #include <linux/if_ether.h> |
| 3 | #include <linux/if_link.h> | 4 | #include <linux/if_link.h> |
diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.h b/drivers/net/ethernet/cisco/enic/enic_clsf.h index 6aa9f89d073b..d3c4a1cb0610 100644 --- a/drivers/net/ethernet/cisco/enic/enic_clsf.h +++ b/drivers/net/ethernet/cisco/enic/enic_clsf.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _ENIC_CLSF_H_ | 2 | #ifndef _ENIC_CLSF_H_ |
| 2 | #define _ENIC_CLSF_H_ | 3 | #define _ENIC_CLSF_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/davicom/dm9000.h b/drivers/net/ethernet/davicom/dm9000.h index 9ce058adabab..581b35ad44ef 100644 --- a/drivers/net/ethernet/davicom/dm9000.h +++ b/drivers/net/ethernet/davicom/dm9000.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * dm9000 Ethernet | 3 | * dm9000 Ethernet |
| 3 | */ | 4 | */ |
diff --git a/drivers/net/ethernet/dec/tulip/Makefile b/drivers/net/ethernet/dec/tulip/Makefile index 5e8be38b45bb..8aab37564d5d 100644 --- a/drivers/net/ethernet/dec/tulip/Makefile +++ b/drivers/net/ethernet/dec/tulip/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux "Tulip" family network device drivers. | 3 | # Makefile for the Linux "Tulip" family network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/freescale/Makefile b/drivers/net/ethernet/freescale/Makefile index c46df5c82af5..ed8ad0fefbda 100644 --- a/drivers/net/ethernet/freescale/Makefile +++ b/drivers/net/ethernet/freescale/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Freescale network device drivers. | 3 | # Makefile for the Freescale network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/freescale/dpaa/Makefile b/drivers/net/ethernet/freescale/dpaa/Makefile index 7db50bccb137..4f23e79232fa 100644 --- a/drivers/net/ethernet/freescale/dpaa/Makefile +++ b/drivers/net/ethernet/freescale/dpaa/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Freescale DPAA Ethernet controllers | 3 | # Makefile for the Freescale DPAA Ethernet controllers |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h index ede1876a9a19..44720f83af27 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /****************************************************************************/ | 2 | /****************************************************************************/ |
| 2 | 3 | ||
| 3 | /* | 4 | /* |
diff --git a/drivers/net/ethernet/freescale/fman/Makefile b/drivers/net/ethernet/freescale/fman/Makefile index 2c38119b172c..f83a3653b63b 100644 --- a/drivers/net/ethernet/freescale/fman/Makefile +++ b/drivers/net/ethernet/freescale/fman/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | subdir-ccflags-y += -I$(srctree)/drivers/net/ethernet/freescale/fman | 2 | subdir-ccflags-y += -I$(srctree)/drivers/net/ethernet/freescale/fman |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_FSL_FMAN) += fsl_fman.o | 4 | obj-$(CONFIG_FSL_FMAN) += fsl_fman.o |
diff --git a/drivers/net/ethernet/freescale/fs_enet/Makefile b/drivers/net/ethernet/freescale/fs_enet/Makefile index d4a305ee3455..1821f94ef619 100644 --- a/drivers/net/ethernet/freescale/fs_enet/Makefile +++ b/drivers/net/ethernet/freescale/fs_enet/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Freescale Ethernet controllers | 3 | # Makefile for the Freescale Ethernet controllers |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/freescale/fs_enet/fec.h b/drivers/net/ethernet/freescale/fs_enet/fec.h index b9fe5bde432a..7832db71dcb9 100644 --- a/drivers/net/ethernet/freescale/fs_enet/fec.h +++ b/drivers/net/ethernet/freescale/fs_enet/fec.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef FS_ENET_FEC_H | 2 | #ifndef FS_ENET_FEC_H |
| 2 | #define FS_ENET_FEC_H | 3 | #define FS_ENET_FEC_H |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h index 5ce516c8a62a..168e10ea487f 100644 --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef FS_ENET_H | 2 | #ifndef FS_ENET_H |
| 2 | #define FS_ENET_H | 3 | #define FS_ENET_H |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/hisilicon/Makefile b/drivers/net/ethernet/hisilicon/Makefile index 3828c435c18f..7f76d412047a 100644 --- a/drivers/net/ethernet/hisilicon/Makefile +++ b/drivers/net/ethernet/hisilicon/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the HISILICON network device drivers. | 3 | # Makefile for the HISILICON network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/hisilicon/hns/Makefile b/drivers/net/ethernet/hisilicon/hns/Makefile index 6010c83e38d8..7aa623b9c82a 100644 --- a/drivers/net/ethernet/hisilicon/hns/Makefile +++ b/drivers/net/ethernet/hisilicon/hns/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the HISILICON network device drivers. | 3 | # Makefile for the HISILICON network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c index 36520634c96a..e77192683dba 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c | |||
| @@ -2369,8 +2369,8 @@ static int hns_nic_dev_probe(struct platform_device *pdev) | |||
| 2369 | priv->enet_ver = AE_VERSION_2; | 2369 | priv->enet_ver = AE_VERSION_2; |
| 2370 | 2370 | ||
| 2371 | ae_node = of_parse_phandle(dev->of_node, "ae-handle", 0); | 2371 | ae_node = of_parse_phandle(dev->of_node, "ae-handle", 0); |
| 2372 | if (IS_ERR_OR_NULL(ae_node)) { | 2372 | if (!ae_node) { |
| 2373 | ret = PTR_ERR(ae_node); | 2373 | ret = -ENODEV; |
| 2374 | dev_err(dev, "not find ae-handle\n"); | 2374 | dev_err(dev, "not find ae-handle\n"); |
| 2375 | goto out_read_prop_fail; | 2375 | goto out_read_prop_fail; |
| 2376 | } | 2376 | } |
diff --git a/drivers/net/ethernet/i825xx/Makefile b/drivers/net/ethernet/i825xx/Makefile index 8c8dcd29c40d..422a19a5d94f 100644 --- a/drivers/net/ethernet/i825xx/Makefile +++ b/drivers/net/ethernet/i825xx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Intel 82586/82593/82596 chipset device drivers. | 3 | # Makefile for the Intel 82586/82593/82596 chipset device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/ibm/emac/Makefile b/drivers/net/ethernet/ibm/emac/Makefile index 98768ba0955a..ddf1ce3c8cca 100644 --- a/drivers/net/ethernet/ibm/emac/Makefile +++ b/drivers/net/ethernet/ibm/emac/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the PowerPC 4xx on-chip ethernet driver | 3 | # Makefile for the PowerPC 4xx on-chip ethernet driver |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/intel/Makefile b/drivers/net/ethernet/intel/Makefile index 5ea764d85ec3..90af7757a885 100644 --- a/drivers/net/ethernet/intel/Makefile +++ b/drivers/net/ethernet/intel/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Intel network device drivers. | 3 | # Makefile for the Intel network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c index ec8aa4562cc9..3b3983a1ffbb 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c +++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c | |||
| @@ -1824,11 +1824,12 @@ static void e1000_get_ethtool_stats(struct net_device *netdev, | |||
| 1824 | { | 1824 | { |
| 1825 | struct e1000_adapter *adapter = netdev_priv(netdev); | 1825 | struct e1000_adapter *adapter = netdev_priv(netdev); |
| 1826 | int i; | 1826 | int i; |
| 1827 | char *p = NULL; | ||
| 1828 | const struct e1000_stats *stat = e1000_gstrings_stats; | 1827 | const struct e1000_stats *stat = e1000_gstrings_stats; |
| 1829 | 1828 | ||
| 1830 | e1000_update_stats(adapter); | 1829 | e1000_update_stats(adapter); |
| 1831 | for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) { | 1830 | for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++, stat++) { |
| 1831 | char *p; | ||
| 1832 | |||
| 1832 | switch (stat->type) { | 1833 | switch (stat->type) { |
| 1833 | case NETDEV_STATS: | 1834 | case NETDEV_STATS: |
| 1834 | p = (char *)netdev + stat->stat_offset; | 1835 | p = (char *)netdev + stat->stat_offset; |
| @@ -1839,15 +1840,13 @@ static void e1000_get_ethtool_stats(struct net_device *netdev, | |||
| 1839 | default: | 1840 | default: |
| 1840 | WARN_ONCE(1, "Invalid E1000 stat type: %u index %d\n", | 1841 | WARN_ONCE(1, "Invalid E1000 stat type: %u index %d\n", |
| 1841 | stat->type, i); | 1842 | stat->type, i); |
| 1842 | break; | 1843 | continue; |
| 1843 | } | 1844 | } |
| 1844 | 1845 | ||
| 1845 | if (stat->sizeof_stat == sizeof(u64)) | 1846 | if (stat->sizeof_stat == sizeof(u64)) |
| 1846 | data[i] = *(u64 *)p; | 1847 | data[i] = *(u64 *)p; |
| 1847 | else | 1848 | else |
| 1848 | data[i] = *(u32 *)p; | 1849 | data[i] = *(u32 *)p; |
| 1849 | |||
| 1850 | stat++; | ||
| 1851 | } | 1850 | } |
| 1852 | /* BUG_ON(i != E1000_STATS_LEN); */ | 1851 | /* BUG_ON(i != E1000_STATS_LEN); */ |
| 1853 | } | 1852 | } |
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index 98375e1e1185..1982f7917a8d 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c | |||
| @@ -520,8 +520,6 @@ void e1000_down(struct e1000_adapter *adapter) | |||
| 520 | struct net_device *netdev = adapter->netdev; | 520 | struct net_device *netdev = adapter->netdev; |
| 521 | u32 rctl, tctl; | 521 | u32 rctl, tctl; |
| 522 | 522 | ||
| 523 | netif_carrier_off(netdev); | ||
| 524 | |||
| 525 | /* disable receives in the hardware */ | 523 | /* disable receives in the hardware */ |
| 526 | rctl = er32(RCTL); | 524 | rctl = er32(RCTL); |
| 527 | ew32(RCTL, rctl & ~E1000_RCTL_EN); | 525 | ew32(RCTL, rctl & ~E1000_RCTL_EN); |
| @@ -537,6 +535,15 @@ void e1000_down(struct e1000_adapter *adapter) | |||
| 537 | E1000_WRITE_FLUSH(); | 535 | E1000_WRITE_FLUSH(); |
| 538 | msleep(10); | 536 | msleep(10); |
| 539 | 537 | ||
| 538 | /* Set the carrier off after transmits have been disabled in the | ||
| 539 | * hardware, to avoid race conditions with e1000_watchdog() (which | ||
| 540 | * may be running concurrently to us, checking for the carrier | ||
| 541 | * bit to decide whether it should enable transmits again). Such | ||
| 542 | * a race condition would result into transmission being disabled | ||
| 543 | * in the hardware until the next IFF_DOWN+IFF_UP cycle. | ||
| 544 | */ | ||
| 545 | netif_carrier_off(netdev); | ||
| 546 | |||
| 540 | napi_disable(&adapter->napi); | 547 | napi_disable(&adapter->napi); |
| 541 | 548 | ||
| 542 | e1000_irq_disable(adapter); | 549 | e1000_irq_disable(adapter); |
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c index 2756131495f0..120c68f78951 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c | |||
| @@ -2102,6 +2102,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget) | |||
| 2102 | 2102 | ||
| 2103 | if (unlikely(i40e_rx_is_programming_status(qword))) { | 2103 | if (unlikely(i40e_rx_is_programming_status(qword))) { |
| 2104 | i40e_clean_programming_status(rx_ring, rx_desc, qword); | 2104 | i40e_clean_programming_status(rx_ring, rx_desc, qword); |
| 2105 | cleaned_count++; | ||
| 2105 | continue; | 2106 | continue; |
| 2106 | } | 2107 | } |
| 2107 | size = (qword & I40E_RXD_QW1_LENGTH_PBUF_MASK) >> | 2108 | size = (qword & I40E_RXD_QW1_LENGTH_PBUF_MASK) >> |
| @@ -2269,7 +2270,7 @@ static inline void i40e_update_enable_itr(struct i40e_vsi *vsi, | |||
| 2269 | goto enable_int; | 2270 | goto enable_int; |
| 2270 | } | 2271 | } |
| 2271 | 2272 | ||
| 2272 | if (ITR_IS_DYNAMIC(tx_itr_setting)) { | 2273 | if (ITR_IS_DYNAMIC(rx_itr_setting)) { |
| 2273 | rx = i40e_set_new_dynamic_itr(&q_vector->rx); | 2274 | rx = i40e_set_new_dynamic_itr(&q_vector->rx); |
| 2274 | rxval = i40e_buildreg_itr(I40E_RX_ITR, q_vector->rx.itr); | 2275 | rxval = i40e_buildreg_itr(I40E_RX_ITR, q_vector->rx.itr); |
| 2275 | } | 2276 | } |
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_client.c b/drivers/net/ethernet/intel/i40evf/i40evf_client.c index 93cf5fd17d91..d8131139565e 100644 --- a/drivers/net/ethernet/intel/i40evf/i40evf_client.c +++ b/drivers/net/ethernet/intel/i40evf/i40evf_client.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/list.h> | 2 | #include <linux/list.h> |
| 2 | #include <linux/errno.h> | 3 | #include <linux/errno.h> |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_client.h b/drivers/net/ethernet/intel/i40evf/i40evf_client.h index 7d283c7506a5..15a10da5bd4a 100644 --- a/drivers/net/ethernet/intel/i40evf/i40evf_client.h +++ b/drivers/net/ethernet/intel/i40evf/i40evf_client.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _I40E_CLIENT_H_ | 2 | #ifndef _I40E_CLIENT_H_ |
| 2 | #define _I40E_CLIENT_H_ | 3 | #define _I40E_CLIENT_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 6bccc2be2b91..18b6c25d4705 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
| @@ -5326,7 +5326,7 @@ dma_error: | |||
| 5326 | DMA_TO_DEVICE); | 5326 | DMA_TO_DEVICE); |
| 5327 | dma_unmap_len_set(tx_buffer, len, 0); | 5327 | dma_unmap_len_set(tx_buffer, len, 0); |
| 5328 | 5328 | ||
| 5329 | if (i--) | 5329 | if (i-- == 0) |
| 5330 | i += tx_ring->count; | 5330 | i += tx_ring->count; |
| 5331 | tx_buffer = &tx_ring->tx_buffer_info[i]; | 5331 | tx_buffer = &tx_ring->tx_buffer_info[i]; |
| 5332 | } | 5332 | } |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 2224e691ee07..935a2f15b0b0 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
| @@ -8020,29 +8020,23 @@ static int ixgbe_tx_map(struct ixgbe_ring *tx_ring, | |||
| 8020 | return 0; | 8020 | return 0; |
| 8021 | dma_error: | 8021 | dma_error: |
| 8022 | dev_err(tx_ring->dev, "TX DMA map failed\n"); | 8022 | dev_err(tx_ring->dev, "TX DMA map failed\n"); |
| 8023 | tx_buffer = &tx_ring->tx_buffer_info[i]; | ||
| 8024 | 8023 | ||
| 8025 | /* clear dma mappings for failed tx_buffer_info map */ | 8024 | /* clear dma mappings for failed tx_buffer_info map */ |
| 8026 | while (tx_buffer != first) { | 8025 | for (;;) { |
| 8026 | tx_buffer = &tx_ring->tx_buffer_info[i]; | ||
| 8027 | if (dma_unmap_len(tx_buffer, len)) | 8027 | if (dma_unmap_len(tx_buffer, len)) |
| 8028 | dma_unmap_page(tx_ring->dev, | 8028 | dma_unmap_page(tx_ring->dev, |
| 8029 | dma_unmap_addr(tx_buffer, dma), | 8029 | dma_unmap_addr(tx_buffer, dma), |
| 8030 | dma_unmap_len(tx_buffer, len), | 8030 | dma_unmap_len(tx_buffer, len), |
| 8031 | DMA_TO_DEVICE); | 8031 | DMA_TO_DEVICE); |
| 8032 | dma_unmap_len_set(tx_buffer, len, 0); | 8032 | dma_unmap_len_set(tx_buffer, len, 0); |
| 8033 | 8033 | if (tx_buffer == first) | |
| 8034 | if (i--) | 8034 | break; |
| 8035 | if (i == 0) | ||
| 8035 | i += tx_ring->count; | 8036 | i += tx_ring->count; |
| 8036 | tx_buffer = &tx_ring->tx_buffer_info[i]; | 8037 | i--; |
| 8037 | } | 8038 | } |
| 8038 | 8039 | ||
| 8039 | if (dma_unmap_len(tx_buffer, len)) | ||
| 8040 | dma_unmap_single(tx_ring->dev, | ||
| 8041 | dma_unmap_addr(tx_buffer, dma), | ||
| 8042 | dma_unmap_len(tx_buffer, len), | ||
| 8043 | DMA_TO_DEVICE); | ||
| 8044 | dma_unmap_len_set(tx_buffer, len, 0); | ||
| 8045 | |||
| 8046 | dev_kfree_skb_any(first->skb); | 8040 | dev_kfree_skb_any(first->skb); |
| 8047 | first->skb = NULL; | 8041 | first->skb = NULL; |
| 8048 | 8042 | ||
diff --git a/drivers/net/ethernet/marvell/Makefile b/drivers/net/ethernet/marvell/Makefile index ff1bffa74803..9498ed26dbe5 100644 --- a/drivers/net/ethernet/marvell/Makefile +++ b/drivers/net/ethernet/marvell/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Marvell device drivers. | 3 | # Makefile for the Marvell device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index 9c86cb7cb988..a37af5813f33 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c | |||
| @@ -1167,6 +1167,11 @@ struct mvpp2_bm_pool { | |||
| 1167 | u32 port_map; | 1167 | u32 port_map; |
| 1168 | }; | 1168 | }; |
| 1169 | 1169 | ||
| 1170 | #define IS_TSO_HEADER(txq_pcpu, addr) \ | ||
| 1171 | ((addr) >= (txq_pcpu)->tso_headers_dma && \ | ||
| 1172 | (addr) < (txq_pcpu)->tso_headers_dma + \ | ||
| 1173 | (txq_pcpu)->size * TSO_HEADER_SIZE) | ||
| 1174 | |||
| 1170 | /* Queue modes */ | 1175 | /* Queue modes */ |
| 1171 | #define MVPP2_QDIST_SINGLE_MODE 0 | 1176 | #define MVPP2_QDIST_SINGLE_MODE 0 |
| 1172 | #define MVPP2_QDIST_MULTI_MODE 1 | 1177 | #define MVPP2_QDIST_MULTI_MODE 1 |
| @@ -1534,7 +1539,7 @@ static bool mvpp2_prs_tcam_data_cmp(struct mvpp2_prs_entry *pe, int offs, | |||
| 1534 | int off = MVPP2_PRS_TCAM_DATA_BYTE(offs); | 1539 | int off = MVPP2_PRS_TCAM_DATA_BYTE(offs); |
| 1535 | u16 tcam_data; | 1540 | u16 tcam_data; |
| 1536 | 1541 | ||
| 1537 | tcam_data = (8 << pe->tcam.byte[off + 1]) | pe->tcam.byte[off]; | 1542 | tcam_data = (pe->tcam.byte[off + 1] << 8) | pe->tcam.byte[off]; |
| 1538 | if (tcam_data != data) | 1543 | if (tcam_data != data) |
| 1539 | return false; | 1544 | return false; |
| 1540 | return true; | 1545 | return true; |
| @@ -2609,8 +2614,8 @@ static void mvpp2_prs_mac_init(struct mvpp2 *priv) | |||
| 2609 | /* place holders only - no ports */ | 2614 | /* place holders only - no ports */ |
| 2610 | mvpp2_prs_mac_drop_all_set(priv, 0, false); | 2615 | mvpp2_prs_mac_drop_all_set(priv, 0, false); |
| 2611 | mvpp2_prs_mac_promisc_set(priv, 0, false); | 2616 | mvpp2_prs_mac_promisc_set(priv, 0, false); |
| 2612 | mvpp2_prs_mac_multi_set(priv, MVPP2_PE_MAC_MC_ALL, 0, false); | 2617 | mvpp2_prs_mac_multi_set(priv, 0, MVPP2_PE_MAC_MC_ALL, false); |
| 2613 | mvpp2_prs_mac_multi_set(priv, MVPP2_PE_MAC_MC_IP6, 0, false); | 2618 | mvpp2_prs_mac_multi_set(priv, 0, MVPP2_PE_MAC_MC_IP6, false); |
| 2614 | } | 2619 | } |
| 2615 | 2620 | ||
| 2616 | /* Set default entries for various types of dsa packets */ | 2621 | /* Set default entries for various types of dsa packets */ |
| @@ -3391,7 +3396,7 @@ mvpp2_prs_mac_da_range_find(struct mvpp2 *priv, int pmap, const u8 *da, | |||
| 3391 | struct mvpp2_prs_entry *pe; | 3396 | struct mvpp2_prs_entry *pe; |
| 3392 | int tid; | 3397 | int tid; |
| 3393 | 3398 | ||
| 3394 | pe = kzalloc(sizeof(*pe), GFP_KERNEL); | 3399 | pe = kzalloc(sizeof(*pe), GFP_ATOMIC); |
| 3395 | if (!pe) | 3400 | if (!pe) |
| 3396 | return NULL; | 3401 | return NULL; |
| 3397 | mvpp2_prs_tcam_lu_set(pe, MVPP2_PRS_LU_MAC); | 3402 | mvpp2_prs_tcam_lu_set(pe, MVPP2_PRS_LU_MAC); |
| @@ -3453,7 +3458,7 @@ static int mvpp2_prs_mac_da_accept(struct mvpp2 *priv, int port, | |||
| 3453 | if (tid < 0) | 3458 | if (tid < 0) |
| 3454 | return tid; | 3459 | return tid; |
| 3455 | 3460 | ||
| 3456 | pe = kzalloc(sizeof(*pe), GFP_KERNEL); | 3461 | pe = kzalloc(sizeof(*pe), GFP_ATOMIC); |
| 3457 | if (!pe) | 3462 | if (!pe) |
| 3458 | return -ENOMEM; | 3463 | return -ENOMEM; |
| 3459 | mvpp2_prs_tcam_lu_set(pe, MVPP2_PRS_LU_MAC); | 3464 | mvpp2_prs_tcam_lu_set(pe, MVPP2_PRS_LU_MAC); |
| @@ -5321,8 +5326,9 @@ static void mvpp2_txq_bufs_free(struct mvpp2_port *port, | |||
| 5321 | struct mvpp2_txq_pcpu_buf *tx_buf = | 5326 | struct mvpp2_txq_pcpu_buf *tx_buf = |
| 5322 | txq_pcpu->buffs + txq_pcpu->txq_get_index; | 5327 | txq_pcpu->buffs + txq_pcpu->txq_get_index; |
| 5323 | 5328 | ||
| 5324 | dma_unmap_single(port->dev->dev.parent, tx_buf->dma, | 5329 | if (!IS_TSO_HEADER(txq_pcpu, tx_buf->dma)) |
| 5325 | tx_buf->size, DMA_TO_DEVICE); | 5330 | dma_unmap_single(port->dev->dev.parent, tx_buf->dma, |
| 5331 | tx_buf->size, DMA_TO_DEVICE); | ||
| 5326 | if (tx_buf->skb) | 5332 | if (tx_buf->skb) |
| 5327 | dev_kfree_skb_any(tx_buf->skb); | 5333 | dev_kfree_skb_any(tx_buf->skb); |
| 5328 | 5334 | ||
| @@ -5609,7 +5615,7 @@ static int mvpp2_txq_init(struct mvpp2_port *port, | |||
| 5609 | 5615 | ||
| 5610 | txq_pcpu->tso_headers = | 5616 | txq_pcpu->tso_headers = |
| 5611 | dma_alloc_coherent(port->dev->dev.parent, | 5617 | dma_alloc_coherent(port->dev->dev.parent, |
| 5612 | MVPP2_AGGR_TXQ_SIZE * TSO_HEADER_SIZE, | 5618 | txq_pcpu->size * TSO_HEADER_SIZE, |
| 5613 | &txq_pcpu->tso_headers_dma, | 5619 | &txq_pcpu->tso_headers_dma, |
| 5614 | GFP_KERNEL); | 5620 | GFP_KERNEL); |
| 5615 | if (!txq_pcpu->tso_headers) | 5621 | if (!txq_pcpu->tso_headers) |
| @@ -5623,7 +5629,7 @@ cleanup: | |||
| 5623 | kfree(txq_pcpu->buffs); | 5629 | kfree(txq_pcpu->buffs); |
| 5624 | 5630 | ||
| 5625 | dma_free_coherent(port->dev->dev.parent, | 5631 | dma_free_coherent(port->dev->dev.parent, |
| 5626 | MVPP2_AGGR_TXQ_SIZE * MVPP2_DESC_ALIGNED_SIZE, | 5632 | txq_pcpu->size * TSO_HEADER_SIZE, |
| 5627 | txq_pcpu->tso_headers, | 5633 | txq_pcpu->tso_headers, |
| 5628 | txq_pcpu->tso_headers_dma); | 5634 | txq_pcpu->tso_headers_dma); |
| 5629 | } | 5635 | } |
| @@ -5647,7 +5653,7 @@ static void mvpp2_txq_deinit(struct mvpp2_port *port, | |||
| 5647 | kfree(txq_pcpu->buffs); | 5653 | kfree(txq_pcpu->buffs); |
| 5648 | 5654 | ||
| 5649 | dma_free_coherent(port->dev->dev.parent, | 5655 | dma_free_coherent(port->dev->dev.parent, |
| 5650 | MVPP2_AGGR_TXQ_SIZE * MVPP2_DESC_ALIGNED_SIZE, | 5656 | txq_pcpu->size * TSO_HEADER_SIZE, |
| 5651 | txq_pcpu->tso_headers, | 5657 | txq_pcpu->tso_headers, |
| 5652 | txq_pcpu->tso_headers_dma); | 5658 | txq_pcpu->tso_headers_dma); |
| 5653 | } | 5659 | } |
| @@ -6212,12 +6218,15 @@ static inline void | |||
| 6212 | tx_desc_unmap_put(struct mvpp2_port *port, struct mvpp2_tx_queue *txq, | 6218 | tx_desc_unmap_put(struct mvpp2_port *port, struct mvpp2_tx_queue *txq, |
| 6213 | struct mvpp2_tx_desc *desc) | 6219 | struct mvpp2_tx_desc *desc) |
| 6214 | { | 6220 | { |
| 6221 | struct mvpp2_txq_pcpu *txq_pcpu = this_cpu_ptr(txq->pcpu); | ||
| 6222 | |||
| 6215 | dma_addr_t buf_dma_addr = | 6223 | dma_addr_t buf_dma_addr = |
| 6216 | mvpp2_txdesc_dma_addr_get(port, desc); | 6224 | mvpp2_txdesc_dma_addr_get(port, desc); |
| 6217 | size_t buf_sz = | 6225 | size_t buf_sz = |
| 6218 | mvpp2_txdesc_size_get(port, desc); | 6226 | mvpp2_txdesc_size_get(port, desc); |
| 6219 | dma_unmap_single(port->dev->dev.parent, buf_dma_addr, | 6227 | if (!IS_TSO_HEADER(txq_pcpu, buf_dma_addr)) |
| 6220 | buf_sz, DMA_TO_DEVICE); | 6228 | dma_unmap_single(port->dev->dev.parent, buf_dma_addr, |
| 6229 | buf_sz, DMA_TO_DEVICE); | ||
| 6221 | mvpp2_txq_desc_put(txq); | 6230 | mvpp2_txq_desc_put(txq); |
| 6222 | } | 6231 | } |
| 6223 | 6232 | ||
| @@ -6490,7 +6499,7 @@ out: | |||
| 6490 | } | 6499 | } |
| 6491 | 6500 | ||
| 6492 | /* Finalize TX processing */ | 6501 | /* Finalize TX processing */ |
| 6493 | if (txq_pcpu->count >= txq->done_pkts_coal) | 6502 | if (!port->has_tx_irqs && txq_pcpu->count >= txq->done_pkts_coal) |
| 6494 | mvpp2_txq_done(port, txq, txq_pcpu); | 6503 | mvpp2_txq_done(port, txq, txq_pcpu); |
| 6495 | 6504 | ||
| 6496 | /* Set the timer in case not all frags were processed */ | 6505 | /* Set the timer in case not all frags were processed */ |
diff --git a/drivers/net/ethernet/marvell/skge.h b/drivers/net/ethernet/marvell/skge.h index 3ea151ff9c43..6fa7b6a34c08 100644 --- a/drivers/net/ethernet/marvell/skge.h +++ b/drivers/net/ethernet/marvell/skge.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Definitions for the new Marvell Yukon / SysKonnect driver. | 3 | * Definitions for the new Marvell Yukon / SysKonnect driver. |
| 3 | */ | 4 | */ |
diff --git a/drivers/net/ethernet/marvell/sky2.h b/drivers/net/ethernet/marvell/sky2.h index 0fe160796842..b02b6523083c 100644 --- a/drivers/net/ethernet/marvell/sky2.h +++ b/drivers/net/ethernet/marvell/sky2.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Definitions for the new Marvell Yukon 2 driver. | 3 | * Definitions for the new Marvell Yukon 2 driver. |
| 3 | */ | 4 | */ |
diff --git a/drivers/net/ethernet/mellanox/mlx4/Makefile b/drivers/net/ethernet/mellanox/mlx4/Makefile index c82217e0d22d..16b10d01fcf4 100644 --- a/drivers/net/ethernet/mellanox/mlx4/Makefile +++ b/drivers/net/ethernet/mellanox/mlx4/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_MLX4_CORE) += mlx4_core.o | 2 | obj-$(CONFIG_MLX4_CORE) += mlx4_core.o |
| 2 | 3 | ||
| 3 | mlx4_core-y := alloc.o catas.o cmd.o cq.o eq.o fw.o fw_qos.o icm.o intf.o \ | 4 | mlx4_core-y := alloc.o catas.o cmd.o cq.o eq.o fw.o fw_qos.o icm.o intf.o \ |
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h index 926f3c3f3665..aab28eb27a30 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _MLX4_STATS_ | 2 | #ifndef _MLX4_STATS_ |
| 2 | #define _MLX4_STATS_ | 3 | #define _MLX4_STATS_ |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile index 87a3099808f3..714dd0dc5eef 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile +++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_MLX5_CORE) += mlx5_core.o | 2 | obj-$(CONFIG_MLX5_CORE) += mlx5_core.o |
| 2 | subdir-ccflags-y += -I$(src) | 3 | subdir-ccflags-y += -I$(src) |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/dev.c b/drivers/net/ethernet/mellanox/mlx5/core/dev.c index ff60cf7342ca..fc281712869b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/dev.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/dev.c | |||
| @@ -77,35 +77,41 @@ static void add_delayed_event(struct mlx5_priv *priv, | |||
| 77 | list_add_tail(&delayed_event->list, &priv->waiting_events_list); | 77 | list_add_tail(&delayed_event->list, &priv->waiting_events_list); |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | static void fire_delayed_event_locked(struct mlx5_device_context *dev_ctx, | 80 | static void delayed_event_release(struct mlx5_device_context *dev_ctx, |
| 81 | struct mlx5_core_dev *dev, | 81 | struct mlx5_priv *priv) |
| 82 | struct mlx5_priv *priv) | ||
| 83 | { | 82 | { |
| 83 | struct mlx5_core_dev *dev = container_of(priv, struct mlx5_core_dev, priv); | ||
| 84 | struct mlx5_delayed_event *de; | 84 | struct mlx5_delayed_event *de; |
| 85 | struct mlx5_delayed_event *n; | 85 | struct mlx5_delayed_event *n; |
| 86 | struct list_head temp; | ||
| 86 | 87 | ||
| 87 | /* stop delaying events */ | 88 | INIT_LIST_HEAD(&temp); |
| 88 | priv->is_accum_events = false; | 89 | |
| 90 | spin_lock_irq(&priv->ctx_lock); | ||
| 89 | 91 | ||
| 90 | /* fire all accumulated events before new event comes */ | 92 | priv->is_accum_events = false; |
| 91 | list_for_each_entry_safe(de, n, &priv->waiting_events_list, list) { | 93 | list_splice_init(&priv->waiting_events_list, &temp); |
| 94 | if (!dev_ctx->context) | ||
| 95 | goto out; | ||
| 96 | list_for_each_entry_safe(de, n, &priv->waiting_events_list, list) | ||
| 92 | dev_ctx->intf->event(dev, dev_ctx->context, de->event, de->param); | 97 | dev_ctx->intf->event(dev, dev_ctx->context, de->event, de->param); |
| 98 | |||
| 99 | out: | ||
| 100 | spin_unlock_irq(&priv->ctx_lock); | ||
| 101 | |||
| 102 | list_for_each_entry_safe(de, n, &temp, list) { | ||
| 93 | list_del(&de->list); | 103 | list_del(&de->list); |
| 94 | kfree(de); | 104 | kfree(de); |
| 95 | } | 105 | } |
| 96 | } | 106 | } |
| 97 | 107 | ||
| 98 | static void cleanup_delayed_evets(struct mlx5_priv *priv) | 108 | /* accumulating events that can come after mlx5_ib calls to |
| 109 | * ib_register_device, till adding that interface to the events list. | ||
| 110 | */ | ||
| 111 | static void delayed_event_start(struct mlx5_priv *priv) | ||
| 99 | { | 112 | { |
| 100 | struct mlx5_delayed_event *de; | ||
| 101 | struct mlx5_delayed_event *n; | ||
| 102 | |||
| 103 | spin_lock_irq(&priv->ctx_lock); | 113 | spin_lock_irq(&priv->ctx_lock); |
| 104 | priv->is_accum_events = false; | 114 | priv->is_accum_events = true; |
| 105 | list_for_each_entry_safe(de, n, &priv->waiting_events_list, list) { | ||
| 106 | list_del(&de->list); | ||
| 107 | kfree(de); | ||
| 108 | } | ||
| 109 | spin_unlock_irq(&priv->ctx_lock); | 115 | spin_unlock_irq(&priv->ctx_lock); |
| 110 | } | 116 | } |
| 111 | 117 | ||
| @@ -122,11 +128,8 @@ void mlx5_add_device(struct mlx5_interface *intf, struct mlx5_priv *priv) | |||
| 122 | return; | 128 | return; |
| 123 | 129 | ||
| 124 | dev_ctx->intf = intf; | 130 | dev_ctx->intf = intf; |
| 125 | /* accumulating events that can come after mlx5_ib calls to | ||
| 126 | * ib_register_device, till adding that interface to the events list. | ||
| 127 | */ | ||
| 128 | 131 | ||
| 129 | priv->is_accum_events = true; | 132 | delayed_event_start(priv); |
| 130 | 133 | ||
| 131 | dev_ctx->context = intf->add(dev); | 134 | dev_ctx->context = intf->add(dev); |
| 132 | set_bit(MLX5_INTERFACE_ADDED, &dev_ctx->state); | 135 | set_bit(MLX5_INTERFACE_ADDED, &dev_ctx->state); |
| @@ -137,8 +140,6 @@ void mlx5_add_device(struct mlx5_interface *intf, struct mlx5_priv *priv) | |||
| 137 | spin_lock_irq(&priv->ctx_lock); | 140 | spin_lock_irq(&priv->ctx_lock); |
| 138 | list_add_tail(&dev_ctx->list, &priv->ctx_list); | 141 | list_add_tail(&dev_ctx->list, &priv->ctx_list); |
| 139 | 142 | ||
| 140 | fire_delayed_event_locked(dev_ctx, dev, priv); | ||
| 141 | |||
| 142 | #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING | 143 | #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING |
| 143 | if (dev_ctx->intf->pfault) { | 144 | if (dev_ctx->intf->pfault) { |
| 144 | if (priv->pfault) { | 145 | if (priv->pfault) { |
| @@ -150,11 +151,12 @@ void mlx5_add_device(struct mlx5_interface *intf, struct mlx5_priv *priv) | |||
| 150 | } | 151 | } |
| 151 | #endif | 152 | #endif |
| 152 | spin_unlock_irq(&priv->ctx_lock); | 153 | spin_unlock_irq(&priv->ctx_lock); |
| 153 | } else { | ||
| 154 | kfree(dev_ctx); | ||
| 155 | /* delete all accumulated events */ | ||
| 156 | cleanup_delayed_evets(priv); | ||
| 157 | } | 154 | } |
| 155 | |||
| 156 | delayed_event_release(dev_ctx, priv); | ||
| 157 | |||
| 158 | if (!dev_ctx->context) | ||
| 159 | kfree(dev_ctx); | ||
| 158 | } | 160 | } |
| 159 | 161 | ||
| 160 | static struct mlx5_device_context *mlx5_get_device(struct mlx5_interface *intf, | 162 | static struct mlx5_device_context *mlx5_get_device(struct mlx5_interface *intf, |
| @@ -205,17 +207,21 @@ static void mlx5_attach_interface(struct mlx5_interface *intf, struct mlx5_priv | |||
| 205 | if (!dev_ctx) | 207 | if (!dev_ctx) |
| 206 | return; | 208 | return; |
| 207 | 209 | ||
| 210 | delayed_event_start(priv); | ||
| 208 | if (intf->attach) { | 211 | if (intf->attach) { |
| 209 | if (test_bit(MLX5_INTERFACE_ATTACHED, &dev_ctx->state)) | 212 | if (test_bit(MLX5_INTERFACE_ATTACHED, &dev_ctx->state)) |
| 210 | return; | 213 | goto out; |
| 211 | intf->attach(dev, dev_ctx->context); | 214 | intf->attach(dev, dev_ctx->context); |
| 212 | set_bit(MLX5_INTERFACE_ATTACHED, &dev_ctx->state); | 215 | set_bit(MLX5_INTERFACE_ATTACHED, &dev_ctx->state); |
| 213 | } else { | 216 | } else { |
| 214 | if (test_bit(MLX5_INTERFACE_ADDED, &dev_ctx->state)) | 217 | if (test_bit(MLX5_INTERFACE_ADDED, &dev_ctx->state)) |
| 215 | return; | 218 | goto out; |
| 216 | dev_ctx->context = intf->add(dev); | 219 | dev_ctx->context = intf->add(dev); |
| 217 | set_bit(MLX5_INTERFACE_ADDED, &dev_ctx->state); | 220 | set_bit(MLX5_INTERFACE_ADDED, &dev_ctx->state); |
| 218 | } | 221 | } |
| 222 | |||
| 223 | out: | ||
| 224 | delayed_event_release(dev_ctx, priv); | ||
| 219 | } | 225 | } |
| 220 | 226 | ||
| 221 | void mlx5_attach_device(struct mlx5_core_dev *dev) | 227 | void mlx5_attach_device(struct mlx5_core_dev *dev) |
| @@ -414,8 +420,14 @@ void mlx5_core_event(struct mlx5_core_dev *dev, enum mlx5_dev_event event, | |||
| 414 | if (priv->is_accum_events) | 420 | if (priv->is_accum_events) |
| 415 | add_delayed_event(priv, dev, event, param); | 421 | add_delayed_event(priv, dev, event, param); |
| 416 | 422 | ||
| 423 | /* After mlx5_detach_device, the dev_ctx->intf is still set and dev_ctx is | ||
| 424 | * still in priv->ctx_list. In this case, only notify the dev_ctx if its | ||
| 425 | * ADDED or ATTACHED bit are set. | ||
| 426 | */ | ||
| 417 | list_for_each_entry(dev_ctx, &priv->ctx_list, list) | 427 | list_for_each_entry(dev_ctx, &priv->ctx_list, list) |
| 418 | if (dev_ctx->intf->event) | 428 | if (dev_ctx->intf->event && |
| 429 | (test_bit(MLX5_INTERFACE_ADDED, &dev_ctx->state) || | ||
| 430 | test_bit(MLX5_INTERFACE_ATTACHED, &dev_ctx->state))) | ||
| 419 | dev_ctx->intf->event(dev, dev_ctx->context, event, param); | 431 | dev_ctx->intf->event(dev, dev_ctx->context, event, param); |
| 420 | 432 | ||
| 421 | spin_unlock_irqrestore(&priv->ctx_lock, flags); | 433 | spin_unlock_irqrestore(&priv->ctx_lock, flags); |
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c index c1d384fca4dc..51c4cc00a186 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | |||
| @@ -41,6 +41,11 @@ | |||
| 41 | #define MLX5E_CEE_STATE_UP 1 | 41 | #define MLX5E_CEE_STATE_UP 1 |
| 42 | #define MLX5E_CEE_STATE_DOWN 0 | 42 | #define MLX5E_CEE_STATE_DOWN 0 |
| 43 | 43 | ||
| 44 | enum { | ||
| 45 | MLX5E_VENDOR_TC_GROUP_NUM = 7, | ||
| 46 | MLX5E_LOWEST_PRIO_GROUP = 0, | ||
| 47 | }; | ||
| 48 | |||
| 44 | /* If dcbx mode is non-host set the dcbx mode to host. | 49 | /* If dcbx mode is non-host set the dcbx mode to host. |
| 45 | */ | 50 | */ |
| 46 | static int mlx5e_dcbnl_set_dcbx_mode(struct mlx5e_priv *priv, | 51 | static int mlx5e_dcbnl_set_dcbx_mode(struct mlx5e_priv *priv, |
| @@ -85,6 +90,9 @@ static int mlx5e_dcbnl_ieee_getets(struct net_device *netdev, | |||
| 85 | { | 90 | { |
| 86 | struct mlx5e_priv *priv = netdev_priv(netdev); | 91 | struct mlx5e_priv *priv = netdev_priv(netdev); |
| 87 | struct mlx5_core_dev *mdev = priv->mdev; | 92 | struct mlx5_core_dev *mdev = priv->mdev; |
| 93 | u8 tc_group[IEEE_8021QAZ_MAX_TCS]; | ||
| 94 | bool is_tc_group_6_exist = false; | ||
| 95 | bool is_zero_bw_ets_tc = false; | ||
| 88 | int err = 0; | 96 | int err = 0; |
| 89 | int i; | 97 | int i; |
| 90 | 98 | ||
| @@ -96,37 +104,64 @@ static int mlx5e_dcbnl_ieee_getets(struct net_device *netdev, | |||
| 96 | err = mlx5_query_port_prio_tc(mdev, i, &ets->prio_tc[i]); | 104 | err = mlx5_query_port_prio_tc(mdev, i, &ets->prio_tc[i]); |
| 97 | if (err) | 105 | if (err) |
| 98 | return err; | 106 | return err; |
| 99 | } | ||
| 100 | 107 | ||
| 101 | for (i = 0; i < ets->ets_cap; i++) { | 108 | err = mlx5_query_port_tc_group(mdev, i, &tc_group[i]); |
| 109 | if (err) | ||
| 110 | return err; | ||
| 111 | |||
| 102 | err = mlx5_query_port_tc_bw_alloc(mdev, i, &ets->tc_tx_bw[i]); | 112 | err = mlx5_query_port_tc_bw_alloc(mdev, i, &ets->tc_tx_bw[i]); |
| 103 | if (err) | 113 | if (err) |
| 104 | return err; | 114 | return err; |
| 115 | |||
| 116 | if (ets->tc_tx_bw[i] < MLX5E_MAX_BW_ALLOC && | ||
| 117 | tc_group[i] == (MLX5E_LOWEST_PRIO_GROUP + 1)) | ||
| 118 | is_zero_bw_ets_tc = true; | ||
| 119 | |||
| 120 | if (tc_group[i] == (MLX5E_VENDOR_TC_GROUP_NUM - 1)) | ||
| 121 | is_tc_group_6_exist = true; | ||
| 122 | } | ||
| 123 | |||
| 124 | /* Report 0% ets tc if exits*/ | ||
| 125 | if (is_zero_bw_ets_tc) { | ||
| 126 | for (i = 0; i < ets->ets_cap; i++) | ||
| 127 | if (tc_group[i] == MLX5E_LOWEST_PRIO_GROUP) | ||
| 128 | ets->tc_tx_bw[i] = 0; | ||
| 129 | } | ||
| 130 | |||
| 131 | /* Update tc_tsa based on fw setting*/ | ||
| 132 | for (i = 0; i < ets->ets_cap; i++) { | ||
| 105 | if (ets->tc_tx_bw[i] < MLX5E_MAX_BW_ALLOC) | 133 | if (ets->tc_tx_bw[i] < MLX5E_MAX_BW_ALLOC) |
| 106 | priv->dcbx.tc_tsa[i] = IEEE_8021QAZ_TSA_ETS; | 134 | priv->dcbx.tc_tsa[i] = IEEE_8021QAZ_TSA_ETS; |
| 135 | else if (tc_group[i] == MLX5E_VENDOR_TC_GROUP_NUM && | ||
| 136 | !is_tc_group_6_exist) | ||
| 137 | priv->dcbx.tc_tsa[i] = IEEE_8021QAZ_TSA_VENDOR; | ||
| 107 | } | 138 | } |
| 108 | |||
| 109 | memcpy(ets->tc_tsa, priv->dcbx.tc_tsa, sizeof(ets->tc_tsa)); | 139 | memcpy(ets->tc_tsa, priv->dcbx.tc_tsa, sizeof(ets->tc_tsa)); |
| 110 | 140 | ||
| 111 | return err; | 141 | return err; |
| 112 | } | 142 | } |
| 113 | 143 | ||
| 114 | enum { | ||
| 115 | MLX5E_VENDOR_TC_GROUP_NUM = 7, | ||
| 116 | MLX5E_ETS_TC_GROUP_NUM = 0, | ||
| 117 | }; | ||
| 118 | |||
| 119 | static void mlx5e_build_tc_group(struct ieee_ets *ets, u8 *tc_group, int max_tc) | 144 | static void mlx5e_build_tc_group(struct ieee_ets *ets, u8 *tc_group, int max_tc) |
| 120 | { | 145 | { |
| 121 | bool any_tc_mapped_to_ets = false; | 146 | bool any_tc_mapped_to_ets = false; |
| 147 | bool ets_zero_bw = false; | ||
| 122 | int strict_group; | 148 | int strict_group; |
| 123 | int i; | 149 | int i; |
| 124 | 150 | ||
| 125 | for (i = 0; i <= max_tc; i++) | 151 | for (i = 0; i <= max_tc; i++) { |
| 126 | if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_ETS) | 152 | if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_ETS) { |
| 127 | any_tc_mapped_to_ets = true; | 153 | any_tc_mapped_to_ets = true; |
| 154 | if (!ets->tc_tx_bw[i]) | ||
| 155 | ets_zero_bw = true; | ||
| 156 | } | ||
| 157 | } | ||
| 128 | 158 | ||
| 129 | strict_group = any_tc_mapped_to_ets ? 1 : 0; | 159 | /* strict group has higher priority than ets group */ |
| 160 | strict_group = MLX5E_LOWEST_PRIO_GROUP; | ||
| 161 | if (any_tc_mapped_to_ets) | ||
| 162 | strict_group++; | ||
| 163 | if (ets_zero_bw) | ||
| 164 | strict_group++; | ||
| 130 | 165 | ||
| 131 | for (i = 0; i <= max_tc; i++) { | 166 | for (i = 0; i <= max_tc; i++) { |
| 132 | switch (ets->tc_tsa[i]) { | 167 | switch (ets->tc_tsa[i]) { |
| @@ -137,7 +172,9 @@ static void mlx5e_build_tc_group(struct ieee_ets *ets, u8 *tc_group, int max_tc) | |||
| 137 | tc_group[i] = strict_group++; | 172 | tc_group[i] = strict_group++; |
| 138 | break; | 173 | break; |
| 139 | case IEEE_8021QAZ_TSA_ETS: | 174 | case IEEE_8021QAZ_TSA_ETS: |
| 140 | tc_group[i] = MLX5E_ETS_TC_GROUP_NUM; | 175 | tc_group[i] = MLX5E_LOWEST_PRIO_GROUP; |
| 176 | if (ets->tc_tx_bw[i] && ets_zero_bw) | ||
| 177 | tc_group[i] = MLX5E_LOWEST_PRIO_GROUP + 1; | ||
| 141 | break; | 178 | break; |
| 142 | } | 179 | } |
| 143 | } | 180 | } |
| @@ -146,9 +183,23 @@ static void mlx5e_build_tc_group(struct ieee_ets *ets, u8 *tc_group, int max_tc) | |||
| 146 | static void mlx5e_build_tc_tx_bw(struct ieee_ets *ets, u8 *tc_tx_bw, | 183 | static void mlx5e_build_tc_tx_bw(struct ieee_ets *ets, u8 *tc_tx_bw, |
| 147 | u8 *tc_group, int max_tc) | 184 | u8 *tc_group, int max_tc) |
| 148 | { | 185 | { |
| 186 | int bw_for_ets_zero_bw_tc = 0; | ||
| 187 | int last_ets_zero_bw_tc = -1; | ||
| 188 | int num_ets_zero_bw = 0; | ||
| 149 | int i; | 189 | int i; |
| 150 | 190 | ||
| 151 | for (i = 0; i <= max_tc; i++) { | 191 | for (i = 0; i <= max_tc; i++) { |
| 192 | if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_ETS && | ||
| 193 | !ets->tc_tx_bw[i]) { | ||
| 194 | num_ets_zero_bw++; | ||
| 195 | last_ets_zero_bw_tc = i; | ||
| 196 | } | ||
| 197 | } | ||
| 198 | |||
| 199 | if (num_ets_zero_bw) | ||
| 200 | bw_for_ets_zero_bw_tc = MLX5E_MAX_BW_ALLOC / num_ets_zero_bw; | ||
| 201 | |||
| 202 | for (i = 0; i <= max_tc; i++) { | ||
| 152 | switch (ets->tc_tsa[i]) { | 203 | switch (ets->tc_tsa[i]) { |
| 153 | case IEEE_8021QAZ_TSA_VENDOR: | 204 | case IEEE_8021QAZ_TSA_VENDOR: |
| 154 | tc_tx_bw[i] = MLX5E_MAX_BW_ALLOC; | 205 | tc_tx_bw[i] = MLX5E_MAX_BW_ALLOC; |
| @@ -157,12 +208,26 @@ static void mlx5e_build_tc_tx_bw(struct ieee_ets *ets, u8 *tc_tx_bw, | |||
| 157 | tc_tx_bw[i] = MLX5E_MAX_BW_ALLOC; | 208 | tc_tx_bw[i] = MLX5E_MAX_BW_ALLOC; |
| 158 | break; | 209 | break; |
| 159 | case IEEE_8021QAZ_TSA_ETS: | 210 | case IEEE_8021QAZ_TSA_ETS: |
| 160 | tc_tx_bw[i] = ets->tc_tx_bw[i]; | 211 | tc_tx_bw[i] = ets->tc_tx_bw[i] ? |
| 212 | ets->tc_tx_bw[i] : | ||
| 213 | bw_for_ets_zero_bw_tc; | ||
| 161 | break; | 214 | break; |
| 162 | } | 215 | } |
| 163 | } | 216 | } |
| 217 | |||
| 218 | /* Make sure the total bw for ets zero bw group is 100% */ | ||
| 219 | if (last_ets_zero_bw_tc != -1) | ||
| 220 | tc_tx_bw[last_ets_zero_bw_tc] += | ||
| 221 | MLX5E_MAX_BW_ALLOC % num_ets_zero_bw; | ||
| 164 | } | 222 | } |
| 165 | 223 | ||
| 224 | /* If there are ETS BW 0, | ||
| 225 | * Set ETS group # to 1 for all ETS non zero BW tcs. Their sum must be 100%. | ||
| 226 | * Set group #0 to all the ETS BW 0 tcs and | ||
| 227 | * equally splits the 100% BW between them | ||
| 228 | * Report both group #0 and #1 as ETS type. | ||
| 229 | * All the tcs in group #0 will be reported with 0% BW. | ||
| 230 | */ | ||
| 166 | int mlx5e_dcbnl_ieee_setets_core(struct mlx5e_priv *priv, struct ieee_ets *ets) | 231 | int mlx5e_dcbnl_ieee_setets_core(struct mlx5e_priv *priv, struct ieee_ets *ets) |
| 167 | { | 232 | { |
| 168 | struct mlx5_core_dev *mdev = priv->mdev; | 233 | struct mlx5_core_dev *mdev = priv->mdev; |
| @@ -188,7 +253,6 @@ int mlx5e_dcbnl_ieee_setets_core(struct mlx5e_priv *priv, struct ieee_ets *ets) | |||
| 188 | return err; | 253 | return err; |
| 189 | 254 | ||
| 190 | memcpy(priv->dcbx.tc_tsa, ets->tc_tsa, sizeof(ets->tc_tsa)); | 255 | memcpy(priv->dcbx.tc_tsa, ets->tc_tsa, sizeof(ets->tc_tsa)); |
| 191 | |||
| 192 | return err; | 256 | return err; |
| 193 | } | 257 | } |
| 194 | 258 | ||
| @@ -209,17 +273,9 @@ static int mlx5e_dbcnl_validate_ets(struct net_device *netdev, | |||
| 209 | } | 273 | } |
| 210 | 274 | ||
| 211 | /* Validate Bandwidth Sum */ | 275 | /* Validate Bandwidth Sum */ |
| 212 | for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) { | 276 | for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) |
| 213 | if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_ETS) { | 277 | if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_ETS) |
| 214 | if (!ets->tc_tx_bw[i]) { | ||
| 215 | netdev_err(netdev, | ||
| 216 | "Failed to validate ETS: BW 0 is illegal\n"); | ||
| 217 | return -EINVAL; | ||
| 218 | } | ||
| 219 | |||
| 220 | bw_sum += ets->tc_tx_bw[i]; | 278 | bw_sum += ets->tc_tx_bw[i]; |
| 221 | } | ||
| 222 | } | ||
| 223 | 279 | ||
| 224 | if (bw_sum != 0 && bw_sum != 100) { | 280 | if (bw_sum != 0 && bw_sum != 100) { |
| 225 | netdev_err(netdev, | 281 | netdev_err(netdev, |
| @@ -533,8 +589,7 @@ static void mlx5e_dcbnl_getpgtccfgtx(struct net_device *netdev, | |||
| 533 | static void mlx5e_dcbnl_getpgbwgcfgtx(struct net_device *netdev, | 589 | static void mlx5e_dcbnl_getpgbwgcfgtx(struct net_device *netdev, |
| 534 | int pgid, u8 *bw_pct) | 590 | int pgid, u8 *bw_pct) |
| 535 | { | 591 | { |
| 536 | struct mlx5e_priv *priv = netdev_priv(netdev); | 592 | struct ieee_ets ets; |
| 537 | struct mlx5_core_dev *mdev = priv->mdev; | ||
| 538 | 593 | ||
| 539 | if (pgid >= CEE_DCBX_MAX_PGS) { | 594 | if (pgid >= CEE_DCBX_MAX_PGS) { |
| 540 | netdev_err(netdev, | 595 | netdev_err(netdev, |
| @@ -542,8 +597,8 @@ static void mlx5e_dcbnl_getpgbwgcfgtx(struct net_device *netdev, | |||
| 542 | return; | 597 | return; |
| 543 | } | 598 | } |
| 544 | 599 | ||
| 545 | if (mlx5_query_port_tc_bw_alloc(mdev, pgid, bw_pct)) | 600 | mlx5e_dcbnl_ieee_getets(netdev, &ets); |
| 546 | *bw_pct = 0; | 601 | *bw_pct = ets.tc_tx_bw[pgid]; |
| 547 | } | 602 | } |
| 548 | 603 | ||
| 549 | static void mlx5e_dcbnl_setpfccfg(struct net_device *netdev, | 604 | static void mlx5e_dcbnl_setpfccfg(struct net_device *netdev, |
| @@ -739,8 +794,6 @@ static void mlx5e_ets_init(struct mlx5e_priv *priv) | |||
| 739 | ets.prio_tc[i] = i; | 794 | ets.prio_tc[i] = i; |
| 740 | } | 795 | } |
| 741 | 796 | ||
| 742 | memcpy(priv->dcbx.tc_tsa, ets.tc_tsa, sizeof(ets.tc_tsa)); | ||
| 743 | |||
| 744 | /* tclass[prio=0]=1, tclass[prio=1]=0, tclass[prio=i]=i (for i>1) */ | 797 | /* tclass[prio=0]=1, tclass[prio=1]=0, tclass[prio=i]=i (for i>1) */ |
| 745 | ets.prio_tc[0] = 1; | 798 | ets.prio_tc[0] = 1; |
| 746 | ets.prio_tc[1] = 0; | 799 | ets.prio_tc[1] = 0; |
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index 1aa2028ed995..9ba1f72060aa 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | |||
| @@ -78,9 +78,11 @@ struct mlx5e_tc_flow { | |||
| 78 | }; | 78 | }; |
| 79 | 79 | ||
| 80 | struct mlx5e_tc_flow_parse_attr { | 80 | struct mlx5e_tc_flow_parse_attr { |
| 81 | struct ip_tunnel_info tun_info; | ||
| 81 | struct mlx5_flow_spec spec; | 82 | struct mlx5_flow_spec spec; |
| 82 | int num_mod_hdr_actions; | 83 | int num_mod_hdr_actions; |
| 83 | void *mod_hdr_actions; | 84 | void *mod_hdr_actions; |
| 85 | int mirred_ifindex; | ||
| 84 | }; | 86 | }; |
| 85 | 87 | ||
| 86 | enum { | 88 | enum { |
| @@ -322,6 +324,12 @@ static void mlx5e_tc_del_nic_flow(struct mlx5e_priv *priv, | |||
| 322 | static void mlx5e_detach_encap(struct mlx5e_priv *priv, | 324 | static void mlx5e_detach_encap(struct mlx5e_priv *priv, |
| 323 | struct mlx5e_tc_flow *flow); | 325 | struct mlx5e_tc_flow *flow); |
| 324 | 326 | ||
| 327 | static int mlx5e_attach_encap(struct mlx5e_priv *priv, | ||
| 328 | struct ip_tunnel_info *tun_info, | ||
| 329 | struct net_device *mirred_dev, | ||
| 330 | struct net_device **encap_dev, | ||
| 331 | struct mlx5e_tc_flow *flow); | ||
| 332 | |||
| 325 | static struct mlx5_flow_handle * | 333 | static struct mlx5_flow_handle * |
| 326 | mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv, | 334 | mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv, |
| 327 | struct mlx5e_tc_flow_parse_attr *parse_attr, | 335 | struct mlx5e_tc_flow_parse_attr *parse_attr, |
| @@ -329,9 +337,27 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv, | |||
| 329 | { | 337 | { |
| 330 | struct mlx5_eswitch *esw = priv->mdev->priv.eswitch; | 338 | struct mlx5_eswitch *esw = priv->mdev->priv.eswitch; |
| 331 | struct mlx5_esw_flow_attr *attr = flow->esw_attr; | 339 | struct mlx5_esw_flow_attr *attr = flow->esw_attr; |
| 332 | struct mlx5_flow_handle *rule; | 340 | struct net_device *out_dev, *encap_dev = NULL; |
| 341 | struct mlx5_flow_handle *rule = NULL; | ||
| 342 | struct mlx5e_rep_priv *rpriv; | ||
| 343 | struct mlx5e_priv *out_priv; | ||
| 333 | int err; | 344 | int err; |
| 334 | 345 | ||
| 346 | if (attr->action & MLX5_FLOW_CONTEXT_ACTION_ENCAP) { | ||
| 347 | out_dev = __dev_get_by_index(dev_net(priv->netdev), | ||
| 348 | attr->parse_attr->mirred_ifindex); | ||
| 349 | err = mlx5e_attach_encap(priv, &parse_attr->tun_info, | ||
| 350 | out_dev, &encap_dev, flow); | ||
| 351 | if (err) { | ||
| 352 | rule = ERR_PTR(err); | ||
| 353 | if (err != -EAGAIN) | ||
| 354 | goto err_attach_encap; | ||
| 355 | } | ||
| 356 | out_priv = netdev_priv(encap_dev); | ||
| 357 | rpriv = out_priv->ppriv; | ||
| 358 | attr->out_rep = rpriv->rep; | ||
| 359 | } | ||
| 360 | |||
| 335 | err = mlx5_eswitch_add_vlan_action(esw, attr); | 361 | err = mlx5_eswitch_add_vlan_action(esw, attr); |
| 336 | if (err) { | 362 | if (err) { |
| 337 | rule = ERR_PTR(err); | 363 | rule = ERR_PTR(err); |
| @@ -347,10 +373,14 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv, | |||
| 347 | } | 373 | } |
| 348 | } | 374 | } |
| 349 | 375 | ||
| 350 | rule = mlx5_eswitch_add_offloaded_rule(esw, &parse_attr->spec, attr); | 376 | /* we get here if (1) there's no error (rule being null) or when |
| 351 | if (IS_ERR(rule)) | 377 | * (2) there's an encap action and we're on -EAGAIN (no valid neigh) |
| 352 | goto err_add_rule; | 378 | */ |
| 353 | 379 | if (rule != ERR_PTR(-EAGAIN)) { | |
| 380 | rule = mlx5_eswitch_add_offloaded_rule(esw, &parse_attr->spec, attr); | ||
| 381 | if (IS_ERR(rule)) | ||
| 382 | goto err_add_rule; | ||
| 383 | } | ||
| 354 | return rule; | 384 | return rule; |
| 355 | 385 | ||
| 356 | err_add_rule: | 386 | err_add_rule: |
| @@ -361,6 +391,7 @@ err_mod_hdr: | |||
| 361 | err_add_vlan: | 391 | err_add_vlan: |
| 362 | if (attr->action & MLX5_FLOW_CONTEXT_ACTION_ENCAP) | 392 | if (attr->action & MLX5_FLOW_CONTEXT_ACTION_ENCAP) |
| 363 | mlx5e_detach_encap(priv, flow); | 393 | mlx5e_detach_encap(priv, flow); |
| 394 | err_attach_encap: | ||
| 364 | return rule; | 395 | return rule; |
| 365 | } | 396 | } |
| 366 | 397 | ||
| @@ -389,6 +420,8 @@ static void mlx5e_tc_del_fdb_flow(struct mlx5e_priv *priv, | |||
| 389 | void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv, | 420 | void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv, |
| 390 | struct mlx5e_encap_entry *e) | 421 | struct mlx5e_encap_entry *e) |
| 391 | { | 422 | { |
| 423 | struct mlx5_eswitch *esw = priv->mdev->priv.eswitch; | ||
| 424 | struct mlx5_esw_flow_attr *esw_attr; | ||
| 392 | struct mlx5e_tc_flow *flow; | 425 | struct mlx5e_tc_flow *flow; |
| 393 | int err; | 426 | int err; |
| 394 | 427 | ||
| @@ -404,10 +437,9 @@ void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv, | |||
| 404 | mlx5e_rep_queue_neigh_stats_work(priv); | 437 | mlx5e_rep_queue_neigh_stats_work(priv); |
| 405 | 438 | ||
| 406 | list_for_each_entry(flow, &e->flows, encap) { | 439 | list_for_each_entry(flow, &e->flows, encap) { |
| 407 | flow->esw_attr->encap_id = e->encap_id; | 440 | esw_attr = flow->esw_attr; |
| 408 | flow->rule = mlx5e_tc_add_fdb_flow(priv, | 441 | esw_attr->encap_id = e->encap_id; |
| 409 | flow->esw_attr->parse_attr, | 442 | flow->rule = mlx5_eswitch_add_offloaded_rule(esw, &esw_attr->parse_attr->spec, esw_attr); |
| 410 | flow); | ||
| 411 | if (IS_ERR(flow->rule)) { | 443 | if (IS_ERR(flow->rule)) { |
| 412 | err = PTR_ERR(flow->rule); | 444 | err = PTR_ERR(flow->rule); |
| 413 | mlx5_core_warn(priv->mdev, "Failed to update cached encapsulation flow, %d\n", | 445 | mlx5_core_warn(priv->mdev, "Failed to update cached encapsulation flow, %d\n", |
| @@ -421,15 +453,13 @@ void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv, | |||
| 421 | void mlx5e_tc_encap_flows_del(struct mlx5e_priv *priv, | 453 | void mlx5e_tc_encap_flows_del(struct mlx5e_priv *priv, |
| 422 | struct mlx5e_encap_entry *e) | 454 | struct mlx5e_encap_entry *e) |
| 423 | { | 455 | { |
| 456 | struct mlx5_eswitch *esw = priv->mdev->priv.eswitch; | ||
| 424 | struct mlx5e_tc_flow *flow; | 457 | struct mlx5e_tc_flow *flow; |
| 425 | struct mlx5_fc *counter; | ||
| 426 | 458 | ||
| 427 | list_for_each_entry(flow, &e->flows, encap) { | 459 | list_for_each_entry(flow, &e->flows, encap) { |
| 428 | if (flow->flags & MLX5E_TC_FLOW_OFFLOADED) { | 460 | if (flow->flags & MLX5E_TC_FLOW_OFFLOADED) { |
| 429 | flow->flags &= ~MLX5E_TC_FLOW_OFFLOADED; | 461 | flow->flags &= ~MLX5E_TC_FLOW_OFFLOADED; |
| 430 | counter = mlx5_flow_rule_counter(flow->rule); | 462 | mlx5_eswitch_del_offloaded_rule(esw, flow->rule, flow->esw_attr); |
| 431 | mlx5_del_flow_rules(flow->rule); | ||
| 432 | mlx5_fc_destroy(priv->mdev, counter); | ||
| 433 | } | 463 | } |
| 434 | } | 464 | } |
| 435 | 465 | ||
| @@ -1942,7 +1972,7 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, struct tcf_exts *exts, | |||
| 1942 | 1972 | ||
| 1943 | if (is_tcf_mirred_egress_redirect(a)) { | 1973 | if (is_tcf_mirred_egress_redirect(a)) { |
| 1944 | int ifindex = tcf_mirred_ifindex(a); | 1974 | int ifindex = tcf_mirred_ifindex(a); |
| 1945 | struct net_device *out_dev, *encap_dev = NULL; | 1975 | struct net_device *out_dev; |
| 1946 | struct mlx5e_priv *out_priv; | 1976 | struct mlx5e_priv *out_priv; |
| 1947 | 1977 | ||
| 1948 | out_dev = __dev_get_by_index(dev_net(priv->netdev), ifindex); | 1978 | out_dev = __dev_get_by_index(dev_net(priv->netdev), ifindex); |
| @@ -1955,17 +1985,13 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, struct tcf_exts *exts, | |||
| 1955 | rpriv = out_priv->ppriv; | 1985 | rpriv = out_priv->ppriv; |
| 1956 | attr->out_rep = rpriv->rep; | 1986 | attr->out_rep = rpriv->rep; |
| 1957 | } else if (encap) { | 1987 | } else if (encap) { |
| 1958 | err = mlx5e_attach_encap(priv, info, | 1988 | parse_attr->mirred_ifindex = ifindex; |
| 1959 | out_dev, &encap_dev, flow); | 1989 | parse_attr->tun_info = *info; |
| 1960 | if (err && err != -EAGAIN) | 1990 | attr->parse_attr = parse_attr; |
| 1961 | return err; | ||
| 1962 | attr->action |= MLX5_FLOW_CONTEXT_ACTION_ENCAP | | 1991 | attr->action |= MLX5_FLOW_CONTEXT_ACTION_ENCAP | |
| 1963 | MLX5_FLOW_CONTEXT_ACTION_FWD_DEST | | 1992 | MLX5_FLOW_CONTEXT_ACTION_FWD_DEST | |
| 1964 | MLX5_FLOW_CONTEXT_ACTION_COUNT; | 1993 | MLX5_FLOW_CONTEXT_ACTION_COUNT; |
| 1965 | out_priv = netdev_priv(encap_dev); | 1994 | /* attr->out_rep is resolved when we handle encap */ |
| 1966 | rpriv = out_priv->ppriv; | ||
| 1967 | attr->out_rep = rpriv->rep; | ||
| 1968 | attr->parse_attr = parse_attr; | ||
| 1969 | } else { | 1995 | } else { |
| 1970 | pr_err("devices %s %s not on same switch HW, can't offload forwarding\n", | 1996 | pr_err("devices %s %s not on same switch HW, can't offload forwarding\n", |
| 1971 | priv->netdev->name, out_dev->name); | 1997 | priv->netdev->name, out_dev->name); |
| @@ -2047,7 +2073,7 @@ int mlx5e_configure_flower(struct mlx5e_priv *priv, | |||
| 2047 | if (flow->flags & MLX5E_TC_FLOW_ESWITCH) { | 2073 | if (flow->flags & MLX5E_TC_FLOW_ESWITCH) { |
| 2048 | err = parse_tc_fdb_actions(priv, f->exts, parse_attr, flow); | 2074 | err = parse_tc_fdb_actions(priv, f->exts, parse_attr, flow); |
| 2049 | if (err < 0) | 2075 | if (err < 0) |
| 2050 | goto err_handle_encap_flow; | 2076 | goto err_free; |
| 2051 | flow->rule = mlx5e_tc_add_fdb_flow(priv, parse_attr, flow); | 2077 | flow->rule = mlx5e_tc_add_fdb_flow(priv, parse_attr, flow); |
| 2052 | } else { | 2078 | } else { |
| 2053 | err = parse_tc_nic_actions(priv, f->exts, parse_attr, flow); | 2079 | err = parse_tc_nic_actions(priv, f->exts, parse_attr, flow); |
| @@ -2058,10 +2084,13 @@ int mlx5e_configure_flower(struct mlx5e_priv *priv, | |||
| 2058 | 2084 | ||
| 2059 | if (IS_ERR(flow->rule)) { | 2085 | if (IS_ERR(flow->rule)) { |
| 2060 | err = PTR_ERR(flow->rule); | 2086 | err = PTR_ERR(flow->rule); |
| 2061 | goto err_free; | 2087 | if (err != -EAGAIN) |
| 2088 | goto err_free; | ||
| 2062 | } | 2089 | } |
| 2063 | 2090 | ||
| 2064 | flow->flags |= MLX5E_TC_FLOW_OFFLOADED; | 2091 | if (err != -EAGAIN) |
| 2092 | flow->flags |= MLX5E_TC_FLOW_OFFLOADED; | ||
| 2093 | |||
| 2065 | err = rhashtable_insert_fast(&tc->ht, &flow->node, | 2094 | err = rhashtable_insert_fast(&tc->ht, &flow->node, |
| 2066 | tc->ht_params); | 2095 | tc->ht_params); |
| 2067 | if (err) | 2096 | if (err) |
| @@ -2075,16 +2104,6 @@ int mlx5e_configure_flower(struct mlx5e_priv *priv, | |||
| 2075 | err_del_rule: | 2104 | err_del_rule: |
| 2076 | mlx5e_tc_del_flow(priv, flow); | 2105 | mlx5e_tc_del_flow(priv, flow); |
| 2077 | 2106 | ||
| 2078 | err_handle_encap_flow: | ||
| 2079 | if (err == -EAGAIN) { | ||
| 2080 | err = rhashtable_insert_fast(&tc->ht, &flow->node, | ||
| 2081 | tc->ht_params); | ||
| 2082 | if (err) | ||
| 2083 | mlx5e_tc_del_flow(priv, flow); | ||
| 2084 | else | ||
| 2085 | return 0; | ||
| 2086 | } | ||
| 2087 | |||
| 2088 | err_free: | 2107 | err_free: |
| 2089 | kvfree(parse_attr); | 2108 | kvfree(parse_attr); |
| 2090 | kfree(flow); | 2109 | kfree(flow); |
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c index 8aea0a065e56..db86e1506c8b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/health.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c | |||
| @@ -356,10 +356,11 @@ void mlx5_drain_health_wq(struct mlx5_core_dev *dev) | |||
| 356 | void mlx5_drain_health_recovery(struct mlx5_core_dev *dev) | 356 | void mlx5_drain_health_recovery(struct mlx5_core_dev *dev) |
| 357 | { | 357 | { |
| 358 | struct mlx5_core_health *health = &dev->priv.health; | 358 | struct mlx5_core_health *health = &dev->priv.health; |
| 359 | unsigned long flags; | ||
| 359 | 360 | ||
| 360 | spin_lock(&health->wq_lock); | 361 | spin_lock_irqsave(&health->wq_lock, flags); |
| 361 | set_bit(MLX5_DROP_NEW_RECOVERY_WORK, &health->flags); | 362 | set_bit(MLX5_DROP_NEW_RECOVERY_WORK, &health->flags); |
| 362 | spin_unlock(&health->wq_lock); | 363 | spin_unlock_irqrestore(&health->wq_lock, flags); |
| 363 | cancel_delayed_work_sync(&dev->priv.health.recover_work); | 364 | cancel_delayed_work_sync(&dev->priv.health.recover_work); |
| 364 | } | 365 | } |
| 365 | 366 | ||
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/port.c b/drivers/net/ethernet/mellanox/mlx5/core/port.c index 1975d4388d4f..e07061f565d6 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/port.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/port.c | |||
| @@ -677,6 +677,27 @@ int mlx5_set_port_tc_group(struct mlx5_core_dev *mdev, u8 *tc_group) | |||
| 677 | } | 677 | } |
| 678 | EXPORT_SYMBOL_GPL(mlx5_set_port_tc_group); | 678 | EXPORT_SYMBOL_GPL(mlx5_set_port_tc_group); |
| 679 | 679 | ||
| 680 | int mlx5_query_port_tc_group(struct mlx5_core_dev *mdev, | ||
| 681 | u8 tc, u8 *tc_group) | ||
| 682 | { | ||
| 683 | u32 out[MLX5_ST_SZ_DW(qetc_reg)]; | ||
| 684 | void *ets_tcn_conf; | ||
| 685 | int err; | ||
| 686 | |||
| 687 | err = mlx5_query_port_qetcr_reg(mdev, out, sizeof(out)); | ||
| 688 | if (err) | ||
| 689 | return err; | ||
| 690 | |||
| 691 | ets_tcn_conf = MLX5_ADDR_OF(qetc_reg, out, | ||
| 692 | tc_configuration[tc]); | ||
| 693 | |||
| 694 | *tc_group = MLX5_GET(ets_tcn_config_reg, ets_tcn_conf, | ||
| 695 | group); | ||
| 696 | |||
| 697 | return 0; | ||
| 698 | } | ||
| 699 | EXPORT_SYMBOL_GPL(mlx5_query_port_tc_group); | ||
| 700 | |||
| 680 | int mlx5_set_port_tc_bw_alloc(struct mlx5_core_dev *mdev, u8 *tc_bw) | 701 | int mlx5_set_port_tc_bw_alloc(struct mlx5_core_dev *mdev, u8 *tc_bw) |
| 681 | { | 702 | { |
| 682 | u32 in[MLX5_ST_SZ_DW(qetc_reg)] = {0}; | 703 | u32 in[MLX5_ST_SZ_DW(qetc_reg)] = {0}; |
diff --git a/drivers/net/ethernet/mellanox/mlxsw/Makefile b/drivers/net/ethernet/mellanox/mlxsw/Makefile index 891ff418bb5e..9a5a1cc877b6 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/Makefile +++ b/drivers/net/ethernet/mellanox/mlxsw/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_MLXSW_CORE) += mlxsw_core.o | 2 | obj-$(CONFIG_MLXSW_CORE) += mlxsw_core.o |
| 2 | mlxsw_core-objs := core.o core_acl_flex_keys.o \ | 3 | mlxsw_core-objs := core.o core_acl_flex_keys.o \ |
| 3 | core_acl_flex_actions.o | 4 | core_acl_flex_actions.o |
diff --git a/drivers/net/ethernet/mellanox/mlxsw/i2c.c b/drivers/net/ethernet/mellanox/mlxsw/i2c.c index 12c3a4449120..c0dcfa05b077 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/i2c.c +++ b/drivers/net/ethernet/mellanox/mlxsw/i2c.c | |||
| @@ -294,7 +294,7 @@ mlxsw_i2c_write(struct device *dev, size_t in_mbox_size, u8 *in_mbox, int num, | |||
| 294 | write_tran.len = MLXSW_I2C_ADDR_WIDTH + chunk_size; | 294 | write_tran.len = MLXSW_I2C_ADDR_WIDTH + chunk_size; |
| 295 | mlxsw_i2c_set_slave_addr(tran_buf, off); | 295 | mlxsw_i2c_set_slave_addr(tran_buf, off); |
| 296 | memcpy(&tran_buf[MLXSW_I2C_ADDR_BUF_SIZE], in_mbox + | 296 | memcpy(&tran_buf[MLXSW_I2C_ADDR_BUF_SIZE], in_mbox + |
| 297 | chunk_size * i, chunk_size); | 297 | MLXSW_I2C_BLK_MAX * i, chunk_size); |
| 298 | 298 | ||
| 299 | j = 0; | 299 | j = 0; |
| 300 | end = jiffies + timeout; | 300 | end = jiffies + timeout; |
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h index 4afc8486eb9a..5acfbe5b8b9d 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/reg.h +++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h | |||
| @@ -5827,6 +5827,29 @@ MLXSW_ITEM32(reg, mtmp, mtr, 0x08, 30, 1); | |||
| 5827 | */ | 5827 | */ |
| 5828 | MLXSW_ITEM32(reg, mtmp, max_temperature, 0x08, 0, 16); | 5828 | MLXSW_ITEM32(reg, mtmp, max_temperature, 0x08, 0, 16); |
| 5829 | 5829 | ||
| 5830 | /* reg_mtmp_tee | ||
| 5831 | * Temperature Event Enable. | ||
| 5832 | * 0 - Do not generate event | ||
| 5833 | * 1 - Generate event | ||
| 5834 | * 2 - Generate single event | ||
| 5835 | * Access: RW | ||
| 5836 | */ | ||
| 5837 | MLXSW_ITEM32(reg, mtmp, tee, 0x0C, 30, 2); | ||
| 5838 | |||
| 5839 | #define MLXSW_REG_MTMP_THRESH_HI 0x348 /* 105 Celsius */ | ||
| 5840 | |||
| 5841 | /* reg_mtmp_temperature_threshold_hi | ||
| 5842 | * High threshold for Temperature Warning Event. In 0.125 Celsius. | ||
| 5843 | * Access: RW | ||
| 5844 | */ | ||
| 5845 | MLXSW_ITEM32(reg, mtmp, temperature_threshold_hi, 0x0C, 0, 16); | ||
| 5846 | |||
| 5847 | /* reg_mtmp_temperature_threshold_lo | ||
| 5848 | * Low threshold for Temperature Warning Event. In 0.125 Celsius. | ||
| 5849 | * Access: RW | ||
| 5850 | */ | ||
| 5851 | MLXSW_ITEM32(reg, mtmp, temperature_threshold_lo, 0x10, 0, 16); | ||
| 5852 | |||
| 5830 | #define MLXSW_REG_MTMP_SENSOR_NAME_SIZE 8 | 5853 | #define MLXSW_REG_MTMP_SENSOR_NAME_SIZE 8 |
| 5831 | 5854 | ||
| 5832 | /* reg_mtmp_sensor_name | 5855 | /* reg_mtmp_sensor_name |
| @@ -5843,6 +5866,8 @@ static inline void mlxsw_reg_mtmp_pack(char *payload, u8 sensor_index, | |||
| 5843 | mlxsw_reg_mtmp_sensor_index_set(payload, sensor_index); | 5866 | mlxsw_reg_mtmp_sensor_index_set(payload, sensor_index); |
| 5844 | mlxsw_reg_mtmp_mte_set(payload, max_temp_enable); | 5867 | mlxsw_reg_mtmp_mte_set(payload, max_temp_enable); |
| 5845 | mlxsw_reg_mtmp_mtr_set(payload, max_temp_reset); | 5868 | mlxsw_reg_mtmp_mtr_set(payload, max_temp_reset); |
| 5869 | mlxsw_reg_mtmp_temperature_threshold_hi_set(payload, | ||
| 5870 | MLXSW_REG_MTMP_THRESH_HI); | ||
| 5846 | } | 5871 | } |
| 5847 | 5872 | ||
| 5848 | static inline void mlxsw_reg_mtmp_unpack(char *payload, unsigned int *p_temp, | 5873 | static inline void mlxsw_reg_mtmp_unpack(char *payload, unsigned int *p_temp, |
diff --git a/drivers/net/ethernet/micrel/Makefile b/drivers/net/ethernet/micrel/Makefile index c83e4bc50c73..848fc1c5a5dc 100644 --- a/drivers/net/ethernet/micrel/Makefile +++ b/drivers/net/ethernet/micrel/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Micrel network device drivers. | 3 | # Makefile for the Micrel network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/micrel/ks8695net.h b/drivers/net/ethernet/micrel/ks8695net.h index 80eff6ea5163..b18fad4ad5fd 100644 --- a/drivers/net/ethernet/micrel/ks8695net.h +++ b/drivers/net/ethernet/micrel/ks8695net.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Micrel KS8695 (Centaur) Ethernet. | 3 | * Micrel KS8695 (Centaur) Ethernet. |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/microchip/enc28j60_hw.h b/drivers/net/ethernet/microchip/enc28j60_hw.h index 25b41de49f0e..da4ab172527d 100644 --- a/drivers/net/ethernet/microchip/enc28j60_hw.h +++ b/drivers/net/ethernet/microchip/enc28j60_hw.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * enc28j60_hw.h: EDTP FrameThrower style enc28j60 registers | 3 | * enc28j60_hw.h: EDTP FrameThrower style enc28j60 registers |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/microchip/encx24j600_hw.h b/drivers/net/ethernet/microchip/encx24j600_hw.h index 4be73d5553f8..f604a260ede7 100644 --- a/drivers/net/ethernet/microchip/encx24j600_hw.h +++ b/drivers/net/ethernet/microchip/encx24j600_hw.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /** | 2 | /** |
| 2 | * encx24j600_hw.h: Register definitions | 3 | * encx24j600_hw.h: Register definitions |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h index b7fc26c4f738..cf73810608a2 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MYRI10GE_MCP_H__ | 2 | #ifndef __MYRI10GE_MCP_H__ |
| 2 | #define __MYRI10GE_MCP_H__ | 3 | #define __MYRI10GE_MCP_H__ |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h index 75ec5e7cf50d..95a0095a4a75 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MYRI10GE_MCP_GEN_HEADER_H__ | 2 | #ifndef __MYRI10GE_MCP_GEN_HEADER_H__ |
| 2 | #define __MYRI10GE_MCP_GEN_HEADER_H__ | 3 | #define __MYRI10GE_MCP_GEN_HEADER_H__ |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/natsemi/Makefile b/drivers/net/ethernet/natsemi/Makefile index 764c532a96d1..cc664977596e 100644 --- a/drivers/net/ethernet/natsemi/Makefile +++ b/drivers/net/ethernet/natsemi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the National Semi-conductor Sonic devices. | 3 | # Makefile for the National Semi-conductor Sonic devices. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/natsemi/jazzsonic.c b/drivers/net/ethernet/natsemi/jazzsonic.c index a6caeb567c0d..d5b28884e21e 100644 --- a/drivers/net/ethernet/natsemi/jazzsonic.c +++ b/drivers/net/ethernet/natsemi/jazzsonic.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * jazzsonic.c | 3 | * jazzsonic.c |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c index 3ca6ae7caf55..a42433fb6949 100644 --- a/drivers/net/ethernet/natsemi/macsonic.c +++ b/drivers/net/ethernet/natsemi/macsonic.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * macsonic.c | 3 | * macsonic.c |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/natsemi/sonic.h b/drivers/net/ethernet/natsemi/sonic.h index 7b0a8db57af9..421b1a283fed 100644 --- a/drivers/net/ethernet/natsemi/sonic.h +++ b/drivers/net/ethernet/natsemi/sonic.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Header file for sonic.c | 3 | * Header file for sonic.c |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/natsemi/xtsonic.c b/drivers/net/ethernet/natsemi/xtsonic.c index 9ee0f69a83c0..1817deea98a4 100644 --- a/drivers/net/ethernet/natsemi/xtsonic.c +++ b/drivers/net/ethernet/natsemi/xtsonic.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * xtsonic.c | 3 | * xtsonic.c |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/netronome/nfp/Makefile b/drivers/net/ethernet/netronome/nfp/Makefile index 96e579a15cbe..3cafa3d15082 100644 --- a/drivers/net/ethernet/netronome/nfp/Makefile +++ b/drivers/net/ethernet/netronome/nfp/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_NFP) += nfp.o | 2 | obj-$(CONFIG_NFP) += nfp.o |
| 2 | 3 | ||
| 3 | nfp-objs := \ | 4 | nfp-objs := \ |
diff --git a/drivers/net/ethernet/netronome/nfp/flower/action.c b/drivers/net/ethernet/netronome/nfp/flower/action.c index db9750695dc7..8ea9320014ee 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/action.c +++ b/drivers/net/ethernet/netronome/nfp/flower/action.c | |||
| @@ -110,6 +110,8 @@ nfp_fl_output(struct nfp_fl_output *output, const struct tc_action *action, | |||
| 110 | */ | 110 | */ |
| 111 | if (!switchdev_port_same_parent_id(in_dev, out_dev)) | 111 | if (!switchdev_port_same_parent_id(in_dev, out_dev)) |
| 112 | return -EOPNOTSUPP; | 112 | return -EOPNOTSUPP; |
| 113 | if (!nfp_netdev_is_nfp_repr(out_dev)) | ||
| 114 | return -EOPNOTSUPP; | ||
| 113 | 115 | ||
| 114 | output->port = cpu_to_be32(nfp_repr_get_port_id(out_dev)); | 116 | output->port = cpu_to_be32(nfp_repr_get_port_id(out_dev)); |
| 115 | if (!output->port) | 117 | if (!output->port) |
diff --git a/drivers/net/ethernet/qlogic/Makefile b/drivers/net/ethernet/qlogic/Makefile index cee90e05beb8..6cd2e333a5fc 100644 --- a/drivers/net/ethernet/qlogic/Makefile +++ b/drivers/net/ethernet/qlogic/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the QLogic network device drivers. | 3 | # Makefile for the QLogic network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/qlogic/qed/Makefile b/drivers/net/ethernet/qlogic/qed/Makefile index 82dd47068e18..82a0b90185df 100644 --- a/drivers/net/ethernet/qlogic/qed/Makefile +++ b/drivers/net/ethernet/qlogic/qed/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_QED) := qed.o | 2 | obj-$(CONFIG_QED) := qed.o |
| 2 | 3 | ||
| 3 | qed-y := qed_cxt.o qed_dev.o qed_hw.o qed_init_fw_funcs.o qed_init_ops.o \ | 4 | qed-y := qed_cxt.o qed_dev.o qed_hw.o qed_init_fw_funcs.o qed_init_ops.o \ |
diff --git a/drivers/net/ethernet/qlogic/qed/qed_selftest.h b/drivers/net/ethernet/qlogic/qed/qed_selftest.h index 739ddb730967..ad00d082fec8 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_selftest.h +++ b/drivers/net/ethernet/qlogic/qed/qed_selftest.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _QED_SELFTEST_API_H | 2 | #ifndef _QED_SELFTEST_API_H |
| 2 | #define _QED_SELFTEST_API_H | 3 | #define _QED_SELFTEST_API_H |
| 3 | #include <linux/types.h> | 4 | #include <linux/types.h> |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/Makefile b/drivers/net/ethernet/qlogic/qlcnic/Makefile index 3c2c2c7c1559..dbaeab344667 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/Makefile +++ b/drivers/net/ethernet/qlogic/qlcnic/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for Qlogic 1G/10G Ethernet Driver for CNA devices | 3 | # Makefile for Qlogic 1G/10G Ethernet Driver for CNA devices |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c index fe2599b83d09..31389ab8bdf7 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | 2 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 2 | 3 | ||
| 3 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c index 31f40148fa5c..5edbd532127d 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/types.h> | 3 | #include <linux/types.h> |
| 3 | #include <linux/module.h> | 4 | #include <linux/module.h> |
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c index 7ad146080c36..384c8bc874f3 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "qlge.h" | 2 | #include "qlge.h" |
| 2 | 3 | ||
| 3 | int ql_unpause_mpi_risc(struct ql_adapter *qdev) | 4 | int ql_unpause_mpi_risc(struct ql_adapter *qdev) |
diff --git a/drivers/net/ethernet/qualcomm/Makefile b/drivers/net/ethernet/qualcomm/Makefile index 1847350f48a7..9250976dd884 100644 --- a/drivers/net/ethernet/qualcomm/Makefile +++ b/drivers/net/ethernet/qualcomm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Qualcomm network device drivers. | 3 | # Makefile for the Qualcomm network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/realtek/atp.h b/drivers/net/ethernet/realtek/atp.h index 32497f0e537c..63f0d2d0e87b 100644 --- a/drivers/net/ethernet/realtek/atp.h +++ b/drivers/net/ethernet/realtek/atp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* Linux header file for the ATP pocket ethernet adapter. */ | 2 | /* Linux header file for the ATP pocket ethernet adapter. */ |
| 2 | /* v1.09 8/9/2000 becker@scyld.com. */ | 3 | /* v1.09 8/9/2000 becker@scyld.com. */ |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/seeq/sgiseeq.h b/drivers/net/ethernet/seeq/sgiseeq.h index 2211e2987a8d..2f65c55608df 100644 --- a/drivers/net/ethernet/seeq/sgiseeq.h +++ b/drivers/net/ethernet/seeq/sgiseeq.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * sgiseeq.h: Defines for the Seeq8003 ethernet controller. | 3 | * sgiseeq.h: Defines for the Seeq8003 ethernet controller. |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/sfc/Makefile b/drivers/net/ethernet/sfc/Makefile index 520cfcc17785..3bac58d0f88b 100644 --- a/drivers/net/ethernet/sfc/Makefile +++ b/drivers/net/ethernet/sfc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | sfc-y += efx.o nic.o farch.o siena.o ef10.o tx.o rx.o \ | 2 | sfc-y += efx.o nic.o farch.o siena.o ef10.o tx.o rx.o \ |
| 2 | selftest.o ethtool.o ptp.o tx_tso.o \ | 3 | selftest.o ethtool.o ptp.o tx_tso.o \ |
| 3 | mcdi.o mcdi_port.o mcdi_mon.o | 4 | mcdi.o mcdi_port.o mcdi_mon.o |
diff --git a/drivers/net/ethernet/sfc/falcon/Makefile b/drivers/net/ethernet/sfc/falcon/Makefile index aa1b45979ca4..39448e5b7f1e 100644 --- a/drivers/net/ethernet/sfc/falcon/Makefile +++ b/drivers/net/ethernet/sfc/falcon/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | sfc-falcon-y += efx.o nic.o farch.o falcon.o tx.o rx.o selftest.o \ | 2 | sfc-falcon-y += efx.o nic.o farch.o falcon.o tx.o rx.o selftest.o \ |
| 2 | ethtool.o qt202x_phy.o mdio_10g.o tenxpress.o \ | 3 | ethtool.o qt202x_phy.o mdio_10g.o tenxpress.o \ |
| 3 | txc43128_phy.o falcon_boards.o | 4 | txc43128_phy.o falcon_boards.o |
diff --git a/drivers/net/ethernet/sis/sis900.h b/drivers/net/ethernet/sis/sis900.h index f0da3dc52c01..66e4bf38770f 100644 --- a/drivers/net/ethernet/sis/sis900.h +++ b/drivers/net/ethernet/sis/sis900.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* sis900.h Definitions for SiS ethernet controllers including 7014/7016 and 900 | 2 | /* sis900.h Definitions for SiS ethernet controllers including 7014/7016 and 900 |
| 2 | * Copyright 1999 Silicon Integrated System Corporation | 3 | * Copyright 1999 Silicon Integrated System Corporation |
| 3 | * References: | 4 | * References: |
diff --git a/drivers/net/ethernet/smsc/Makefile b/drivers/net/ethernet/smsc/Makefile index f3438dec9d90..4105912b1629 100644 --- a/drivers/net/ethernet/smsc/Makefile +++ b/drivers/net/ethernet/smsc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the SMSC network device drivers. | 3 | # Makefile for the SMSC network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile index 238307fadcdb..ff3f83b86d10 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Makefile +++ b/drivers/net/ethernet/stmicro/stmmac/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_STMMAC_ETH) += stmmac.o | 2 | obj-$(CONFIG_STMMAC_ETH) += stmmac.o |
| 2 | stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o ring_mode.o \ | 3 | stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o ring_mode.o \ |
| 3 | chain_mode.o dwmac_lib.o dwmac1000_core.o dwmac1000_dma.o \ | 4 | chain_mode.o dwmac_lib.o dwmac1000_core.o dwmac1000_dma.o \ |
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c index 5efef8001edf..3256e5cbad27 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | |||
| @@ -74,7 +74,7 @@ static int dwc_eth_dwmac_config_dt(struct platform_device *pdev, | |||
| 74 | plat_dat->axi->axi_wr_osr_lmt--; | 74 | plat_dat->axi->axi_wr_osr_lmt--; |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | if (of_property_read_u32(np, "read,read-requests", | 77 | if (of_property_read_u32(np, "snps,read-requests", |
| 78 | &plat_dat->axi->axi_rd_osr_lmt)) { | 78 | &plat_dat->axi->axi_rd_osr_lmt)) { |
| 79 | /** | 79 | /** |
| 80 | * Since the register has a reset value of 1, if property | 80 | * Since the register has a reset value of 1, if property |
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 8a280b48e3a9..195eb7e71473 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | |||
| @@ -150,6 +150,13 @@ static void stmmac_mtl_setup(struct platform_device *pdev, | |||
| 150 | plat->rx_queues_to_use = 1; | 150 | plat->rx_queues_to_use = 1; |
| 151 | plat->tx_queues_to_use = 1; | 151 | plat->tx_queues_to_use = 1; |
| 152 | 152 | ||
| 153 | /* First Queue must always be in DCB mode. As MTL_QUEUE_DCB = 1 we need | ||
| 154 | * to always set this, otherwise Queue will be classified as AVB | ||
| 155 | * (because MTL_QUEUE_AVB = 0). | ||
| 156 | */ | ||
| 157 | plat->rx_queues_cfg[0].mode_to_use = MTL_QUEUE_DCB; | ||
| 158 | plat->tx_queues_cfg[0].mode_to_use = MTL_QUEUE_DCB; | ||
| 159 | |||
| 153 | rx_node = of_parse_phandle(pdev->dev.of_node, "snps,mtl-rx-config", 0); | 160 | rx_node = of_parse_phandle(pdev->dev.of_node, "snps,mtl-rx-config", 0); |
| 154 | if (!rx_node) | 161 | if (!rx_node) |
| 155 | return; | 162 | return; |
| @@ -161,8 +168,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev, | |||
| 161 | } | 168 | } |
| 162 | 169 | ||
| 163 | /* Processing RX queues common config */ | 170 | /* Processing RX queues common config */ |
| 164 | if (of_property_read_u8(rx_node, "snps,rx-queues-to-use", | 171 | if (of_property_read_u32(rx_node, "snps,rx-queues-to-use", |
| 165 | &plat->rx_queues_to_use)) | 172 | &plat->rx_queues_to_use)) |
| 166 | plat->rx_queues_to_use = 1; | 173 | plat->rx_queues_to_use = 1; |
| 167 | 174 | ||
| 168 | if (of_property_read_bool(rx_node, "snps,rx-sched-sp")) | 175 | if (of_property_read_bool(rx_node, "snps,rx-sched-sp")) |
| @@ -184,8 +191,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev, | |||
| 184 | else | 191 | else |
| 185 | plat->rx_queues_cfg[queue].mode_to_use = MTL_QUEUE_DCB; | 192 | plat->rx_queues_cfg[queue].mode_to_use = MTL_QUEUE_DCB; |
| 186 | 193 | ||
| 187 | if (of_property_read_u8(q_node, "snps,map-to-dma-channel", | 194 | if (of_property_read_u32(q_node, "snps,map-to-dma-channel", |
| 188 | &plat->rx_queues_cfg[queue].chan)) | 195 | &plat->rx_queues_cfg[queue].chan)) |
| 189 | plat->rx_queues_cfg[queue].chan = queue; | 196 | plat->rx_queues_cfg[queue].chan = queue; |
| 190 | /* TODO: Dynamic mapping to be included in the future */ | 197 | /* TODO: Dynamic mapping to be included in the future */ |
| 191 | 198 | ||
| @@ -215,8 +222,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev, | |||
| 215 | } | 222 | } |
| 216 | 223 | ||
| 217 | /* Processing TX queues common config */ | 224 | /* Processing TX queues common config */ |
| 218 | if (of_property_read_u8(tx_node, "snps,tx-queues-to-use", | 225 | if (of_property_read_u32(tx_node, "snps,tx-queues-to-use", |
| 219 | &plat->tx_queues_to_use)) | 226 | &plat->tx_queues_to_use)) |
| 220 | plat->tx_queues_to_use = 1; | 227 | plat->tx_queues_to_use = 1; |
| 221 | 228 | ||
| 222 | if (of_property_read_bool(tx_node, "snps,tx-sched-wrr")) | 229 | if (of_property_read_bool(tx_node, "snps,tx-sched-wrr")) |
| @@ -237,8 +244,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev, | |||
| 237 | if (queue >= plat->tx_queues_to_use) | 244 | if (queue >= plat->tx_queues_to_use) |
| 238 | break; | 245 | break; |
| 239 | 246 | ||
| 240 | if (of_property_read_u8(q_node, "snps,weight", | 247 | if (of_property_read_u32(q_node, "snps,weight", |
| 241 | &plat->tx_queues_cfg[queue].weight)) | 248 | &plat->tx_queues_cfg[queue].weight)) |
| 242 | plat->tx_queues_cfg[queue].weight = 0x10 + queue; | 249 | plat->tx_queues_cfg[queue].weight = 0x10 + queue; |
| 243 | 250 | ||
| 244 | if (of_property_read_bool(q_node, "snps,dcb-algorithm")) { | 251 | if (of_property_read_bool(q_node, "snps,dcb-algorithm")) { |
diff --git a/drivers/net/ethernet/sun/Makefile b/drivers/net/ethernet/sun/Makefile index 37855438b3cb..9a5249dee56e 100644 --- a/drivers/net/ethernet/sun/Makefile +++ b/drivers/net/ethernet/sun/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Sun network device drivers. | 3 | # Makefile for the Sun network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/sun/niu.h b/drivers/net/ethernet/sun/niu.h index 51e177e1860d..04c215f91fc0 100644 --- a/drivers/net/ethernet/sun/niu.h +++ b/drivers/net/ethernet/sun/niu.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* niu.h: Definitions for Neptune ethernet driver. | 2 | /* niu.h: Definitions for Neptune ethernet driver. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2007 David S. Miller (davem@davemloft.net) | 4 | * Copyright (C) 2007 David S. Miller (davem@davemloft.net) |
diff --git a/drivers/net/ethernet/sun/sunbmac.h b/drivers/net/ethernet/sun/sunbmac.h index ee56930475a8..d379bd407eca 100644 --- a/drivers/net/ethernet/sun/sunbmac.h +++ b/drivers/net/ethernet/sun/sunbmac.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: sunbmac.h,v 1.7 2000/07/11 22:35:22 davem Exp $ | 2 | /* $Id: sunbmac.h,v 1.7 2000/07/11 22:35:22 davem Exp $ |
| 2 | * sunbmac.h: Defines for the Sun "Big MAC" 100baseT ethernet cards. | 3 | * sunbmac.h: Defines for the Sun "Big MAC" 100baseT ethernet cards. |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/sun/sungem.h b/drivers/net/ethernet/sun/sungem.h index 835ce1b3cb9f..626302a9bc89 100644 --- a/drivers/net/ethernet/sun/sungem.h +++ b/drivers/net/ethernet/sun/sungem.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: sungem.h,v 1.10.2.4 2002/03/11 08:54:48 davem Exp $ | 2 | /* $Id: sungem.h,v 1.10.2.4 2002/03/11 08:54:48 davem Exp $ |
| 2 | * sungem.h: Definitions for Sun GEM ethernet driver. | 3 | * sungem.h: Definitions for Sun GEM ethernet driver. |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/sun/sunhme.h b/drivers/net/ethernet/sun/sunhme.h index fca1bca7f69d..9118c60c9426 100644 --- a/drivers/net/ethernet/sun/sunhme.h +++ b/drivers/net/ethernet/sun/sunhme.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: sunhme.h,v 1.33 2001/08/03 06:23:04 davem Exp $ | 2 | /* $Id: sunhme.h,v 1.33 2001/08/03 06:23:04 davem Exp $ |
| 2 | * sunhme.h: Definitions for Sparc HME/BigMac 10/100baseT ethernet driver. | 3 | * sunhme.h: Definitions for Sparc HME/BigMac 10/100baseT ethernet driver. |
| 3 | * Also known as the "Happy Meal". | 4 | * Also known as the "Happy Meal". |
diff --git a/drivers/net/ethernet/sun/sunqe.h b/drivers/net/ethernet/sun/sunqe.h index ae190b77431b..0daed05b7c83 100644 --- a/drivers/net/ethernet/sun/sunqe.h +++ b/drivers/net/ethernet/sun/sunqe.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: sunqe.h,v 1.13 2000/02/09 11:15:42 davem Exp $ | 2 | /* $Id: sunqe.h,v 1.13 2000/02/09 11:15:42 davem Exp $ |
| 2 | * sunqe.h: Definitions for the Sun QuadEthernet driver. | 3 | * sunqe.h: Definitions for the Sun QuadEthernet driver. |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/sun/sunvnet_common.h b/drivers/net/ethernet/sun/sunvnet_common.h index b20d6fa7ef25..6a4dd1fb19bf 100644 --- a/drivers/net/ethernet/sun/sunvnet_common.h +++ b/drivers/net/ethernet/sun/sunvnet_common.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _SUNVNETCOMMON_H | 2 | #ifndef _SUNVNETCOMMON_H |
| 2 | #define _SUNVNETCOMMON_H | 3 | #define _SUNVNETCOMMON_H |
| 3 | 4 | ||
diff --git a/drivers/net/ethernet/synopsys/Makefile b/drivers/net/ethernet/synopsys/Makefile index 0ad01916f11e..7a46393abf26 100644 --- a/drivers/net/ethernet/synopsys/Makefile +++ b/drivers/net/ethernet/synopsys/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Synopsys network device drivers. | 3 | # Makefile for the Synopsys network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile index 10e6b0ce51ba..0be551de821c 100644 --- a/drivers/net/ethernet/ti/Makefile +++ b/drivers/net/ethernet/ti/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the TI network device drivers. | 3 | # Makefile for the TI network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/tile/Makefile b/drivers/net/ethernet/tile/Makefile index 0ef9eefd3211..3d0ae1f07fc9 100644 --- a/drivers/net/ethernet/tile/Makefile +++ b/drivers/net/ethernet/tile/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the TILE on-chip networking support. | 3 | # Makefile for the TILE on-chip networking support. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/toshiba/Makefile b/drivers/net/ethernet/toshiba/Makefile index a5069008435b..f434fd0f429e 100644 --- a/drivers/net/ethernet/toshiba/Makefile +++ b/drivers/net/ethernet/toshiba/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Toshiba network device drivers. | 3 | # Makefile for the Toshiba network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/xilinx/Makefile b/drivers/net/ethernet/xilinx/Makefile index 214205e975e3..7d7dc1771423 100644 --- a/drivers/net/ethernet/xilinx/Makefile +++ b/drivers/net/ethernet/xilinx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Xilink network device drivers. | 3 | # Makefile for the Xilink network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ethernet/xilinx/ll_temac.h b/drivers/net/ethernet/xilinx/ll_temac.h index 7d06e3e1abac..107575225383 100644 --- a/drivers/net/ethernet/xilinx/ll_temac.h +++ b/drivers/net/ethernet/xilinx/ll_temac.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #ifndef XILINX_LL_TEMAC_H | 3 | #ifndef XILINX_LL_TEMAC_H |
| 3 | #define XILINX_LL_TEMAC_H | 4 | #define XILINX_LL_TEMAC_H |
diff --git a/drivers/net/ethernet/xilinx/ll_temac_mdio.c b/drivers/net/ethernet/xilinx/ll_temac_mdio.c index 7714aff78b7d..f5e83ac6f7e2 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_mdio.c +++ b/drivers/net/ethernet/xilinx/ll_temac_mdio.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * MDIO bus driver for the Xilinx TEMAC device | 3 | * MDIO bus driver for the Xilinx TEMAC device |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h b/drivers/net/ethernet/xilinx/xilinx_axienet.h index 5ef626331f85..c337400485da 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet.h +++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Definitions for Xilinx Axi Ethernet device driver. | 3 | * Definitions for Xilinx Axi Ethernet device driver. |
| 3 | * | 4 | * |
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c index 63307ea97846..16c3bfbe1992 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * MDIO bus driver for the Xilinx Axi Ethernet device | 3 | * MDIO bus driver for the Xilinx Axi Ethernet device |
| 3 | * | 4 | * |
diff --git a/drivers/net/fddi/skfp/Makefile b/drivers/net/fddi/skfp/Makefile index a957a1c7e5ba..875eac8a76f3 100644 --- a/drivers/net/fddi/skfp/Makefile +++ b/drivers/net/fddi/skfp/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the SysKonnect FDDI PCI adapter driver | 3 | # Makefile for the SysKonnect FDDI PCI adapter driver |
| 3 | # | 4 | # |
diff --git a/drivers/net/hamradio/Makefile b/drivers/net/hamradio/Makefile index 104096070026..7a1518d763e3 100644 --- a/drivers/net/hamradio/Makefile +++ b/drivers/net/hamradio/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux AX.25 and HFMODEM device drivers. | 3 | # Makefile for the Linux AX.25 and HFMODEM device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/hamradio/z8530.h b/drivers/net/hamradio/z8530.h index 8bef548572aa..1655901d713b 100644 --- a/drivers/net/hamradio/z8530.h +++ b/drivers/net/hamradio/z8530.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | /* 8530 Serial Communications Controller Register definitions */ | 3 | /* 8530 Serial Communications Controller Register definitions */ |
| 3 | #define FLAG 0x7e | 4 | #define FLAG 0x7e |
diff --git a/drivers/net/hippi/rrunner.h b/drivers/net/hippi/rrunner.h index 28169043ae49..87533784604f 100644 --- a/drivers/net/hippi/rrunner.h +++ b/drivers/net/hippi/rrunner.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _RRUNNER_H_ | 2 | #ifndef _RRUNNER_H_ |
| 2 | #define _RRUNNER_H_ | 3 | #define _RRUNNER_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/ieee802154/Makefile b/drivers/net/ieee802154/Makefile index 8374bb44a145..bea1de5e726c 100644 --- a/drivers/net/ieee802154/Makefile +++ b/drivers/net/ieee802154/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_IEEE802154_FAKELB) += fakelb.o | 2 | obj-$(CONFIG_IEEE802154_FAKELB) += fakelb.o |
| 2 | obj-$(CONFIG_IEEE802154_AT86RF230) += at86rf230.o | 3 | obj-$(CONFIG_IEEE802154_AT86RF230) += at86rf230.o |
| 3 | obj-$(CONFIG_IEEE802154_MRF24J40) += mrf24j40.o | 4 | obj-$(CONFIG_IEEE802154_MRF24J40) += mrf24j40.o |
diff --git a/drivers/net/ipvlan/ipvtap.c b/drivers/net/ipvlan/ipvtap.c index 5dea2063dbc8..0bcc07f346c3 100644 --- a/drivers/net/ipvlan/ipvtap.c +++ b/drivers/net/ipvlan/ipvtap.c | |||
| @@ -197,8 +197,8 @@ static int ipvtap_init(void) | |||
| 197 | { | 197 | { |
| 198 | int err; | 198 | int err; |
| 199 | 199 | ||
| 200 | err = tap_create_cdev(&ipvtap_cdev, &ipvtap_major, "ipvtap"); | 200 | err = tap_create_cdev(&ipvtap_cdev, &ipvtap_major, "ipvtap", |
| 201 | 201 | THIS_MODULE); | |
| 202 | if (err) | 202 | if (err) |
| 203 | goto out1; | 203 | goto out1; |
| 204 | 204 | ||
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index c2d0ea2fb019..cba5cb3b849a 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c | |||
| @@ -204,8 +204,8 @@ static int macvtap_init(void) | |||
| 204 | { | 204 | { |
| 205 | int err; | 205 | int err; |
| 206 | 206 | ||
| 207 | err = tap_create_cdev(&macvtap_cdev, &macvtap_major, "macvtap"); | 207 | err = tap_create_cdev(&macvtap_cdev, &macvtap_major, "macvtap", |
| 208 | 208 | THIS_MODULE); | |
| 209 | if (err) | 209 | if (err) |
| 210 | goto out1; | 210 | goto out1; |
| 211 | 211 | ||
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index 416df92fbf4f..00f097e18c68 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for Linux PHY drivers and MDIO bus drivers | 2 | # Makefile for Linux PHY drivers and MDIO bus drivers |
| 2 | 3 | ||
| 3 | libphy-y := phy.o phy-c45.o phy-core.o phy_device.o | 4 | libphy-y := phy.o phy-c45.o phy-core.o phy_device.o |
diff --git a/drivers/net/phy/dp83640_reg.h b/drivers/net/phy/dp83640_reg.h index e7fe41117003..21aa24c741b9 100644 --- a/drivers/net/phy/dp83640_reg.h +++ b/drivers/net/phy/dp83640_reg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* dp83640_reg.h | 2 | /* dp83640_reg.h |
| 2 | * Generated by regen.tcl on Thu Feb 17 10:02:48 AM CET 2011 | 3 | * Generated by regen.tcl on Thu Feb 17 10:02:48 AM CET 2011 |
| 3 | */ | 4 | */ |
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 15cbcdba618a..4d02b27df044 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c | |||
| @@ -681,9 +681,11 @@ static int m88e1116r_config_init(struct phy_device *phydev) | |||
| 681 | if (err < 0) | 681 | if (err < 0) |
| 682 | return err; | 682 | return err; |
| 683 | 683 | ||
| 684 | err = m88e1121_config_aneg_rgmii_delays(phydev); | 684 | if (phy_interface_is_rgmii(phydev)) { |
| 685 | if (err < 0) | 685 | err = m88e1121_config_aneg_rgmii_delays(phydev); |
| 686 | return err; | 686 | if (err < 0) |
| 687 | return err; | ||
| 688 | } | ||
| 687 | 689 | ||
| 688 | err = genphy_soft_reset(phydev); | 690 | err = genphy_soft_reset(phydev); |
| 689 | if (err < 0) | 691 | if (err < 0) |
diff --git a/drivers/net/phy/mdio-boardinfo.h b/drivers/net/phy/mdio-boardinfo.h index 3a7f143904e8..773bb51399be 100644 --- a/drivers/net/phy/mdio-boardinfo.h +++ b/drivers/net/phy/mdio-boardinfo.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * mdio-boardinfo.h - board info interface internal to the mdio_bus | 3 | * mdio-boardinfo.h - board info interface internal to the mdio_bus |
| 3 | * component | 4 | * component |
diff --git a/drivers/net/phy/swphy.h b/drivers/net/phy/swphy.h index 2f09ac324e18..3668ab8c901a 100644 --- a/drivers/net/phy/swphy.h +++ b/drivers/net/phy/swphy.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef SWPHY_H | 2 | #ifndef SWPHY_H |
| 2 | #define SWPHY_H | 3 | #define SWPHY_H |
| 3 | 4 | ||
diff --git a/drivers/net/ppp/Makefile b/drivers/net/ppp/Makefile index a6b6297b0066..16c457d6b324 100644 --- a/drivers/net/ppp/Makefile +++ b/drivers/net/ppp/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux PPP network device drivers. | 3 | # Makefile for the Linux PPP network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/ppp/ppp_mppe.h b/drivers/net/ppp/ppp_mppe.h index 7a14e058c668..677b3b3f7425 100644 --- a/drivers/net/ppp/ppp_mppe.h +++ b/drivers/net/ppp/ppp_mppe.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #define MPPE_PAD 4 /* MPPE growth per frame */ | 2 | #define MPPE_PAD 4 /* MPPE growth per frame */ |
| 2 | #define MPPE_MAX_KEY_LEN 16 /* largest key length (128-bit) */ | 3 | #define MPPE_MAX_KEY_LEN 16 /* largest key length (128-bit) */ |
| 3 | 4 | ||
diff --git a/drivers/net/slip/slip.h b/drivers/net/slip/slip.h index cf32aadf508f..c420e5948522 100644 --- a/drivers/net/slip/slip.h +++ b/drivers/net/slip/slip.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * slip.h Define the SLIP device driver interface and constants. | 3 | * slip.h Define the SLIP device driver interface and constants. |
| 3 | * | 4 | * |
diff --git a/drivers/net/tap.c b/drivers/net/tap.c index b55b29b90b88..b13890953ebb 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c | |||
| @@ -517,6 +517,10 @@ static int tap_open(struct inode *inode, struct file *file) | |||
| 517 | &tap_proto, 0); | 517 | &tap_proto, 0); |
| 518 | if (!q) | 518 | if (!q) |
| 519 | goto err; | 519 | goto err; |
| 520 | if (skb_array_init(&q->skb_array, tap->dev->tx_queue_len, GFP_KERNEL)) { | ||
| 521 | sk_free(&q->sk); | ||
| 522 | goto err; | ||
| 523 | } | ||
| 520 | 524 | ||
| 521 | RCU_INIT_POINTER(q->sock.wq, &q->wq); | 525 | RCU_INIT_POINTER(q->sock.wq, &q->wq); |
| 522 | init_waitqueue_head(&q->wq.wait); | 526 | init_waitqueue_head(&q->wq.wait); |
| @@ -540,22 +544,18 @@ static int tap_open(struct inode *inode, struct file *file) | |||
| 540 | if ((tap->dev->features & NETIF_F_HIGHDMA) && (tap->dev->features & NETIF_F_SG)) | 544 | if ((tap->dev->features & NETIF_F_HIGHDMA) && (tap->dev->features & NETIF_F_SG)) |
| 541 | sock_set_flag(&q->sk, SOCK_ZEROCOPY); | 545 | sock_set_flag(&q->sk, SOCK_ZEROCOPY); |
| 542 | 546 | ||
| 543 | err = -ENOMEM; | ||
| 544 | if (skb_array_init(&q->skb_array, tap->dev->tx_queue_len, GFP_KERNEL)) | ||
| 545 | goto err_array; | ||
| 546 | |||
| 547 | err = tap_set_queue(tap, file, q); | 547 | err = tap_set_queue(tap, file, q); |
| 548 | if (err) | 548 | if (err) { |
| 549 | goto err_queue; | 549 | /* tap_sock_destruct() will take care of freeing skb_array */ |
| 550 | goto err_put; | ||
| 551 | } | ||
| 550 | 552 | ||
| 551 | dev_put(tap->dev); | 553 | dev_put(tap->dev); |
| 552 | 554 | ||
| 553 | rtnl_unlock(); | 555 | rtnl_unlock(); |
| 554 | return err; | 556 | return err; |
| 555 | 557 | ||
| 556 | err_queue: | 558 | err_put: |
| 557 | skb_array_cleanup(&q->skb_array); | ||
| 558 | err_array: | ||
| 559 | sock_put(&q->sk); | 559 | sock_put(&q->sk); |
| 560 | err: | 560 | err: |
| 561 | if (tap) | 561 | if (tap) |
| @@ -1032,6 +1032,8 @@ static long tap_ioctl(struct file *file, unsigned int cmd, | |||
| 1032 | case TUNSETSNDBUF: | 1032 | case TUNSETSNDBUF: |
| 1033 | if (get_user(s, sp)) | 1033 | if (get_user(s, sp)) |
| 1034 | return -EFAULT; | 1034 | return -EFAULT; |
| 1035 | if (s <= 0) | ||
| 1036 | return -EINVAL; | ||
| 1035 | 1037 | ||
| 1036 | q->sk.sk_sndbuf = s; | 1038 | q->sk.sk_sndbuf = s; |
| 1037 | return 0; | 1039 | return 0; |
| @@ -1249,8 +1251,8 @@ static int tap_list_add(dev_t major, const char *device_name) | |||
| 1249 | return 0; | 1251 | return 0; |
| 1250 | } | 1252 | } |
| 1251 | 1253 | ||
| 1252 | int tap_create_cdev(struct cdev *tap_cdev, | 1254 | int tap_create_cdev(struct cdev *tap_cdev, dev_t *tap_major, |
| 1253 | dev_t *tap_major, const char *device_name) | 1255 | const char *device_name, struct module *module) |
| 1254 | { | 1256 | { |
| 1255 | int err; | 1257 | int err; |
| 1256 | 1258 | ||
| @@ -1259,6 +1261,7 @@ int tap_create_cdev(struct cdev *tap_cdev, | |||
| 1259 | goto out1; | 1261 | goto out1; |
| 1260 | 1262 | ||
| 1261 | cdev_init(tap_cdev, &tap_fops); | 1263 | cdev_init(tap_cdev, &tap_fops); |
| 1264 | tap_cdev->owner = module; | ||
| 1262 | err = cdev_add(tap_cdev, *tap_major, TAP_NUM_DEVS); | 1265 | err = cdev_add(tap_cdev, *tap_major, TAP_NUM_DEVS); |
| 1263 | if (err) | 1266 | if (err) |
| 1264 | goto out2; | 1267 | goto out2; |
diff --git a/drivers/net/team/Makefile b/drivers/net/team/Makefile index c57e85889751..f582d81a5091 100644 --- a/drivers/net/team/Makefile +++ b/drivers/net/team/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the network team driver | 3 | # Makefile for the network team driver |
| 3 | # | 4 | # |
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 27cd50c5bc9e..c1685a6d7883 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
| @@ -1286,6 +1286,7 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun, | |||
| 1286 | buflen += SKB_DATA_ALIGN(len + pad); | 1286 | buflen += SKB_DATA_ALIGN(len + pad); |
| 1287 | rcu_read_unlock(); | 1287 | rcu_read_unlock(); |
| 1288 | 1288 | ||
| 1289 | alloc_frag->offset = ALIGN((u64)alloc_frag->offset, SMP_CACHE_BYTES); | ||
| 1289 | if (unlikely(!skb_page_frag_refill(buflen, alloc_frag, GFP_KERNEL))) | 1290 | if (unlikely(!skb_page_frag_refill(buflen, alloc_frag, GFP_KERNEL))) |
| 1290 | return ERR_PTR(-ENOMEM); | 1291 | return ERR_PTR(-ENOMEM); |
| 1291 | 1292 | ||
| @@ -2028,7 +2029,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) | |||
| 2028 | if (!dev) | 2029 | if (!dev) |
| 2029 | return -ENOMEM; | 2030 | return -ENOMEM; |
| 2030 | err = dev_get_valid_name(net, dev, name); | 2031 | err = dev_get_valid_name(net, dev, name); |
| 2031 | if (err) | 2032 | if (err < 0) |
| 2032 | goto err_free_dev; | 2033 | goto err_free_dev; |
| 2033 | 2034 | ||
| 2034 | dev_net_set(dev, net); | 2035 | dev_net_set(dev, net); |
| @@ -2428,6 +2429,10 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, | |||
| 2428 | ret = -EFAULT; | 2429 | ret = -EFAULT; |
| 2429 | break; | 2430 | break; |
| 2430 | } | 2431 | } |
| 2432 | if (sndbuf <= 0) { | ||
| 2433 | ret = -EINVAL; | ||
| 2434 | break; | ||
| 2435 | } | ||
| 2431 | 2436 | ||
| 2432 | tun->sndbuf = sndbuf; | 2437 | tun->sndbuf = sndbuf; |
| 2433 | tun_set_sndbuf(tun); | 2438 | tun_set_sndbuf(tun); |
diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile index 37fb46aee341..27307a4ab003 100644 --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for USB Network drivers | 3 | # Makefile for USB Network drivers |
| 3 | # | 4 | # |
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 52ea80bcd639..3e7a3ac3a362 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c | |||
| @@ -561,6 +561,7 @@ static const struct driver_info wwan_info = { | |||
| 561 | #define HP_VENDOR_ID 0x03f0 | 561 | #define HP_VENDOR_ID 0x03f0 |
| 562 | #define MICROSOFT_VENDOR_ID 0x045e | 562 | #define MICROSOFT_VENDOR_ID 0x045e |
| 563 | #define UBLOX_VENDOR_ID 0x1546 | 563 | #define UBLOX_VENDOR_ID 0x1546 |
| 564 | #define TPLINK_VENDOR_ID 0x2357 | ||
| 564 | 565 | ||
| 565 | static const struct usb_device_id products[] = { | 566 | static const struct usb_device_id products[] = { |
| 566 | /* BLACKLIST !! | 567 | /* BLACKLIST !! |
| @@ -813,6 +814,13 @@ static const struct usb_device_id products[] = { | |||
| 813 | .driver_info = 0, | 814 | .driver_info = 0, |
| 814 | }, | 815 | }, |
| 815 | 816 | ||
| 817 | /* TP-LINK UE300 USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */ | ||
| 818 | { | ||
| 819 | USB_DEVICE_AND_INTERFACE_INFO(TPLINK_VENDOR_ID, 0x0601, USB_CLASS_COMM, | ||
| 820 | USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), | ||
| 821 | .driver_info = 0, | ||
| 822 | }, | ||
| 823 | |||
| 816 | /* WHITELIST!!! | 824 | /* WHITELIST!!! |
| 817 | * | 825 | * |
| 818 | * CDC Ether uses two interfaces, not necessarily consecutive. | 826 | * CDC Ether uses two interfaces, not necessarily consecutive. |
| @@ -864,6 +872,12 @@ static const struct usb_device_id products[] = { | |||
| 864 | USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), | 872 | USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), |
| 865 | .driver_info = (kernel_ulong_t)&wwan_info, | 873 | .driver_info = (kernel_ulong_t)&wwan_info, |
| 866 | }, { | 874 | }, { |
| 875 | /* Huawei ME906 and ME909 */ | ||
| 876 | USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x15c1, USB_CLASS_COMM, | ||
| 877 | USB_CDC_SUBCLASS_ETHERNET, | ||
| 878 | USB_CDC_PROTO_NONE), | ||
| 879 | .driver_info = (unsigned long)&wwan_info, | ||
| 880 | }, { | ||
| 867 | /* ZTE modules */ | 881 | /* ZTE modules */ |
| 868 | USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, USB_CLASS_COMM, | 882 | USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, USB_CLASS_COMM, |
| 869 | USB_CDC_SUBCLASS_ETHERNET, | 883 | USB_CDC_SUBCLASS_ETHERNET, |
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 941ece08ba78..d51d9abf7986 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c | |||
| @@ -615,6 +615,7 @@ enum rtl8152_flags { | |||
| 615 | #define VENDOR_ID_LENOVO 0x17ef | 615 | #define VENDOR_ID_LENOVO 0x17ef |
| 616 | #define VENDOR_ID_LINKSYS 0x13b1 | 616 | #define VENDOR_ID_LINKSYS 0x13b1 |
| 617 | #define VENDOR_ID_NVIDIA 0x0955 | 617 | #define VENDOR_ID_NVIDIA 0x0955 |
| 618 | #define VENDOR_ID_TPLINK 0x2357 | ||
| 618 | 619 | ||
| 619 | #define MCU_TYPE_PLA 0x0100 | 620 | #define MCU_TYPE_PLA 0x0100 |
| 620 | #define MCU_TYPE_USB 0x0000 | 621 | #define MCU_TYPE_USB 0x0000 |
| @@ -5319,6 +5320,7 @@ static const struct usb_device_id rtl8152_table[] = { | |||
| 5319 | {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x7214)}, | 5320 | {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x7214)}, |
| 5320 | {REALTEK_USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041)}, | 5321 | {REALTEK_USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041)}, |
| 5321 | {REALTEK_USB_DEVICE(VENDOR_ID_NVIDIA, 0x09ff)}, | 5322 | {REALTEK_USB_DEVICE(VENDOR_ID_NVIDIA, 0x09ff)}, |
| 5323 | {REALTEK_USB_DEVICE(VENDOR_ID_TPLINK, 0x0601)}, | ||
| 5322 | {} | 5324 | {} |
| 5323 | }; | 5325 | }; |
| 5324 | 5326 | ||
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 9b243e6f3008..7dc3bcac3506 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c | |||
| @@ -1165,7 +1165,7 @@ static int vrf_fib_rule(const struct net_device *dev, __u8 family, bool add_it) | |||
| 1165 | frh->family = family; | 1165 | frh->family = family; |
| 1166 | frh->action = FR_ACT_TO_TBL; | 1166 | frh->action = FR_ACT_TO_TBL; |
| 1167 | 1167 | ||
| 1168 | if (nla_put_u32(skb, FRA_L3MDEV, 1)) | 1168 | if (nla_put_u8(skb, FRA_L3MDEV, 1)) |
| 1169 | goto nla_put_failure; | 1169 | goto nla_put_failure; |
| 1170 | 1170 | ||
| 1171 | if (nla_put_u32(skb, FRA_PRIORITY, FIB_RULE_PREF)) | 1171 | if (nla_put_u32(skb, FRA_PRIORITY, FIB_RULE_PREF)) |
diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile index 73c2326603fc..9532e69fda87 100644 --- a/drivers/net/wan/Makefile +++ b/drivers/net/wan/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux network (wan) device drivers. | 3 | # Makefile for the Linux network (wan) device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/wan/hd64570.h b/drivers/net/wan/hd64570.h index 10963e8f4b39..24529996c872 100644 --- a/drivers/net/wan/hd64570.h +++ b/drivers/net/wan/hd64570.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __HD64570_H | 2 | #ifndef __HD64570_H |
| 2 | #define __HD64570_H | 3 | #define __HD64570_H |
| 3 | 4 | ||
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index 63f749078a1f..0e3f8ed84660 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c | |||
| @@ -346,7 +346,6 @@ out: | |||
| 346 | fail: | 346 | fail: |
| 347 | dev_put(dev); | 347 | dev_put(dev); |
| 348 | free_netdev(ndev); | 348 | free_netdev(ndev); |
| 349 | kfree(lapbeth); | ||
| 350 | goto out; | 349 | goto out; |
| 351 | } | 350 | } |
| 352 | 351 | ||
diff --git a/drivers/net/wan/lmc/lmc.h b/drivers/net/wan/lmc/lmc.h index 4ced7ac16c2c..38961793adad 100644 --- a/drivers/net/wan/lmc/lmc.h +++ b/drivers/net/wan/lmc/lmc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _LMC_H_ | 2 | #ifndef _LMC_H_ |
| 2 | #define _LMC_H_ | 3 | #define _LMC_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wan/lmc/lmc_debug.c b/drivers/net/wan/lmc/lmc_debug.c index 15049d711f47..f999db788506 100644 --- a/drivers/net/wan/lmc/lmc_debug.c +++ b/drivers/net/wan/lmc/lmc_debug.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/types.h> | 2 | #include <linux/types.h> |
| 2 | #include <linux/netdevice.h> | 3 | #include <linux/netdevice.h> |
| 3 | #include <linux/interrupt.h> | 4 | #include <linux/interrupt.h> |
diff --git a/drivers/net/wan/lmc/lmc_debug.h b/drivers/net/wan/lmc/lmc_debug.h index 2d46f121549f..820adcae5d67 100644 --- a/drivers/net/wan/lmc/lmc_debug.h +++ b/drivers/net/wan/lmc/lmc_debug.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _LMC_DEBUG_H_ | 2 | #ifndef _LMC_DEBUG_H_ |
| 2 | #define _LMC_DEBUG_H_ | 3 | #define _LMC_DEBUG_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wan/lmc/lmc_proto.h b/drivers/net/wan/lmc/lmc_proto.h index 662148c54644..bb098e443776 100644 --- a/drivers/net/wan/lmc/lmc_proto.h +++ b/drivers/net/wan/lmc/lmc_proto.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _LMC_PROTO_H_ | 2 | #ifndef _LMC_PROTO_H_ |
| 2 | #define _LMC_PROTO_H_ | 3 | #define _LMC_PROTO_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wan/x25_asy.h b/drivers/net/wan/x25_asy.h index f57ee67836ae..eb4a4216ee94 100644 --- a/drivers/net/wan/x25_asy.h +++ b/drivers/net/wan/x25_asy.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _LINUX_X25_ASY_H | 2 | #ifndef _LINUX_X25_ASY_H |
| 2 | #define _LINUX_X25_ASY_H | 3 | #define _LINUX_X25_ASY_H |
| 3 | 4 | ||
diff --git a/drivers/net/wan/z85230.h b/drivers/net/wan/z85230.h index 2416a9d60bd6..32ae710d4f40 100644 --- a/drivers/net/wan/z85230.h +++ b/drivers/net/wan/z85230.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Description of Z8530 Z85C30 and Z85230 communications chips | 3 | * Description of Z8530 Z85C30 and Z85230 communications chips |
| 3 | * | 4 | * |
diff --git a/drivers/net/wimax/i2400m/Makefile b/drivers/net/wimax/i2400m/Makefile index f6d19c348082..b1db1eff0648 100644 --- a/drivers/net/wimax/i2400m/Makefile +++ b/drivers/net/wimax/i2400m/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | obj-$(CONFIG_WIMAX_I2400M) += i2400m.o | 3 | obj-$(CONFIG_WIMAX_I2400M) += i2400m.o |
| 3 | obj-$(CONFIG_WIMAX_I2400M_USB) += i2400m-usb.o | 4 | obj-$(CONFIG_WIMAX_I2400M_USB) += i2400m-usb.o |
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 54b41ac5f9c8..7fc96306712a 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux Wireless network device drivers. | 3 | # Makefile for the Linux Wireless network device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/wireless/admtek/adm8211.h b/drivers/net/wireless/admtek/adm8211.h index bbc10b1cde87..2c55c629de28 100644 --- a/drivers/net/wireless/admtek/adm8211.h +++ b/drivers/net/wireless/admtek/adm8211.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ADM8211_H | 2 | #ifndef ADM8211_H |
| 2 | #define ADM8211_H | 3 | #define ADM8211_H |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/ath/Makefile b/drivers/net/wireless/ath/Makefile index 4cdebc7659dd..e4e460b5498e 100644 --- a/drivers/net/wireless/ath/Makefile +++ b/drivers/net/wireless/ath/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_ATH5K) += ath5k/ | 2 | obj-$(CONFIG_ATH5K) += ath5k/ |
| 2 | obj-$(CONFIG_ATH9K_HW) += ath9k/ | 3 | obj-$(CONFIG_ATH9K_HW) += ath9k/ |
| 3 | obj-$(CONFIG_CARL9170) += carl9170/ | 4 | obj-$(CONFIG_CARL9170) += carl9170/ |
diff --git a/drivers/net/wireless/ath/ath10k/Makefile b/drivers/net/wireless/ath/ath10k/Makefile index 899b9b79f4ce..9492177e9063 100644 --- a/drivers/net/wireless/ath/ath10k/Makefile +++ b/drivers/net/wireless/ath/ath10k/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_ATH10K) += ath10k_core.o | 2 | obj-$(CONFIG_ATH10K) += ath10k_core.o |
| 2 | ath10k_core-y += mac.o \ | 3 | ath10k_core-y += mac.o \ |
| 3 | debug.o \ | 4 | debug.o \ |
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index a3f5dc78353f..0aeeb233af78 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c | |||
| @@ -550,6 +550,11 @@ static int ath10k_htt_rx_crypto_param_len(struct ath10k *ar, | |||
| 550 | return IEEE80211_TKIP_IV_LEN; | 550 | return IEEE80211_TKIP_IV_LEN; |
| 551 | case HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2: | 551 | case HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2: |
| 552 | return IEEE80211_CCMP_HDR_LEN; | 552 | return IEEE80211_CCMP_HDR_LEN; |
| 553 | case HTT_RX_MPDU_ENCRYPT_AES_CCM256_WPA2: | ||
| 554 | return IEEE80211_CCMP_256_HDR_LEN; | ||
| 555 | case HTT_RX_MPDU_ENCRYPT_AES_GCMP_WPA2: | ||
| 556 | case HTT_RX_MPDU_ENCRYPT_AES_GCMP256_WPA2: | ||
| 557 | return IEEE80211_GCMP_HDR_LEN; | ||
| 553 | case HTT_RX_MPDU_ENCRYPT_WEP128: | 558 | case HTT_RX_MPDU_ENCRYPT_WEP128: |
| 554 | case HTT_RX_MPDU_ENCRYPT_WAPI: | 559 | case HTT_RX_MPDU_ENCRYPT_WAPI: |
| 555 | break; | 560 | break; |
| @@ -575,6 +580,11 @@ static int ath10k_htt_rx_crypto_tail_len(struct ath10k *ar, | |||
| 575 | return IEEE80211_TKIP_ICV_LEN; | 580 | return IEEE80211_TKIP_ICV_LEN; |
| 576 | case HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2: | 581 | case HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2: |
| 577 | return IEEE80211_CCMP_MIC_LEN; | 582 | return IEEE80211_CCMP_MIC_LEN; |
| 583 | case HTT_RX_MPDU_ENCRYPT_AES_CCM256_WPA2: | ||
| 584 | return IEEE80211_CCMP_256_MIC_LEN; | ||
| 585 | case HTT_RX_MPDU_ENCRYPT_AES_GCMP_WPA2: | ||
| 586 | case HTT_RX_MPDU_ENCRYPT_AES_GCMP256_WPA2: | ||
| 587 | return IEEE80211_GCMP_MIC_LEN; | ||
| 578 | case HTT_RX_MPDU_ENCRYPT_WEP128: | 588 | case HTT_RX_MPDU_ENCRYPT_WEP128: |
| 579 | case HTT_RX_MPDU_ENCRYPT_WAPI: | 589 | case HTT_RX_MPDU_ENCRYPT_WAPI: |
| 580 | break; | 590 | break; |
| @@ -1051,9 +1061,21 @@ static void ath10k_htt_rx_h_undecap_raw(struct ath10k *ar, | |||
| 1051 | hdr = (void *)msdu->data; | 1061 | hdr = (void *)msdu->data; |
| 1052 | 1062 | ||
| 1053 | /* Tail */ | 1063 | /* Tail */ |
| 1054 | if (status->flag & RX_FLAG_IV_STRIPPED) | 1064 | if (status->flag & RX_FLAG_IV_STRIPPED) { |
| 1055 | skb_trim(msdu, msdu->len - | 1065 | skb_trim(msdu, msdu->len - |
| 1056 | ath10k_htt_rx_crypto_tail_len(ar, enctype)); | 1066 | ath10k_htt_rx_crypto_tail_len(ar, enctype)); |
| 1067 | } else { | ||
| 1068 | /* MIC */ | ||
| 1069 | if ((status->flag & RX_FLAG_MIC_STRIPPED) && | ||
| 1070 | enctype == HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2) | ||
| 1071 | skb_trim(msdu, msdu->len - 8); | ||
| 1072 | |||
| 1073 | /* ICV */ | ||
| 1074 | if (status->flag & RX_FLAG_ICV_STRIPPED && | ||
| 1075 | enctype != HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2) | ||
| 1076 | skb_trim(msdu, msdu->len - | ||
| 1077 | ath10k_htt_rx_crypto_tail_len(ar, enctype)); | ||
| 1078 | } | ||
| 1057 | 1079 | ||
| 1058 | /* MMIC */ | 1080 | /* MMIC */ |
| 1059 | if ((status->flag & RX_FLAG_MMIC_STRIPPED) && | 1081 | if ((status->flag & RX_FLAG_MMIC_STRIPPED) && |
| @@ -1075,7 +1097,8 @@ static void ath10k_htt_rx_h_undecap_raw(struct ath10k *ar, | |||
| 1075 | static void ath10k_htt_rx_h_undecap_nwifi(struct ath10k *ar, | 1097 | static void ath10k_htt_rx_h_undecap_nwifi(struct ath10k *ar, |
| 1076 | struct sk_buff *msdu, | 1098 | struct sk_buff *msdu, |
| 1077 | struct ieee80211_rx_status *status, | 1099 | struct ieee80211_rx_status *status, |
| 1078 | const u8 first_hdr[64]) | 1100 | const u8 first_hdr[64], |
| 1101 | enum htt_rx_mpdu_encrypt_type enctype) | ||
| 1079 | { | 1102 | { |
| 1080 | struct ieee80211_hdr *hdr; | 1103 | struct ieee80211_hdr *hdr; |
| 1081 | struct htt_rx_desc *rxd; | 1104 | struct htt_rx_desc *rxd; |
| @@ -1083,6 +1106,7 @@ static void ath10k_htt_rx_h_undecap_nwifi(struct ath10k *ar, | |||
| 1083 | u8 da[ETH_ALEN]; | 1106 | u8 da[ETH_ALEN]; |
| 1084 | u8 sa[ETH_ALEN]; | 1107 | u8 sa[ETH_ALEN]; |
| 1085 | int l3_pad_bytes; | 1108 | int l3_pad_bytes; |
| 1109 | int bytes_aligned = ar->hw_params.decap_align_bytes; | ||
| 1086 | 1110 | ||
| 1087 | /* Delivered decapped frame: | 1111 | /* Delivered decapped frame: |
| 1088 | * [nwifi 802.11 header] <-- replaced with 802.11 hdr | 1112 | * [nwifi 802.11 header] <-- replaced with 802.11 hdr |
| @@ -1111,6 +1135,14 @@ static void ath10k_htt_rx_h_undecap_nwifi(struct ath10k *ar, | |||
| 1111 | /* push original 802.11 header */ | 1135 | /* push original 802.11 header */ |
| 1112 | hdr = (struct ieee80211_hdr *)first_hdr; | 1136 | hdr = (struct ieee80211_hdr *)first_hdr; |
| 1113 | hdr_len = ieee80211_hdrlen(hdr->frame_control); | 1137 | hdr_len = ieee80211_hdrlen(hdr->frame_control); |
| 1138 | |||
| 1139 | if (!(status->flag & RX_FLAG_IV_STRIPPED)) { | ||
| 1140 | memcpy(skb_push(msdu, | ||
| 1141 | ath10k_htt_rx_crypto_param_len(ar, enctype)), | ||
| 1142 | (void *)hdr + round_up(hdr_len, bytes_aligned), | ||
| 1143 | ath10k_htt_rx_crypto_param_len(ar, enctype)); | ||
| 1144 | } | ||
| 1145 | |||
| 1114 | memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); | 1146 | memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); |
| 1115 | 1147 | ||
| 1116 | /* original 802.11 header has a different DA and in | 1148 | /* original 802.11 header has a different DA and in |
| @@ -1171,6 +1203,7 @@ static void ath10k_htt_rx_h_undecap_eth(struct ath10k *ar, | |||
| 1171 | u8 sa[ETH_ALEN]; | 1203 | u8 sa[ETH_ALEN]; |
| 1172 | int l3_pad_bytes; | 1204 | int l3_pad_bytes; |
| 1173 | struct htt_rx_desc *rxd; | 1205 | struct htt_rx_desc *rxd; |
| 1206 | int bytes_aligned = ar->hw_params.decap_align_bytes; | ||
| 1174 | 1207 | ||
| 1175 | /* Delivered decapped frame: | 1208 | /* Delivered decapped frame: |
| 1176 | * [eth header] <-- replaced with 802.11 hdr & rfc1042/llc | 1209 | * [eth header] <-- replaced with 802.11 hdr & rfc1042/llc |
| @@ -1199,6 +1232,14 @@ static void ath10k_htt_rx_h_undecap_eth(struct ath10k *ar, | |||
| 1199 | /* push original 802.11 header */ | 1232 | /* push original 802.11 header */ |
| 1200 | hdr = (struct ieee80211_hdr *)first_hdr; | 1233 | hdr = (struct ieee80211_hdr *)first_hdr; |
| 1201 | hdr_len = ieee80211_hdrlen(hdr->frame_control); | 1234 | hdr_len = ieee80211_hdrlen(hdr->frame_control); |
| 1235 | |||
| 1236 | if (!(status->flag & RX_FLAG_IV_STRIPPED)) { | ||
| 1237 | memcpy(skb_push(msdu, | ||
| 1238 | ath10k_htt_rx_crypto_param_len(ar, enctype)), | ||
| 1239 | (void *)hdr + round_up(hdr_len, bytes_aligned), | ||
| 1240 | ath10k_htt_rx_crypto_param_len(ar, enctype)); | ||
| 1241 | } | ||
| 1242 | |||
| 1202 | memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); | 1243 | memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); |
| 1203 | 1244 | ||
| 1204 | /* original 802.11 header has a different DA and in | 1245 | /* original 802.11 header has a different DA and in |
| @@ -1212,12 +1253,14 @@ static void ath10k_htt_rx_h_undecap_eth(struct ath10k *ar, | |||
| 1212 | static void ath10k_htt_rx_h_undecap_snap(struct ath10k *ar, | 1253 | static void ath10k_htt_rx_h_undecap_snap(struct ath10k *ar, |
| 1213 | struct sk_buff *msdu, | 1254 | struct sk_buff *msdu, |
| 1214 | struct ieee80211_rx_status *status, | 1255 | struct ieee80211_rx_status *status, |
| 1215 | const u8 first_hdr[64]) | 1256 | const u8 first_hdr[64], |
| 1257 | enum htt_rx_mpdu_encrypt_type enctype) | ||
| 1216 | { | 1258 | { |
| 1217 | struct ieee80211_hdr *hdr; | 1259 | struct ieee80211_hdr *hdr; |
| 1218 | size_t hdr_len; | 1260 | size_t hdr_len; |
| 1219 | int l3_pad_bytes; | 1261 | int l3_pad_bytes; |
| 1220 | struct htt_rx_desc *rxd; | 1262 | struct htt_rx_desc *rxd; |
| 1263 | int bytes_aligned = ar->hw_params.decap_align_bytes; | ||
| 1221 | 1264 | ||
| 1222 | /* Delivered decapped frame: | 1265 | /* Delivered decapped frame: |
| 1223 | * [amsdu header] <-- replaced with 802.11 hdr | 1266 | * [amsdu header] <-- replaced with 802.11 hdr |
| @@ -1233,6 +1276,14 @@ static void ath10k_htt_rx_h_undecap_snap(struct ath10k *ar, | |||
| 1233 | 1276 | ||
| 1234 | hdr = (struct ieee80211_hdr *)first_hdr; | 1277 | hdr = (struct ieee80211_hdr *)first_hdr; |
| 1235 | hdr_len = ieee80211_hdrlen(hdr->frame_control); | 1278 | hdr_len = ieee80211_hdrlen(hdr->frame_control); |
| 1279 | |||
| 1280 | if (!(status->flag & RX_FLAG_IV_STRIPPED)) { | ||
| 1281 | memcpy(skb_push(msdu, | ||
| 1282 | ath10k_htt_rx_crypto_param_len(ar, enctype)), | ||
| 1283 | (void *)hdr + round_up(hdr_len, bytes_aligned), | ||
| 1284 | ath10k_htt_rx_crypto_param_len(ar, enctype)); | ||
| 1285 | } | ||
| 1286 | |||
| 1236 | memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); | 1287 | memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); |
| 1237 | } | 1288 | } |
| 1238 | 1289 | ||
| @@ -1267,13 +1318,15 @@ static void ath10k_htt_rx_h_undecap(struct ath10k *ar, | |||
| 1267 | is_decrypted); | 1318 | is_decrypted); |
| 1268 | break; | 1319 | break; |
| 1269 | case RX_MSDU_DECAP_NATIVE_WIFI: | 1320 | case RX_MSDU_DECAP_NATIVE_WIFI: |
| 1270 | ath10k_htt_rx_h_undecap_nwifi(ar, msdu, status, first_hdr); | 1321 | ath10k_htt_rx_h_undecap_nwifi(ar, msdu, status, first_hdr, |
| 1322 | enctype); | ||
| 1271 | break; | 1323 | break; |
| 1272 | case RX_MSDU_DECAP_ETHERNET2_DIX: | 1324 | case RX_MSDU_DECAP_ETHERNET2_DIX: |
| 1273 | ath10k_htt_rx_h_undecap_eth(ar, msdu, status, first_hdr, enctype); | 1325 | ath10k_htt_rx_h_undecap_eth(ar, msdu, status, first_hdr, enctype); |
| 1274 | break; | 1326 | break; |
| 1275 | case RX_MSDU_DECAP_8023_SNAP_LLC: | 1327 | case RX_MSDU_DECAP_8023_SNAP_LLC: |
| 1276 | ath10k_htt_rx_h_undecap_snap(ar, msdu, status, first_hdr); | 1328 | ath10k_htt_rx_h_undecap_snap(ar, msdu, status, first_hdr, |
| 1329 | enctype); | ||
| 1277 | break; | 1330 | break; |
| 1278 | } | 1331 | } |
| 1279 | } | 1332 | } |
| @@ -1316,7 +1369,8 @@ static void ath10k_htt_rx_h_csum_offload(struct sk_buff *msdu) | |||
| 1316 | 1369 | ||
| 1317 | static void ath10k_htt_rx_h_mpdu(struct ath10k *ar, | 1370 | static void ath10k_htt_rx_h_mpdu(struct ath10k *ar, |
| 1318 | struct sk_buff_head *amsdu, | 1371 | struct sk_buff_head *amsdu, |
| 1319 | struct ieee80211_rx_status *status) | 1372 | struct ieee80211_rx_status *status, |
| 1373 | bool fill_crypt_header) | ||
| 1320 | { | 1374 | { |
| 1321 | struct sk_buff *first; | 1375 | struct sk_buff *first; |
| 1322 | struct sk_buff *last; | 1376 | struct sk_buff *last; |
| @@ -1326,7 +1380,6 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar, | |||
| 1326 | enum htt_rx_mpdu_encrypt_type enctype; | 1380 | enum htt_rx_mpdu_encrypt_type enctype; |
| 1327 | u8 first_hdr[64]; | 1381 | u8 first_hdr[64]; |
| 1328 | u8 *qos; | 1382 | u8 *qos; |
| 1329 | size_t hdr_len; | ||
| 1330 | bool has_fcs_err; | 1383 | bool has_fcs_err; |
| 1331 | bool has_crypto_err; | 1384 | bool has_crypto_err; |
| 1332 | bool has_tkip_err; | 1385 | bool has_tkip_err; |
| @@ -1351,15 +1404,17 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar, | |||
| 1351 | * decapped header. It'll be used for undecapping of each MSDU. | 1404 | * decapped header. It'll be used for undecapping of each MSDU. |
| 1352 | */ | 1405 | */ |
| 1353 | hdr = (void *)rxd->rx_hdr_status; | 1406 | hdr = (void *)rxd->rx_hdr_status; |
| 1354 | hdr_len = ieee80211_hdrlen(hdr->frame_control); | 1407 | memcpy(first_hdr, hdr, RX_HTT_HDR_STATUS_LEN); |
| 1355 | memcpy(first_hdr, hdr, hdr_len); | ||
| 1356 | 1408 | ||
| 1357 | /* Each A-MSDU subframe will use the original header as the base and be | 1409 | /* Each A-MSDU subframe will use the original header as the base and be |
| 1358 | * reported as a separate MSDU so strip the A-MSDU bit from QoS Ctl. | 1410 | * reported as a separate MSDU so strip the A-MSDU bit from QoS Ctl. |
| 1359 | */ | 1411 | */ |
| 1360 | hdr = (void *)first_hdr; | 1412 | hdr = (void *)first_hdr; |
| 1361 | qos = ieee80211_get_qos_ctl(hdr); | 1413 | |
| 1362 | qos[0] &= ~IEEE80211_QOS_CTL_A_MSDU_PRESENT; | 1414 | if (ieee80211_is_data_qos(hdr->frame_control)) { |
| 1415 | qos = ieee80211_get_qos_ctl(hdr); | ||
| 1416 | qos[0] &= ~IEEE80211_QOS_CTL_A_MSDU_PRESENT; | ||
| 1417 | } | ||
| 1363 | 1418 | ||
| 1364 | /* Some attention flags are valid only in the last MSDU. */ | 1419 | /* Some attention flags are valid only in the last MSDU. */ |
| 1365 | last = skb_peek_tail(amsdu); | 1420 | last = skb_peek_tail(amsdu); |
| @@ -1406,9 +1461,14 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar, | |||
| 1406 | status->flag |= RX_FLAG_DECRYPTED; | 1461 | status->flag |= RX_FLAG_DECRYPTED; |
| 1407 | 1462 | ||
| 1408 | if (likely(!is_mgmt)) | 1463 | if (likely(!is_mgmt)) |
| 1409 | status->flag |= RX_FLAG_IV_STRIPPED | | 1464 | status->flag |= RX_FLAG_MMIC_STRIPPED; |
| 1410 | RX_FLAG_MMIC_STRIPPED; | 1465 | |
| 1411 | } | 1466 | if (fill_crypt_header) |
| 1467 | status->flag |= RX_FLAG_MIC_STRIPPED | | ||
| 1468 | RX_FLAG_ICV_STRIPPED; | ||
| 1469 | else | ||
| 1470 | status->flag |= RX_FLAG_IV_STRIPPED; | ||
| 1471 | } | ||
| 1412 | 1472 | ||
| 1413 | skb_queue_walk(amsdu, msdu) { | 1473 | skb_queue_walk(amsdu, msdu) { |
| 1414 | ath10k_htt_rx_h_csum_offload(msdu); | 1474 | ath10k_htt_rx_h_csum_offload(msdu); |
| @@ -1424,6 +1484,9 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar, | |||
| 1424 | if (is_mgmt) | 1484 | if (is_mgmt) |
| 1425 | continue; | 1485 | continue; |
| 1426 | 1486 | ||
| 1487 | if (fill_crypt_header) | ||
| 1488 | continue; | ||
| 1489 | |||
| 1427 | hdr = (void *)msdu->data; | 1490 | hdr = (void *)msdu->data; |
| 1428 | hdr->frame_control &= ~__cpu_to_le16(IEEE80211_FCTL_PROTECTED); | 1491 | hdr->frame_control &= ~__cpu_to_le16(IEEE80211_FCTL_PROTECTED); |
| 1429 | } | 1492 | } |
| @@ -1434,6 +1497,9 @@ static void ath10k_htt_rx_h_deliver(struct ath10k *ar, | |||
| 1434 | struct ieee80211_rx_status *status) | 1497 | struct ieee80211_rx_status *status) |
| 1435 | { | 1498 | { |
| 1436 | struct sk_buff *msdu; | 1499 | struct sk_buff *msdu; |
| 1500 | struct sk_buff *first_subframe; | ||
| 1501 | |||
| 1502 | first_subframe = skb_peek(amsdu); | ||
| 1437 | 1503 | ||
| 1438 | while ((msdu = __skb_dequeue(amsdu))) { | 1504 | while ((msdu = __skb_dequeue(amsdu))) { |
| 1439 | /* Setup per-MSDU flags */ | 1505 | /* Setup per-MSDU flags */ |
| @@ -1442,6 +1508,13 @@ static void ath10k_htt_rx_h_deliver(struct ath10k *ar, | |||
| 1442 | else | 1508 | else |
| 1443 | status->flag |= RX_FLAG_AMSDU_MORE; | 1509 | status->flag |= RX_FLAG_AMSDU_MORE; |
| 1444 | 1510 | ||
| 1511 | if (msdu == first_subframe) { | ||
| 1512 | first_subframe = NULL; | ||
| 1513 | status->flag &= ~RX_FLAG_ALLOW_SAME_PN; | ||
| 1514 | } else { | ||
| 1515 | status->flag |= RX_FLAG_ALLOW_SAME_PN; | ||
| 1516 | } | ||
| 1517 | |||
| 1445 | ath10k_process_rx(ar, status, msdu); | 1518 | ath10k_process_rx(ar, status, msdu); |
| 1446 | } | 1519 | } |
| 1447 | } | 1520 | } |
| @@ -1584,7 +1657,7 @@ static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt) | |||
| 1584 | ath10k_htt_rx_h_unchain(ar, &amsdu); | 1657 | ath10k_htt_rx_h_unchain(ar, &amsdu); |
| 1585 | 1658 | ||
| 1586 | ath10k_htt_rx_h_filter(ar, &amsdu, rx_status); | 1659 | ath10k_htt_rx_h_filter(ar, &amsdu, rx_status); |
| 1587 | ath10k_htt_rx_h_mpdu(ar, &amsdu, rx_status); | 1660 | ath10k_htt_rx_h_mpdu(ar, &amsdu, rx_status, true); |
| 1588 | ath10k_htt_rx_h_deliver(ar, &amsdu, rx_status); | 1661 | ath10k_htt_rx_h_deliver(ar, &amsdu, rx_status); |
| 1589 | 1662 | ||
| 1590 | return num_msdus; | 1663 | return num_msdus; |
| @@ -1745,8 +1818,7 @@ static void ath10k_htt_rx_delba(struct ath10k *ar, struct htt_resp *resp) | |||
| 1745 | } | 1818 | } |
| 1746 | 1819 | ||
| 1747 | static int ath10k_htt_rx_extract_amsdu(struct sk_buff_head *list, | 1820 | static int ath10k_htt_rx_extract_amsdu(struct sk_buff_head *list, |
| 1748 | struct sk_buff_head *amsdu, | 1821 | struct sk_buff_head *amsdu) |
| 1749 | int budget_left) | ||
| 1750 | { | 1822 | { |
| 1751 | struct sk_buff *msdu; | 1823 | struct sk_buff *msdu; |
| 1752 | struct htt_rx_desc *rxd; | 1824 | struct htt_rx_desc *rxd; |
| @@ -1757,9 +1829,8 @@ static int ath10k_htt_rx_extract_amsdu(struct sk_buff_head *list, | |||
| 1757 | if (WARN_ON(!skb_queue_empty(amsdu))) | 1829 | if (WARN_ON(!skb_queue_empty(amsdu))) |
| 1758 | return -EINVAL; | 1830 | return -EINVAL; |
| 1759 | 1831 | ||
| 1760 | while ((msdu = __skb_dequeue(list)) && budget_left) { | 1832 | while ((msdu = __skb_dequeue(list))) { |
| 1761 | __skb_queue_tail(amsdu, msdu); | 1833 | __skb_queue_tail(amsdu, msdu); |
| 1762 | budget_left--; | ||
| 1763 | 1834 | ||
| 1764 | rxd = (void *)msdu->data - sizeof(*rxd); | 1835 | rxd = (void *)msdu->data - sizeof(*rxd); |
| 1765 | if (rxd->msdu_end.common.info0 & | 1836 | if (rxd->msdu_end.common.info0 & |
| @@ -1850,8 +1921,7 @@ static int ath10k_htt_rx_h_rx_offload(struct ath10k *ar, | |||
| 1850 | return num_msdu; | 1921 | return num_msdu; |
| 1851 | } | 1922 | } |
| 1852 | 1923 | ||
| 1853 | static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb, | 1924 | static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb) |
| 1854 | int budget_left) | ||
| 1855 | { | 1925 | { |
| 1856 | struct ath10k_htt *htt = &ar->htt; | 1926 | struct ath10k_htt *htt = &ar->htt; |
| 1857 | struct htt_resp *resp = (void *)skb->data; | 1927 | struct htt_resp *resp = (void *)skb->data; |
| @@ -1908,9 +1978,9 @@ static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb, | |||
| 1908 | if (offload) | 1978 | if (offload) |
| 1909 | num_msdus = ath10k_htt_rx_h_rx_offload(ar, &list); | 1979 | num_msdus = ath10k_htt_rx_h_rx_offload(ar, &list); |
| 1910 | 1980 | ||
| 1911 | while (!skb_queue_empty(&list) && budget_left) { | 1981 | while (!skb_queue_empty(&list)) { |
| 1912 | __skb_queue_head_init(&amsdu); | 1982 | __skb_queue_head_init(&amsdu); |
| 1913 | ret = ath10k_htt_rx_extract_amsdu(&list, &amsdu, budget_left); | 1983 | ret = ath10k_htt_rx_extract_amsdu(&list, &amsdu); |
| 1914 | switch (ret) { | 1984 | switch (ret) { |
| 1915 | case 0: | 1985 | case 0: |
| 1916 | /* Note: The in-order indication may report interleaved | 1986 | /* Note: The in-order indication may report interleaved |
| @@ -1920,10 +1990,9 @@ static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb, | |||
| 1920 | * should still give an idea about rx rate to the user. | 1990 | * should still give an idea about rx rate to the user. |
| 1921 | */ | 1991 | */ |
| 1922 | num_msdus += skb_queue_len(&amsdu); | 1992 | num_msdus += skb_queue_len(&amsdu); |
| 1923 | budget_left -= skb_queue_len(&amsdu); | ||
| 1924 | ath10k_htt_rx_h_ppdu(ar, &amsdu, status, vdev_id); | 1993 | ath10k_htt_rx_h_ppdu(ar, &amsdu, status, vdev_id); |
| 1925 | ath10k_htt_rx_h_filter(ar, &amsdu, status); | 1994 | ath10k_htt_rx_h_filter(ar, &amsdu, status); |
| 1926 | ath10k_htt_rx_h_mpdu(ar, &amsdu, status); | 1995 | ath10k_htt_rx_h_mpdu(ar, &amsdu, status, false); |
| 1927 | ath10k_htt_rx_h_deliver(ar, &amsdu, status); | 1996 | ath10k_htt_rx_h_deliver(ar, &amsdu, status); |
| 1928 | break; | 1997 | break; |
| 1929 | case -EAGAIN: | 1998 | case -EAGAIN: |
| @@ -2563,8 +2632,7 @@ int ath10k_htt_txrx_compl_task(struct ath10k *ar, int budget) | |||
| 2563 | } | 2632 | } |
| 2564 | 2633 | ||
| 2565 | spin_lock_bh(&htt->rx_ring.lock); | 2634 | spin_lock_bh(&htt->rx_ring.lock); |
| 2566 | num_rx_msdus = ath10k_htt_rx_in_ord_ind(ar, skb, | 2635 | num_rx_msdus = ath10k_htt_rx_in_ord_ind(ar, skb); |
| 2567 | (budget - quota)); | ||
| 2568 | spin_unlock_bh(&htt->rx_ring.lock); | 2636 | spin_unlock_bh(&htt->rx_ring.lock); |
| 2569 | if (num_rx_msdus < 0) { | 2637 | if (num_rx_msdus < 0) { |
| 2570 | resched_napi = true; | 2638 | resched_napi = true; |
diff --git a/drivers/net/wireless/ath/ath10k/rx_desc.h b/drivers/net/wireless/ath/ath10k/rx_desc.h index c1022a1cf855..28da14398951 100644 --- a/drivers/net/wireless/ath/ath10k/rx_desc.h +++ b/drivers/net/wireless/ath/ath10k/rx_desc.h | |||
| @@ -239,6 +239,9 @@ enum htt_rx_mpdu_encrypt_type { | |||
| 239 | HTT_RX_MPDU_ENCRYPT_WAPI = 5, | 239 | HTT_RX_MPDU_ENCRYPT_WAPI = 5, |
| 240 | HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2 = 6, | 240 | HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2 = 6, |
| 241 | HTT_RX_MPDU_ENCRYPT_NONE = 7, | 241 | HTT_RX_MPDU_ENCRYPT_NONE = 7, |
| 242 | HTT_RX_MPDU_ENCRYPT_AES_CCM256_WPA2 = 8, | ||
| 243 | HTT_RX_MPDU_ENCRYPT_AES_GCMP_WPA2 = 9, | ||
| 244 | HTT_RX_MPDU_ENCRYPT_AES_GCMP256_WPA2 = 10, | ||
| 242 | }; | 245 | }; |
| 243 | 246 | ||
| 244 | #define RX_MPDU_START_INFO0_PEER_IDX_MASK 0x000007ff | 247 | #define RX_MPDU_START_INFO0_PEER_IDX_MASK 0x000007ff |
diff --git a/drivers/net/wireless/ath/ath5k/Makefile b/drivers/net/wireless/ath/ath5k/Makefile index 1b3a34f7f224..a8724eee21f8 100644 --- a/drivers/net/wireless/ath/ath5k/Makefile +++ b/drivers/net/wireless/ath/ath5k/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ath5k-y += caps.o | 2 | ath5k-y += caps.o |
| 2 | ath5k-y += initvals.o | 3 | ath5k-y += initvals.o |
| 3 | ath5k-y += eeprom.o | 4 | ath5k-y += eeprom.o |
diff --git a/drivers/net/wireless/ath/ath5k/sysfs.c b/drivers/net/wireless/ath/ath5k/sysfs.c index 04cf0ca72610..25978c732fe1 100644 --- a/drivers/net/wireless/ath/ath5k/sysfs.c +++ b/drivers/net/wireless/ath/ath5k/sysfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | 2 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 2 | 3 | ||
| 3 | #include <linux/device.h> | 4 | #include <linux/device.h> |
diff --git a/drivers/net/wireless/ath/ath5k/trace.h b/drivers/net/wireless/ath/ath5k/trace.h index c6eef519bb61..a41e3bf42dfc 100644 --- a/drivers/net/wireless/ath/ath5k/trace.h +++ b/drivers/net/wireless/ath/ath5k/trace.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #if !defined(__TRACE_ATH5K_H) || defined(TRACE_HEADER_MULTI_READ) | 2 | #if !defined(__TRACE_ATH5K_H) || defined(TRACE_HEADER_MULTI_READ) |
| 2 | #define __TRACE_ATH5K_H | 3 | #define __TRACE_ATH5K_H |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/ath/ath6kl/trace.h b/drivers/net/wireless/ath/ath6kl/trace.h index 1a1ea7881b4d..91e735cfdef7 100644 --- a/drivers/net/wireless/ath/ath6kl/trace.h +++ b/drivers/net/wireless/ath/ath6kl/trace.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #if !defined(_ATH6KL_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) | 2 | #if !defined(_ATH6KL_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) |
| 2 | 3 | ||
| 3 | #include <net/cfg80211.h> | 4 | #include <net/cfg80211.h> |
diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile index 36a40ffdce15..d804ce7391a0 100644 --- a/drivers/net/wireless/ath/ath9k/Makefile +++ b/drivers/net/wireless/ath/ath9k/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ath9k-y += beacon.o \ | 2 | ath9k-y += beacon.o \ |
| 2 | gpio.o \ | 3 | gpio.o \ |
| 3 | init.o \ | 4 | init.o \ |
diff --git a/drivers/net/wireless/ath/carl9170/version.h b/drivers/net/wireless/ath/carl9170/version.h index a0410fe8c03a..9a44d004c206 100644 --- a/drivers/net/wireless/ath/carl9170/version.h +++ b/drivers/net/wireless/ath/carl9170/version.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __CARL9170_SHARED_VERSION_H | 2 | #ifndef __CARL9170_SHARED_VERSION_H |
| 2 | #define __CARL9170_SHARED_VERSION_H | 3 | #define __CARL9170_SHARED_VERSION_H |
| 3 | #define CARL9170FW_VERSION_YEAR 16 | 4 | #define CARL9170FW_VERSION_YEAR 16 |
diff --git a/drivers/net/wireless/ath/wcn36xx/Makefile b/drivers/net/wireless/ath/wcn36xx/Makefile index 50c43b4382ba..3b09435104eb 100644 --- a/drivers/net/wireless/ath/wcn36xx/Makefile +++ b/drivers/net/wireless/ath/wcn36xx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_WCN36XX) := wcn36xx.o | 2 | obj-$(CONFIG_WCN36XX) := wcn36xx.o |
| 2 | wcn36xx-y += main.o \ | 3 | wcn36xx-y += main.o \ |
| 3 | dxe.o \ | 4 | dxe.o \ |
diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c index 35bd50bcbbd5..b83f01d6e3dd 100644 --- a/drivers/net/wireless/ath/wcn36xx/main.c +++ b/drivers/net/wireless/ath/wcn36xx/main.c | |||
| @@ -812,7 +812,6 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw, | |||
| 812 | if (!sta) { | 812 | if (!sta) { |
| 813 | wcn36xx_err("sta %pM is not found\n", | 813 | wcn36xx_err("sta %pM is not found\n", |
| 814 | bss_conf->bssid); | 814 | bss_conf->bssid); |
| 815 | rcu_read_unlock(); | ||
| 816 | goto out; | 815 | goto out; |
| 817 | } | 816 | } |
| 818 | sta_priv = wcn36xx_sta_to_priv(sta); | 817 | sta_priv = wcn36xx_sta_to_priv(sta); |
diff --git a/drivers/net/wireless/ath/wil6210/Makefile b/drivers/net/wireless/ath/wil6210/Makefile index d27efe83748b..398edd2a7f2b 100644 --- a/drivers/net/wireless/ath/wil6210/Makefile +++ b/drivers/net/wireless/ath/wil6210/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_WIL6210) += wil6210.o | 2 | obj-$(CONFIG_WIL6210) += wil6210.o |
| 2 | 3 | ||
| 3 | wil6210-y := main.o | 4 | wil6210-y := main.o |
diff --git a/drivers/net/wireless/broadcom/b43/Makefile b/drivers/net/wireless/broadcom/b43/Makefile index 27fab958e3d5..54f92ce49bb8 100644 --- a/drivers/net/wireless/broadcom/b43/Makefile +++ b/drivers/net/wireless/broadcom/b43/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | b43-y += main.o | 2 | b43-y += main.o |
| 2 | b43-y += bus.o | 3 | b43-y += bus.o |
| 3 | b43-$(CONFIG_B43_PHY_G) += phy_g.o tables.o lo.o wa.o | 4 | b43-$(CONFIG_B43_PHY_G) += phy_g.o tables.o lo.o wa.o |
diff --git a/drivers/net/wireless/broadcom/b43/b43.h b/drivers/net/wireless/broadcom/b43/b43.h index d7d42f0b80c3..b77d1a904f7e 100644 --- a/drivers/net/wireless/broadcom/b43/b43.h +++ b/drivers/net/wireless/broadcom/b43/b43.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_H_ | 2 | #ifndef B43_H_ |
| 2 | #define B43_H_ | 3 | #define B43_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/bus.h b/drivers/net/wireless/broadcom/b43/bus.h index 256c2c17939a..2a695f9e528b 100644 --- a/drivers/net/wireless/broadcom/b43/bus.h +++ b/drivers/net/wireless/broadcom/b43/bus.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_BUS_H_ | 2 | #ifndef B43_BUS_H_ |
| 2 | #define B43_BUS_H_ | 3 | #define B43_BUS_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/debugfs.h b/drivers/net/wireless/broadcom/b43/debugfs.h index d05377745011..0bf437c86c67 100644 --- a/drivers/net/wireless/broadcom/b43/debugfs.h +++ b/drivers/net/wireless/broadcom/b43/debugfs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_DEBUGFS_H_ | 2 | #ifndef B43_DEBUGFS_H_ |
| 2 | #define B43_DEBUGFS_H_ | 3 | #define B43_DEBUGFS_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/dma.h b/drivers/net/wireless/broadcom/b43/dma.h index df8c8cdcbdb5..c2a357219d4b 100644 --- a/drivers/net/wireless/broadcom/b43/dma.h +++ b/drivers/net/wireless/broadcom/b43/dma.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_DMA_H_ | 2 | #ifndef B43_DMA_H_ |
| 2 | #define B43_DMA_H_ | 3 | #define B43_DMA_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/leds.h b/drivers/net/wireless/broadcom/b43/leds.h index 32b66d53cdac..5ebd1b2b1749 100644 --- a/drivers/net/wireless/broadcom/b43/leds.h +++ b/drivers/net/wireless/broadcom/b43/leds.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_LEDS_H_ | 2 | #ifndef B43_LEDS_H_ |
| 2 | #define B43_LEDS_H_ | 3 | #define B43_LEDS_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/lo.h b/drivers/net/wireless/broadcom/b43/lo.h index 7b4df3883bc2..66e07ab79c51 100644 --- a/drivers/net/wireless/broadcom/b43/lo.h +++ b/drivers/net/wireless/broadcom/b43/lo.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_LO_H_ | 2 | #ifndef B43_LO_H_ |
| 2 | #define B43_LO_H_ | 3 | #define B43_LO_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/phy_a.h b/drivers/net/wireless/broadcom/b43/phy_a.h index 0a92d01c21f9..b1cbfc02beb6 100644 --- a/drivers/net/wireless/broadcom/b43/phy_a.h +++ b/drivers/net/wireless/broadcom/b43/phy_a.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef LINUX_B43_PHY_A_H_ | 2 | #ifndef LINUX_B43_PHY_A_H_ |
| 2 | #define LINUX_B43_PHY_A_H_ | 3 | #define LINUX_B43_PHY_A_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/phy_ac.h b/drivers/net/wireless/broadcom/b43/phy_ac.h index d1ca79e0eb24..02eb6c08670d 100644 --- a/drivers/net/wireless/broadcom/b43/phy_ac.h +++ b/drivers/net/wireless/broadcom/b43/phy_ac.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_PHY_AC_H_ | 2 | #ifndef B43_PHY_AC_H_ |
| 2 | #define B43_PHY_AC_H_ | 3 | #define B43_PHY_AC_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/phy_common.h b/drivers/net/wireless/broadcom/b43/phy_common.h index ced054a9850c..57a1ad8afa08 100644 --- a/drivers/net/wireless/broadcom/b43/phy_common.h +++ b/drivers/net/wireless/broadcom/b43/phy_common.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef LINUX_B43_PHY_COMMON_H_ | 2 | #ifndef LINUX_B43_PHY_COMMON_H_ |
| 2 | #define LINUX_B43_PHY_COMMON_H_ | 3 | #define LINUX_B43_PHY_COMMON_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/phy_g.h b/drivers/net/wireless/broadcom/b43/phy_g.h index 5413c906a3e7..a27b8603c75f 100644 --- a/drivers/net/wireless/broadcom/b43/phy_g.h +++ b/drivers/net/wireless/broadcom/b43/phy_g.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef LINUX_B43_PHY_G_H_ | 2 | #ifndef LINUX_B43_PHY_G_H_ |
| 2 | #define LINUX_B43_PHY_G_H_ | 3 | #define LINUX_B43_PHY_G_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/phy_ht.h b/drivers/net/wireless/broadcom/b43/phy_ht.h index c086f56ce478..046753857493 100644 --- a/drivers/net/wireless/broadcom/b43/phy_ht.h +++ b/drivers/net/wireless/broadcom/b43/phy_ht.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_PHY_HT_H_ | 2 | #ifndef B43_PHY_HT_H_ |
| 2 | #define B43_PHY_HT_H_ | 3 | #define B43_PHY_HT_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/phy_lcn.h b/drivers/net/wireless/broadcom/b43/phy_lcn.h index 6a7092e13fff..0b1cfaf6394c 100644 --- a/drivers/net/wireless/broadcom/b43/phy_lcn.h +++ b/drivers/net/wireless/broadcom/b43/phy_lcn.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_PHY_LCN_H_ | 2 | #ifndef B43_PHY_LCN_H_ |
| 2 | #define B43_PHY_LCN_H_ | 3 | #define B43_PHY_LCN_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/phy_lp.h b/drivers/net/wireless/broadcom/b43/phy_lp.h index 62737f700cbc..50bef2ea6e52 100644 --- a/drivers/net/wireless/broadcom/b43/phy_lp.h +++ b/drivers/net/wireless/broadcom/b43/phy_lp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef LINUX_B43_PHY_LP_H_ | 2 | #ifndef LINUX_B43_PHY_LP_H_ |
| 2 | #define LINUX_B43_PHY_LP_H_ | 3 | #define LINUX_B43_PHY_LP_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/phy_n.h b/drivers/net/wireless/broadcom/b43/phy_n.h index a6da2c31a99c..b96ded0ef539 100644 --- a/drivers/net/wireless/broadcom/b43/phy_n.h +++ b/drivers/net/wireless/broadcom/b43/phy_n.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_NPHY_H_ | 2 | #ifndef B43_NPHY_H_ |
| 2 | #define B43_NPHY_H_ | 3 | #define B43_NPHY_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/pio.h b/drivers/net/wireless/broadcom/b43/pio.h index 1e516147424f..ffbfec622f82 100644 --- a/drivers/net/wireless/broadcom/b43/pio.h +++ b/drivers/net/wireless/broadcom/b43/pio.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_PIO_H_ | 2 | #ifndef B43_PIO_H_ |
| 2 | #define B43_PIO_H_ | 3 | #define B43_PIO_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/ppr.h b/drivers/net/wireless/broadcom/b43/ppr.h index 24d7447e9f01..094389f9f477 100644 --- a/drivers/net/wireless/broadcom/b43/ppr.h +++ b/drivers/net/wireless/broadcom/b43/ppr.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef LINUX_B43_PPR_H_ | 2 | #ifndef LINUX_B43_PPR_H_ |
| 2 | #define LINUX_B43_PPR_H_ | 3 | #define LINUX_B43_PPR_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/radio_2055.h b/drivers/net/wireless/broadcom/b43/radio_2055.h index 67f96122f8d8..ad7271cde001 100644 --- a/drivers/net/wireless/broadcom/b43/radio_2055.h +++ b/drivers/net/wireless/broadcom/b43/radio_2055.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_RADIO_2055_H_ | 2 | #ifndef B43_RADIO_2055_H_ |
| 2 | #define B43_RADIO_2055_H_ | 3 | #define B43_RADIO_2055_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/radio_2056.h b/drivers/net/wireless/broadcom/b43/radio_2056.h index 5b86673459fa..59297fdce5e3 100644 --- a/drivers/net/wireless/broadcom/b43/radio_2056.h +++ b/drivers/net/wireless/broadcom/b43/radio_2056.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_RADIO_2056_H_ | 2 | #ifndef B43_RADIO_2056_H_ |
| 2 | #define B43_RADIO_2056_H_ | 3 | #define B43_RADIO_2056_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/radio_2057.h b/drivers/net/wireless/broadcom/b43/radio_2057.h index 220d080238ff..d7959da77b51 100644 --- a/drivers/net/wireless/broadcom/b43/radio_2057.h +++ b/drivers/net/wireless/broadcom/b43/radio_2057.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_RADIO_2057_H_ | 2 | #ifndef B43_RADIO_2057_H_ |
| 2 | #define B43_RADIO_2057_H_ | 3 | #define B43_RADIO_2057_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/radio_2059.h b/drivers/net/wireless/broadcom/b43/radio_2059.h index 9e22fb60588b..32c0025bce9d 100644 --- a/drivers/net/wireless/broadcom/b43/radio_2059.h +++ b/drivers/net/wireless/broadcom/b43/radio_2059.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_RADIO_2059_H_ | 2 | #ifndef B43_RADIO_2059_H_ |
| 2 | #define B43_RADIO_2059_H_ | 3 | #define B43_RADIO_2059_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/rfkill.h b/drivers/net/wireless/broadcom/b43/rfkill.h index f046c3ca0519..8682ac5b828a 100644 --- a/drivers/net/wireless/broadcom/b43/rfkill.h +++ b/drivers/net/wireless/broadcom/b43/rfkill.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_RFKILL_H_ | 2 | #ifndef B43_RFKILL_H_ |
| 2 | #define B43_RFKILL_H_ | 3 | #define B43_RFKILL_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/sdio.h b/drivers/net/wireless/broadcom/b43/sdio.h index 1e93926f388f..aa5693b123ad 100644 --- a/drivers/net/wireless/broadcom/b43/sdio.h +++ b/drivers/net/wireless/broadcom/b43/sdio.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_SDIO_H_ | 2 | #ifndef B43_SDIO_H_ |
| 2 | #define B43_SDIO_H_ | 3 | #define B43_SDIO_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/sysfs.h b/drivers/net/wireless/broadcom/b43/sysfs.h index 12bda9ef1a85..e70e6cff3c53 100644 --- a/drivers/net/wireless/broadcom/b43/sysfs.h +++ b/drivers/net/wireless/broadcom/b43/sysfs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_SYSFS_H_ | 2 | #ifndef B43_SYSFS_H_ |
| 2 | #define B43_SYSFS_H_ | 3 | #define B43_SYSFS_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/tables.h b/drivers/net/wireless/broadcom/b43/tables.h index 80e73c7cbac5..3b0777f15f3e 100644 --- a/drivers/net/wireless/broadcom/b43/tables.h +++ b/drivers/net/wireless/broadcom/b43/tables.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_TABLES_H_ | 2 | #ifndef B43_TABLES_H_ |
| 2 | #define B43_TABLES_H_ | 3 | #define B43_TABLES_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/tables_lpphy.h b/drivers/net/wireless/broadcom/b43/tables_lpphy.h index 84f1d265f657..62002098bbda 100644 --- a/drivers/net/wireless/broadcom/b43/tables_lpphy.h +++ b/drivers/net/wireless/broadcom/b43/tables_lpphy.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_TABLES_LPPHY_H_ | 2 | #ifndef B43_TABLES_LPPHY_H_ |
| 2 | #define B43_TABLES_LPPHY_H_ | 3 | #define B43_TABLES_LPPHY_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/tables_nphy.h b/drivers/net/wireless/broadcom/b43/tables_nphy.h index b51f386db02f..3876786d2692 100644 --- a/drivers/net/wireless/broadcom/b43/tables_nphy.h +++ b/drivers/net/wireless/broadcom/b43/tables_nphy.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_TABLES_NPHY_H_ | 2 | #ifndef B43_TABLES_NPHY_H_ |
| 2 | #define B43_TABLES_NPHY_H_ | 3 | #define B43_TABLES_NPHY_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/tables_phy_ht.h b/drivers/net/wireless/broadcom/b43/tables_phy_ht.h index 1b5ef2bc770c..7ed057118ae3 100644 --- a/drivers/net/wireless/broadcom/b43/tables_phy_ht.h +++ b/drivers/net/wireless/broadcom/b43/tables_phy_ht.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_TABLES_PHY_HT_H_ | 2 | #ifndef B43_TABLES_PHY_HT_H_ |
| 2 | #define B43_TABLES_PHY_HT_H_ | 3 | #define B43_TABLES_PHY_HT_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/tables_phy_lcn.h b/drivers/net/wireless/broadcom/b43/tables_phy_lcn.h index caff9db6831f..5ea6c15e851e 100644 --- a/drivers/net/wireless/broadcom/b43/tables_phy_lcn.h +++ b/drivers/net/wireless/broadcom/b43/tables_phy_lcn.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_TABLES_PHY_LCN_H_ | 2 | #ifndef B43_TABLES_PHY_LCN_H_ |
| 2 | #define B43_TABLES_PHY_LCN_H_ | 3 | #define B43_TABLES_PHY_LCN_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/wa.h b/drivers/net/wireless/broadcom/b43/wa.h index e163c5e56e81..f3459b99d83b 100644 --- a/drivers/net/wireless/broadcom/b43/wa.h +++ b/drivers/net/wireless/broadcom/b43/wa.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_WA_H_ | 2 | #ifndef B43_WA_H_ |
| 2 | #define B43_WA_H_ | 3 | #define B43_WA_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43/xmit.h b/drivers/net/wireless/broadcom/b43/xmit.h index ba6115308068..6524a75bb73b 100644 --- a/drivers/net/wireless/broadcom/b43/xmit.h +++ b/drivers/net/wireless/broadcom/b43/xmit.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43_XMIT_H_ | 2 | #ifndef B43_XMIT_H_ |
| 2 | #define B43_XMIT_H_ | 3 | #define B43_XMIT_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43legacy/Makefile b/drivers/net/wireless/broadcom/b43legacy/Makefile index 227a77e84362..f8b392f09009 100644 --- a/drivers/net/wireless/broadcom/b43legacy/Makefile +++ b/drivers/net/wireless/broadcom/b43legacy/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # b43legacy core | 2 | # b43legacy core |
| 2 | b43legacy-y += main.o | 3 | b43legacy-y += main.o |
| 3 | b43legacy-y += ilt.o | 4 | b43legacy-y += ilt.o |
diff --git a/drivers/net/wireless/broadcom/b43legacy/b43legacy.h b/drivers/net/wireless/broadcom/b43legacy/b43legacy.h index 482476fdb1f3..6b0cec467938 100644 --- a/drivers/net/wireless/broadcom/b43legacy/b43legacy.h +++ b/drivers/net/wireless/broadcom/b43legacy/b43legacy.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43legacy_H_ | 2 | #ifndef B43legacy_H_ |
| 2 | #define B43legacy_H_ | 3 | #define B43legacy_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43legacy/debugfs.h b/drivers/net/wireless/broadcom/b43legacy/debugfs.h index 9ee32158b947..7a37764406b1 100644 --- a/drivers/net/wireless/broadcom/b43legacy/debugfs.h +++ b/drivers/net/wireless/broadcom/b43legacy/debugfs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43legacy_DEBUGFS_H_ | 2 | #ifndef B43legacy_DEBUGFS_H_ |
| 2 | #define B43legacy_DEBUGFS_H_ | 3 | #define B43legacy_DEBUGFS_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43legacy/dma.h b/drivers/net/wireless/broadcom/b43legacy/dma.h index c3282f906bc7..b5c1a51db2a4 100644 --- a/drivers/net/wireless/broadcom/b43legacy/dma.h +++ b/drivers/net/wireless/broadcom/b43legacy/dma.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43legacy_DMA_H_ | 2 | #ifndef B43legacy_DMA_H_ |
| 2 | #define B43legacy_DMA_H_ | 3 | #define B43legacy_DMA_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43legacy/ilt.h b/drivers/net/wireless/broadcom/b43legacy/ilt.h index 48bcf37eccb8..ce7a61e2efb1 100644 --- a/drivers/net/wireless/broadcom/b43legacy/ilt.h +++ b/drivers/net/wireless/broadcom/b43legacy/ilt.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43legacy_ILT_H_ | 2 | #ifndef B43legacy_ILT_H_ |
| 2 | #define B43legacy_ILT_H_ | 3 | #define B43legacy_ILT_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43legacy/leds.h b/drivers/net/wireless/broadcom/b43legacy/leds.h index 9ff6750dc57f..389ae06a2d10 100644 --- a/drivers/net/wireless/broadcom/b43legacy/leds.h +++ b/drivers/net/wireless/broadcom/b43legacy/leds.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43legacy_LEDS_H_ | 2 | #ifndef B43legacy_LEDS_H_ |
| 2 | #define B43legacy_LEDS_H_ | 3 | #define B43legacy_LEDS_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43legacy/pio.h b/drivers/net/wireless/broadcom/b43legacy/pio.h index 8e6773ea6e75..1cd1b9ca5e9c 100644 --- a/drivers/net/wireless/broadcom/b43legacy/pio.h +++ b/drivers/net/wireless/broadcom/b43legacy/pio.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43legacy_PIO_H_ | 2 | #ifndef B43legacy_PIO_H_ |
| 2 | #define B43legacy_PIO_H_ | 3 | #define B43legacy_PIO_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43legacy/rfkill.h b/drivers/net/wireless/broadcom/b43legacy/rfkill.h index 75585571c544..7f314eb815d4 100644 --- a/drivers/net/wireless/broadcom/b43legacy/rfkill.h +++ b/drivers/net/wireless/broadcom/b43legacy/rfkill.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43legacy_RFKILL_H_ | 2 | #ifndef B43legacy_RFKILL_H_ |
| 2 | #define B43legacy_RFKILL_H_ | 3 | #define B43legacy_RFKILL_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43legacy/sysfs.h b/drivers/net/wireless/broadcom/b43legacy/sysfs.h index 417d509803c7..ea9d783e6796 100644 --- a/drivers/net/wireless/broadcom/b43legacy/sysfs.h +++ b/drivers/net/wireless/broadcom/b43legacy/sysfs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43legacy_SYSFS_H_ | 2 | #ifndef B43legacy_SYSFS_H_ |
| 2 | #define B43legacy_SYSFS_H_ | 3 | #define B43legacy_SYSFS_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/b43legacy/xmit.h b/drivers/net/wireless/broadcom/b43legacy/xmit.h index 289db00a4a7b..e4ef869f0b8c 100644 --- a/drivers/net/wireless/broadcom/b43legacy/xmit.h +++ b/drivers/net/wireless/broadcom/b43legacy/xmit.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef B43legacy_XMIT_H_ | 2 | #ifndef B43legacy_XMIT_H_ |
| 2 | #define B43legacy_XMIT_H_ | 3 | #define B43legacy_XMIT_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c index 74b17cecb189..c0a5449ed72c 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <net/mac80211.h> | 2 | #include <net/mac80211.h> |
| 2 | #include <linux/bcma/bcma_driver_chipcommon.h> | 3 | #include <linux/bcma/bcma_driver_chipcommon.h> |
| 3 | #include <linux/gpio.h> | 4 | #include <linux/gpio.h> |
diff --git a/drivers/net/wireless/cisco/airo.h b/drivers/net/wireless/cisco/airo.h index e480adf86be6..8a02977a2e2b 100644 --- a/drivers/net/wireless/cisco/airo.h +++ b/drivers/net/wireless/cisco/airo.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _AIRO_H_ | 2 | #ifndef _AIRO_H_ |
| 2 | #define _AIRO_H_ | 3 | #define _AIRO_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/intel/ipw2x00/Makefile b/drivers/net/wireless/intel/ipw2x00/Makefile index aecd2cff462b..e1ec50359dff 100644 --- a/drivers/net/wireless/intel/ipw2x00/Makefile +++ b/drivers/net/wireless/intel/ipw2x00/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Intel Centrino wireless drivers | 3 | # Makefile for the Intel Centrino wireless drivers |
| 3 | # | 4 | # |
diff --git a/drivers/net/wireless/intel/iwlegacy/Makefile b/drivers/net/wireless/intel/iwlegacy/Makefile index c826a6b985bb..c5ad0453b334 100644 --- a/drivers/net/wireless/intel/iwlegacy/Makefile +++ b/drivers/net/wireless/intel/iwlegacy/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_IWLEGACY) += iwlegacy.o | 2 | obj-$(CONFIG_IWLEGACY) += iwlegacy.o |
| 2 | iwlegacy-objs := common.o | 3 | iwlegacy-objs := common.o |
| 3 | iwlegacy-$(CONFIG_IWLEGACY_DEBUGFS) += debug.o | 4 | iwlegacy-$(CONFIG_IWLEGACY_DEBUGFS) += debug.o |
diff --git a/drivers/net/wireless/intel/iwlwifi/Makefile b/drivers/net/wireless/intel/iwlwifi/Makefile index 35a32a3ec882..595b26b66bfc 100644 --- a/drivers/net/wireless/intel/iwlwifi/Makefile +++ b/drivers/net/wireless/intel/iwlwifi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # common | 2 | # common |
| 2 | obj-$(CONFIG_IWLWIFI) += iwlwifi.o | 3 | obj-$(CONFIG_IWLWIFI) += iwlwifi.o |
| 3 | iwlwifi-objs += iwl-io.o | 4 | iwlwifi-objs += iwl-io.o |
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/Makefile b/drivers/net/wireless/intel/iwlwifi/dvm/Makefile index b256a354953a..702d42b2d452 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/Makefile +++ b/drivers/net/wireless/intel/iwlwifi/dvm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # DVM | 2 | # DVM |
| 2 | obj-$(CONFIG_IWLDVM) += iwldvm.o | 3 | obj-$(CONFIG_IWLDVM) += iwldvm.o |
| 3 | iwldvm-objs += main.o rs.o mac80211.o ucode.o tx.o | 4 | iwldvm-objs += main.o rs.o mac80211.o ucode.o tx.o |
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/Makefile b/drivers/net/wireless/intel/iwlwifi/mvm/Makefile index 00e6737dda72..a47635c32c11 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/Makefile +++ b/drivers/net/wireless/intel/iwlwifi/mvm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_IWLMVM) += iwlmvm.o | 2 | obj-$(CONFIG_IWLMVM) += iwlmvm.o |
| 2 | iwlmvm-y += fw.o mac80211.o nvm.o ops.o phy-ctxt.o mac-ctxt.o | 3 | iwlmvm-y += fw.o mac80211.o nvm.o ops.o phy-ctxt.o mac-ctxt.o |
| 3 | iwlmvm-y += utils.o rx.o rxmq.o tx.o binding.o quota.o sta.o sf.o | 4 | iwlmvm-y += utils.o rx.o rxmq.o tx.o binding.o quota.o sta.o sf.o |
diff --git a/drivers/net/wireless/intersil/hostap/Makefile b/drivers/net/wireless/intersil/hostap/Makefile index b8e41a702c00..ae3bb73b2d99 100644 --- a/drivers/net/wireless/intersil/hostap/Makefile +++ b/drivers/net/wireless/intersil/hostap/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | hostap-y := hostap_80211_rx.o hostap_80211_tx.o hostap_ap.o hostap_info.o \ | 2 | hostap-y := hostap_80211_rx.o hostap_80211_tx.o hostap_ap.o hostap_info.o \ |
| 2 | hostap_ioctl.o hostap_main.o hostap_proc.o | 3 | hostap_ioctl.o hostap_main.o hostap_proc.o |
| 3 | obj-$(CONFIG_HOSTAP) += hostap.o | 4 | obj-$(CONFIG_HOSTAP) += hostap.o |
diff --git a/drivers/net/wireless/intersil/hostap/hostap.h b/drivers/net/wireless/intersil/hostap/hostap.h index ce8721fbc10e..8130d29c7989 100644 --- a/drivers/net/wireless/intersil/hostap/hostap.h +++ b/drivers/net/wireless/intersil/hostap/hostap.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef HOSTAP_H | 2 | #ifndef HOSTAP_H |
| 2 | #define HOSTAP_H | 3 | #define HOSTAP_H |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/intersil/hostap/hostap_80211.h b/drivers/net/wireless/intersil/hostap/hostap_80211.h index ed98ce7c8f65..1452cf6ecb07 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_80211.h +++ b/drivers/net/wireless/intersil/hostap/hostap_80211.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef HOSTAP_80211_H | 2 | #ifndef HOSTAP_80211_H |
| 2 | #define HOSTAP_80211_H | 3 | #define HOSTAP_80211_H |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/intersil/hostap/hostap_80211_rx.c b/drivers/net/wireless/intersil/hostap/hostap_80211_rx.c index 6d8b64ca1a63..61be822f90b5 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_80211_rx.c +++ b/drivers/net/wireless/intersil/hostap/hostap_80211_rx.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/etherdevice.h> | 2 | #include <linux/etherdevice.h> |
| 2 | #include <linux/slab.h> | 3 | #include <linux/slab.h> |
| 3 | #include <linux/export.h> | 4 | #include <linux/export.h> |
diff --git a/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c b/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c index c1b10d5117ad..c47da06945c2 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c +++ b/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/slab.h> | 2 | #include <linux/slab.h> |
| 2 | #include <linux/export.h> | 3 | #include <linux/export.h> |
| 3 | #include <linux/etherdevice.h> | 4 | #include <linux/etherdevice.h> |
diff --git a/drivers/net/wireless/intersil/hostap/hostap_ap.c b/drivers/net/wireless/intersil/hostap/hostap_ap.c index eb9cd6fa9c4d..1a8d8db80b05 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_ap.c +++ b/drivers/net/wireless/intersil/hostap/hostap_ap.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Intersil Prism2 driver with Host AP (software access point) support | 3 | * Intersil Prism2 driver with Host AP (software access point) support |
| 3 | * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen | 4 | * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen |
diff --git a/drivers/net/wireless/intersil/hostap/hostap_ap.h b/drivers/net/wireless/intersil/hostap/hostap_ap.h index 334e2d0b8e11..b7ac9e2f1a39 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_ap.h +++ b/drivers/net/wireless/intersil/hostap/hostap_ap.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef HOSTAP_AP_H | 2 | #ifndef HOSTAP_AP_H |
| 2 | #define HOSTAP_AP_H | 3 | #define HOSTAP_AP_H |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/intersil/hostap/hostap_common.h b/drivers/net/wireless/intersil/hostap/hostap_common.h index 4230102ac9e4..22543538239b 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_common.h +++ b/drivers/net/wireless/intersil/hostap/hostap_common.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef HOSTAP_COMMON_H | 2 | #ifndef HOSTAP_COMMON_H |
| 2 | #define HOSTAP_COMMON_H | 3 | #define HOSTAP_COMMON_H |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/intersil/hostap/hostap_config.h b/drivers/net/wireless/intersil/hostap/hostap_config.h index 2c8f71f0ed45..3ebd55847fad 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_config.h +++ b/drivers/net/wireless/intersil/hostap/hostap_config.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef HOSTAP_CONFIG_H | 2 | #ifndef HOSTAP_CONFIG_H |
| 2 | #define HOSTAP_CONFIG_H | 3 | #define HOSTAP_CONFIG_H |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/intersil/hostap/hostap_download.c b/drivers/net/wireless/intersil/hostap/hostap_download.c index 705fe668b969..4507614a7c5a 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_download.c +++ b/drivers/net/wireless/intersil/hostap/hostap_download.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | static int prism2_enable_aux_port(struct net_device *dev, int enable) | 2 | static int prism2_enable_aux_port(struct net_device *dev, int enable) |
| 2 | { | 3 | { |
| 3 | u16 val, reg; | 4 | u16 val, reg; |
diff --git a/drivers/net/wireless/intersil/hostap/hostap_info.c b/drivers/net/wireless/intersil/hostap/hostap_info.c index 7635ac4f6679..de8a099a9386 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_info.c +++ b/drivers/net/wireless/intersil/hostap/hostap_info.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* Host AP driver Info Frame processing (part of hostap.o module) */ | 2 | /* Host AP driver Info Frame processing (part of hostap.o module) */ |
| 2 | 3 | ||
| 3 | #include <linux/if_arp.h> | 4 | #include <linux/if_arp.h> |
diff --git a/drivers/net/wireless/intersil/hostap/hostap_ioctl.c b/drivers/net/wireless/intersil/hostap/hostap_ioctl.c index ff153ce29539..c1bc0a6ef300 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_ioctl.c +++ b/drivers/net/wireless/intersil/hostap/hostap_ioctl.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* ioctl() (mostly Linux Wireless Extensions) routines for Host AP driver */ | 2 | /* ioctl() (mostly Linux Wireless Extensions) routines for Host AP driver */ |
| 2 | 3 | ||
| 3 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
diff --git a/drivers/net/wireless/intersil/hostap/hostap_proc.c b/drivers/net/wireless/intersil/hostap/hostap_proc.c index dd84557cf957..d234231bf532 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_proc.c +++ b/drivers/net/wireless/intersil/hostap/hostap_proc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* /proc routines for Host AP driver */ | 2 | /* /proc routines for Host AP driver */ |
| 2 | 3 | ||
| 3 | #include <linux/types.h> | 4 | #include <linux/types.h> |
diff --git a/drivers/net/wireless/intersil/hostap/hostap_wlan.h b/drivers/net/wireless/intersil/hostap/hostap_wlan.h index 5352adb94d50..a8c4c1a8b29d 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_wlan.h +++ b/drivers/net/wireless/intersil/hostap/hostap_wlan.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef HOSTAP_WLAN_H | 2 | #ifndef HOSTAP_WLAN_H |
| 2 | #define HOSTAP_WLAN_H | 3 | #define HOSTAP_WLAN_H |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/intersil/orinoco/Makefile b/drivers/net/wireless/intersil/orinoco/Makefile index b7ecef820f76..0c29c56c88d6 100644 --- a/drivers/net/wireless/intersil/orinoco/Makefile +++ b/drivers/net/wireless/intersil/orinoco/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the orinoco wireless device drivers. | 3 | # Makefile for the orinoco wireless device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/net/wireless/intersil/p54/Makefile b/drivers/net/wireless/intersil/p54/Makefile index b542e68f1781..d71651ff904e 100644 --- a/drivers/net/wireless/intersil/p54/Makefile +++ b/drivers/net/wireless/intersil/p54/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | p54common-objs := eeprom.o fwio.o txrx.o main.o | 2 | p54common-objs := eeprom.o fwio.o txrx.o main.o |
| 2 | p54common-$(CONFIG_P54_LEDS) += led.o | 3 | p54common-$(CONFIG_P54_LEDS) += led.o |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/marvell/libertas/Makefile b/drivers/net/wireless/marvell/libertas/Makefile index eac72f7bd341..41b9b440a542 100644 --- a/drivers/net/wireless/marvell/libertas/Makefile +++ b/drivers/net/wireless/marvell/libertas/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | libertas-y += cfg.o | 2 | libertas-y += cfg.o |
| 2 | libertas-y += cmd.o | 3 | libertas-y += cmd.o |
| 3 | libertas-y += cmdresp.o | 4 | libertas-y += cmdresp.o |
diff --git a/drivers/net/wireless/marvell/libertas/cfg.c b/drivers/net/wireless/marvell/libertas/cfg.c index 71ba2c8d09b5..9f3a7b512673 100644 --- a/drivers/net/wireless/marvell/libertas/cfg.c +++ b/drivers/net/wireless/marvell/libertas/cfg.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Implement cfg80211 ("iw") support. | 3 | * Implement cfg80211 ("iw") support. |
| 3 | * | 4 | * |
diff --git a/drivers/net/wireless/marvell/libertas/cfg.h b/drivers/net/wireless/marvell/libertas/cfg.h index acccc2922401..0e48dc6d81d1 100644 --- a/drivers/net/wireless/marvell/libertas/cfg.h +++ b/drivers/net/wireless/marvell/libertas/cfg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __LBS_CFG80211_H__ | 2 | #ifndef __LBS_CFG80211_H__ |
| 2 | #define __LBS_CFG80211_H__ | 3 | #define __LBS_CFG80211_H__ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/marvell/libertas/cmd.h b/drivers/net/wireless/marvell/libertas/cmd.h index 0c5444b02c64..80878561cb90 100644 --- a/drivers/net/wireless/marvell/libertas/cmd.h +++ b/drivers/net/wireless/marvell/libertas/cmd.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* Copyright (C) 2007, Red Hat, Inc. */ | 2 | /* Copyright (C) 2007, Red Hat, Inc. */ |
| 2 | 3 | ||
| 3 | #ifndef _LBS_CMD_H_ | 4 | #ifndef _LBS_CMD_H_ |
diff --git a/drivers/net/wireless/marvell/libertas/cmdresp.c b/drivers/net/wireless/marvell/libertas/cmdresp.c index aaf01619de59..b73d08381398 100644 --- a/drivers/net/wireless/marvell/libertas/cmdresp.c +++ b/drivers/net/wireless/marvell/libertas/cmdresp.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * This file contains the handling of command | 3 | * This file contains the handling of command |
| 3 | * responses as well as events generated by firmware. | 4 | * responses as well as events generated by firmware. |
diff --git a/drivers/net/wireless/marvell/libertas/debugfs.c b/drivers/net/wireless/marvell/libertas/debugfs.c index faed1823c58e..c83f44f9ddf1 100644 --- a/drivers/net/wireless/marvell/libertas/debugfs.c +++ b/drivers/net/wireless/marvell/libertas/debugfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/dcache.h> | 2 | #include <linux/dcache.h> |
| 2 | #include <linux/debugfs.h> | 3 | #include <linux/debugfs.h> |
| 3 | #include <linux/delay.h> | 4 | #include <linux/delay.h> |
diff --git a/drivers/net/wireless/marvell/libertas/debugfs.h b/drivers/net/wireless/marvell/libertas/debugfs.h index f2b9c7ffe0fd..6efd1a66dad7 100644 --- a/drivers/net/wireless/marvell/libertas/debugfs.h +++ b/drivers/net/wireless/marvell/libertas/debugfs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _LBS_DEBUGFS_H_ | 2 | #ifndef _LBS_DEBUGFS_H_ |
| 2 | #define _LBS_DEBUGFS_H_ | 3 | #define _LBS_DEBUGFS_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/marvell/libertas/decl.h b/drivers/net/wireless/marvell/libertas/decl.h index 84a3aa7ac570..5d1e30e0c5db 100644 --- a/drivers/net/wireless/marvell/libertas/decl.h +++ b/drivers/net/wireless/marvell/libertas/decl.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | /* | 3 | /* |
| 3 | * This file contains declaration referring to | 4 | * This file contains declaration referring to |
diff --git a/drivers/net/wireless/marvell/libertas/defs.h b/drivers/net/wireless/marvell/libertas/defs.h index d3221444e51c..58e2ead7b0cc 100644 --- a/drivers/net/wireless/marvell/libertas/defs.h +++ b/drivers/net/wireless/marvell/libertas/defs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * This header file contains global constant/enum definitions, | 3 | * This header file contains global constant/enum definitions, |
| 3 | * global variable declaration. | 4 | * global variable declaration. |
diff --git a/drivers/net/wireless/marvell/libertas/dev.h b/drivers/net/wireless/marvell/libertas/dev.h index edf710bc5e77..dd1ee1f0af48 100644 --- a/drivers/net/wireless/marvell/libertas/dev.h +++ b/drivers/net/wireless/marvell/libertas/dev.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * This file contains definitions and data structures specific | 3 | * This file contains definitions and data structures specific |
| 3 | * to Marvell 802.11 NIC. It contains the Device Information | 4 | * to Marvell 802.11 NIC. It contains the Device Information |
diff --git a/drivers/net/wireless/marvell/libertas/ethtool.c b/drivers/net/wireless/marvell/libertas/ethtool.c index 693868f16921..1bb8746a0b23 100644 --- a/drivers/net/wireless/marvell/libertas/ethtool.c +++ b/drivers/net/wireless/marvell/libertas/ethtool.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/hardirq.h> | 2 | #include <linux/hardirq.h> |
| 2 | #include <linux/netdevice.h> | 3 | #include <linux/netdevice.h> |
| 3 | #include <linux/ethtool.h> | 4 | #include <linux/ethtool.h> |
diff --git a/drivers/net/wireless/marvell/libertas/host.h b/drivers/net/wireless/marvell/libertas/host.h index 96726f79a1dd..a4fc3f79bb17 100644 --- a/drivers/net/wireless/marvell/libertas/host.h +++ b/drivers/net/wireless/marvell/libertas/host.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * This file function prototypes, data structure | 3 | * This file function prototypes, data structure |
| 3 | * and definitions for all the host/station commands | 4 | * and definitions for all the host/station commands |
diff --git a/drivers/net/wireless/marvell/libertas/if_usb.h b/drivers/net/wireless/marvell/libertas/if_usb.h index 6e42eac331de..8dc14bec3e16 100644 --- a/drivers/net/wireless/marvell/libertas/if_usb.h +++ b/drivers/net/wireless/marvell/libertas/if_usb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _LBS_IF_USB_H | 2 | #ifndef _LBS_IF_USB_H |
| 2 | #define _LBS_IF_USB_H | 3 | #define _LBS_IF_USB_H |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/marvell/libertas/mesh.c b/drivers/net/wireless/marvell/libertas/mesh.c index 37ace5cb309d..b0cb16ef8d1d 100644 --- a/drivers/net/wireless/marvell/libertas/mesh.c +++ b/drivers/net/wireless/marvell/libertas/mesh.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | 2 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 2 | 3 | ||
| 3 | #include <linux/delay.h> | 4 | #include <linux/delay.h> |
diff --git a/drivers/net/wireless/marvell/libertas/mesh.h b/drivers/net/wireless/marvell/libertas/mesh.h index 6603f341c874..dfe22c91aade 100644 --- a/drivers/net/wireless/marvell/libertas/mesh.h +++ b/drivers/net/wireless/marvell/libertas/mesh.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Contains all definitions needed for the Libertas' MESH implementation. | 3 | * Contains all definitions needed for the Libertas' MESH implementation. |
| 3 | */ | 4 | */ |
diff --git a/drivers/net/wireless/marvell/libertas/radiotap.h b/drivers/net/wireless/marvell/libertas/radiotap.h index b3c8ea6d610e..1ed5608d353f 100644 --- a/drivers/net/wireless/marvell/libertas/radiotap.h +++ b/drivers/net/wireless/marvell/libertas/radiotap.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <net/ieee80211_radiotap.h> | 2 | #include <net/ieee80211_radiotap.h> |
| 2 | 3 | ||
| 3 | struct tx_radiotap_hdr { | 4 | struct tx_radiotap_hdr { |
diff --git a/drivers/net/wireless/marvell/libertas/types.h b/drivers/net/wireless/marvell/libertas/types.h index cf1d9b047ee6..cd4ceb6f885d 100644 --- a/drivers/net/wireless/marvell/libertas/types.h +++ b/drivers/net/wireless/marvell/libertas/types.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * This header file contains definition for global types | 3 | * This header file contains definition for global types |
| 3 | */ | 4 | */ |
diff --git a/drivers/net/wireless/marvell/libertas_tf/deb_defs.h b/drivers/net/wireless/marvell/libertas_tf/deb_defs.h index 4bd3dc5adf7c..37a98e228b46 100644 --- a/drivers/net/wireless/marvell/libertas_tf/deb_defs.h +++ b/drivers/net/wireless/marvell/libertas_tf/deb_defs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /** | 2 | /** |
| 2 | * This header file contains global constant/enum definitions, | 3 | * This header file contains global constant/enum definitions, |
| 3 | * global variable declaration. | 4 | * global variable declaration. |
diff --git a/drivers/net/wireless/quantenna/qtnfmac/Makefile b/drivers/net/wireless/quantenna/qtnfmac/Makefile index f236b7dc2be3..97f760a3d599 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/Makefile +++ b/drivers/net/wireless/quantenna/qtnfmac/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Copyright (c) 2015-2016 Quantenna Communications, Inc. | 3 | # Copyright (c) 2015-2016 Quantenna Communications, Inc. |
| 3 | # All rights reserved. | 4 | # All rights reserved. |
diff --git a/drivers/net/wireless/ralink/rt2x00/Makefile b/drivers/net/wireless/ralink/rt2x00/Makefile index 24a66015a495..de030ebcdf6e 100644 --- a/drivers/net/wireless/ralink/rt2x00/Makefile +++ b/drivers/net/wireless/ralink/rt2x00/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rt2x00lib-y += rt2x00dev.o | 2 | rt2x00lib-y += rt2x00dev.o |
| 2 | rt2x00lib-y += rt2x00mac.o | 3 | rt2x00lib-y += rt2x00mac.o |
| 3 | rt2x00lib-y += rt2x00config.o | 4 | rt2x00lib-y += rt2x00config.o |
diff --git a/drivers/net/wireless/ray_cs.h b/drivers/net/wireless/ray_cs.h index 524c2f02dd82..0609d8625019 100644 --- a/drivers/net/wireless/ray_cs.h +++ b/drivers/net/wireless/ray_cs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* Raytheon wireless LAN PCMCIA card driver for Linux | 2 | /* Raytheon wireless LAN PCMCIA card driver for Linux |
| 2 | A PCMCIA client driver for the Raylink wireless network card | 3 | A PCMCIA client driver for the Raylink wireless network card |
| 3 | Written by Corey Thomas | 4 | Written by Corey Thomas |
diff --git a/drivers/net/wireless/rayctl.h b/drivers/net/wireless/rayctl.h index b21ed64e15df..668444f6bf07 100644 --- a/drivers/net/wireless/rayctl.h +++ b/drivers/net/wireless/rayctl.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _RAYCTL_H_ | 2 | #ifndef _RAYCTL_H_ |
| 2 | #define _RAYCTL_H_ | 3 | #define _RAYCTL_H_ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8180.h b/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8180.h index e8243a44d6b6..7948a2da195a 100644 --- a/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8180.h +++ b/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8180.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef RTL8180_H | 2 | #ifndef RTL8180_H |
| 2 | #define RTL8180_H | 3 | #define RTL8180_H |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225.h b/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225.h index 310013a2d726..de7727b74631 100644 --- a/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225.h +++ b/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef RTL8180_RTL8225_H | 2 | #ifndef RTL8180_RTL8225_H |
| 2 | #define RTL8180_RTL8225_H | 3 | #define RTL8180_RTL8225_H |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8187/rfkill.h b/drivers/net/wireless/realtek/rtl818x/rtl8187/rfkill.h index e12575e96d11..c493e59eede9 100644 --- a/drivers/net/wireless/realtek/rtl818x/rtl8187/rfkill.h +++ b/drivers/net/wireless/realtek/rtl818x/rtl8187/rfkill.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef RTL8187_RFKILL_H | 2 | #ifndef RTL8187_RFKILL_H |
| 2 | #define RTL8187_RFKILL_H | 3 | #define RTL8187_RFKILL_H |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/realtek/rtlwifi/Makefile b/drivers/net/wireless/realtek/rtlwifi/Makefile index 84c2e826fa1d..09c30e428375 100644 --- a/drivers/net/wireless/realtek/rtlwifi/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_RTLWIFI) += rtlwifi.o | 2 | obj-$(CONFIG_RTLWIFI) += rtlwifi.o |
| 2 | rtlwifi-objs := \ | 3 | rtlwifi-objs := \ |
| 3 | base.o \ | 4 | base.o \ |
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile b/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile index 20582df0465c..d15c58737388 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | btcoexist-objs := halbtc8192e2ant.o \ | 2 | btcoexist-objs := halbtc8192e2ant.o \ |
| 2 | halbtc8723b1ant.o \ | 3 | halbtc8723b1ant.o \ |
| 3 | halbtc8723b2ant.o \ | 4 | halbtc8723b2ant.o \ |
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile index dae4f0f19cd3..5ea368e8e64b 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rtl8188ee-objs := \ | 2 | rtl8188ee-objs := \ |
| 2 | dm.o \ | 3 | dm.o \ |
| 3 | fw.o \ | 4 | fw.o \ |
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/Makefile index 0546b7556259..40f075527fc8 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rtl8192c-common-objs := \ | 2 | rtl8192c-common-objs := \ |
| 2 | main.o \ | 3 | main.o \ |
| 3 | dm_common.o \ | 4 | dm_common.o \ |
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/Makefile index 577c7adbc322..bc307ccc5e83 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rtl8192ce-objs := \ | 2 | rtl8192ce-objs := \ |
| 2 | dm.o \ | 3 | dm.o \ |
| 3 | hw.o \ | 4 | hw.o \ |
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/Makefile index 97437dadc287..8b3921fd2cb6 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rtl8192cu-objs := \ | 2 | rtl8192cu-objs := \ |
| 2 | dm.o \ | 3 | dm.o \ |
| 3 | hw.o \ | 4 | hw.o \ |
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/Makefile index d0703f20d30c..6482d823a57a 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rtl8192de-objs := \ | 2 | rtl8192de-objs := \ |
| 2 | dm.o \ | 3 | dm.o \ |
| 3 | fw.o \ | 4 | fw.o \ |
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/Makefile index f254b9f64326..12dfbeb1f3ca 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rtl8192ee-objs := \ | 2 | rtl8192ee-objs := \ |
| 2 | dm.o \ | 3 | dm.o \ |
| 3 | fw.o \ | 4 | fw.o \ |
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/Makefile index dfa9dbbe2cdf..e577235f5286 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rtl8192se-objs := \ | 2 | rtl8192se-objs := \ |
| 2 | dm.o \ | 3 | dm.o \ |
| 3 | fw.o \ | 4 | fw.o \ |
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/Makefile index e7607d2cb2ef..d1238707291f 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rtl8723ae-objs := \ | 2 | rtl8723ae-objs := \ |
| 2 | dm.o \ | 3 | dm.o \ |
| 3 | fw.o \ | 4 | fw.o \ |
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/Makefile index a841cbd55d8e..d3ed44d80011 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rtl8723be-objs := \ | 2 | rtl8723be-objs := \ |
| 2 | dm.o \ | 3 | dm.o \ |
| 3 | fw.o \ | 4 | fw.o \ |
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/Makefile index 73da75526e2a..3451198b670c 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rtl8723-common-objs := \ | 2 | rtl8723-common-objs := \ |
| 2 | main.o \ | 3 | main.o \ |
| 3 | dm_common.o \ | 4 | dm_common.o \ |
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/Makefile index 8ca406b95f02..81dbf4ca6bc6 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rtl8821ae-objs := \ | 2 | rtl8821ae-objs := \ |
| 2 | dm.o \ | 3 | dm.o \ |
| 3 | fw.o \ | 4 | fw.o \ |
diff --git a/drivers/net/wireless/rsi/Makefile b/drivers/net/wireless/rsi/Makefile index ebb89965997a..47c45908d894 100644 --- a/drivers/net/wireless/rsi/Makefile +++ b/drivers/net/wireless/rsi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rsi_91x-y += rsi_91x_main.o | 2 | rsi_91x-y += rsi_91x_main.o |
| 2 | rsi_91x-y += rsi_91x_core.o | 3 | rsi_91x-y += rsi_91x_core.o |
| 3 | rsi_91x-y += rsi_91x_mac80211.o | 4 | rsi_91x-y += rsi_91x_mac80211.o |
diff --git a/drivers/net/wireless/st/cw1200/Makefile b/drivers/net/wireless/st/cw1200/Makefile index b086aac6547a..386a484e0707 100644 --- a/drivers/net/wireless/st/cw1200/Makefile +++ b/drivers/net/wireless/st/cw1200/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | cw1200_core-y := \ | 2 | cw1200_core-y := \ |
| 2 | fwio.o \ | 3 | fwio.o \ |
| 3 | txrx.o \ | 4 | txrx.o \ |
diff --git a/drivers/net/wireless/ti/Makefile b/drivers/net/wireless/ti/Makefile index af14231aeede..0530dd744275 100644 --- a/drivers/net/wireless/ti/Makefile +++ b/drivers/net/wireless/ti/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_WLCORE) += wlcore/ | 2 | obj-$(CONFIG_WLCORE) += wlcore/ |
| 2 | obj-$(CONFIG_WL12XX) += wl12xx/ | 3 | obj-$(CONFIG_WL12XX) += wl12xx/ |
| 3 | obj-$(CONFIG_WL1251) += wl1251/ | 4 | obj-$(CONFIG_WL1251) += wl1251/ |
diff --git a/drivers/net/wireless/ti/wl1251/Makefile b/drivers/net/wireless/ti/wl1251/Makefile index 58b4f935a3f6..38da9f8e5f82 100644 --- a/drivers/net/wireless/ti/wl1251/Makefile +++ b/drivers/net/wireless/ti/wl1251/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | wl1251-objs = main.o event.o tx.o rx.o ps.o cmd.o \ | 2 | wl1251-objs = main.o event.o tx.o rx.o ps.o cmd.o \ |
| 2 | acx.o boot.o init.o debugfs.o io.o | 3 | acx.o boot.o init.o debugfs.o io.o |
| 3 | wl1251_spi-objs += spi.o | 4 | wl1251_spi-objs += spi.o |
diff --git a/drivers/net/wireless/ti/wl1251/acx.c b/drivers/net/wireless/ti/wl1251/acx.c index d6fbdda2cba3..f78fc3880423 100644 --- a/drivers/net/wireless/ti/wl1251/acx.c +++ b/drivers/net/wireless/ti/wl1251/acx.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "acx.h" | 2 | #include "acx.h" |
| 2 | 3 | ||
| 3 | #include <linux/module.h> | 4 | #include <linux/module.h> |
diff --git a/drivers/net/wireless/ti/wl1251/cmd.c b/drivers/net/wireless/ti/wl1251/cmd.c index ede31f048ef9..9547aea01b0f 100644 --- a/drivers/net/wireless/ti/wl1251/cmd.c +++ b/drivers/net/wireless/ti/wl1251/cmd.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "cmd.h" | 2 | #include "cmd.h" |
| 2 | 3 | ||
| 3 | #include <linux/module.h> | 4 | #include <linux/module.h> |
diff --git a/drivers/net/wireless/ti/wl1251/wl12xx_80211.h b/drivers/net/wireless/ti/wl1251/wl12xx_80211.h index 04ed51495772..7fabe702c4cc 100644 --- a/drivers/net/wireless/ti/wl1251/wl12xx_80211.h +++ b/drivers/net/wireless/ti/wl1251/wl12xx_80211.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __WL12XX_80211_H__ | 2 | #ifndef __WL12XX_80211_H__ |
| 2 | #define __WL12XX_80211_H__ | 3 | #define __WL12XX_80211_H__ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/ti/wlcore/Makefile b/drivers/net/wireless/ti/wlcore/Makefile index e286713b3c18..7d418c57bcb5 100644 --- a/drivers/net/wireless/ti/wlcore/Makefile +++ b/drivers/net/wireless/ti/wlcore/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | wlcore-objs = main.o cmd.o io.o event.o tx.o rx.o ps.o acx.o \ | 2 | wlcore-objs = main.o cmd.o io.o event.o tx.o rx.o ps.o acx.o \ |
| 2 | boot.o init.o debugfs.o scan.o sysfs.o vendor_cmd.o | 3 | boot.o init.o debugfs.o scan.o sysfs.o vendor_cmd.o |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/ti/wlcore/wl12xx_80211.h b/drivers/net/wireless/ti/wlcore/wl12xx_80211.h index 22b0bc98d7b5..181be725eff8 100644 --- a/drivers/net/wireless/ti/wlcore/wl12xx_80211.h +++ b/drivers/net/wireless/ti/wlcore/wl12xx_80211.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __WL12XX_80211_H__ | 2 | #ifndef __WL12XX_80211_H__ |
| 2 | #define __WL12XX_80211_H__ | 3 | #define __WL12XX_80211_H__ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/wl3501.h b/drivers/net/wireless/wl3501.h index 3fbfd19818f1..efdce9ae36ea 100644 --- a/drivers/net/wireless/wl3501.h +++ b/drivers/net/wireless/wl3501.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __WL3501_H__ | 2 | #ifndef __WL3501_H__ |
| 2 | #define __WL3501_H__ | 3 | #define __WL3501_H__ |
| 3 | 4 | ||
diff --git a/drivers/net/wireless/zydas/zd1211rw/Makefile b/drivers/net/wireless/zydas/zd1211rw/Makefile index 5728a918e508..1647a449ce1a 100644 --- a/drivers/net/wireless/zydas/zd1211rw/Makefile +++ b/drivers/net/wireless/zydas/zd1211rw/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_ZD1211RW) += zd1211rw.o | 2 | obj-$(CONFIG_ZD1211RW) += zd1211rw.o |
| 2 | 3 | ||
| 3 | zd1211rw-objs := zd_chip.o zd_mac.o \ | 4 | zd1211rw-objs := zd_chip.o zd_mac.o \ |
diff --git a/drivers/nfc/Makefile b/drivers/nfc/Makefile index 640b7274371c..5393ba59b17d 100644 --- a/drivers/nfc/Makefile +++ b/drivers/nfc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for nfc devices | 3 | # Makefile for nfc devices |
| 3 | # | 4 | # |
diff --git a/drivers/nfc/mei_phy.h b/drivers/nfc/mei_phy.h index acd3a1fc69e6..51bd44f5f3b8 100644 --- a/drivers/nfc/mei_phy.h +++ b/drivers/nfc/mei_phy.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __LOCAL_MEI_PHY_H_ | 2 | #ifndef __LOCAL_MEI_PHY_H_ |
| 2 | #define __LOCAL_MEI_PHY_H_ | 3 | #define __LOCAL_MEI_PHY_H_ |
| 3 | 4 | ||
diff --git a/drivers/nfc/microread/Makefile b/drivers/nfc/microread/Makefile index 755c24cba253..2f7dda265f8f 100644 --- a/drivers/nfc/microread/Makefile +++ b/drivers/nfc/microread/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for Microread HCI based NFC driver | 3 | # Makefile for Microread HCI based NFC driver |
| 3 | # | 4 | # |
diff --git a/drivers/nfc/nfcmrvl/Makefile b/drivers/nfc/nfcmrvl/Makefile index fa07c7806492..e74de0cb3bb0 100644 --- a/drivers/nfc/nfcmrvl/Makefile +++ b/drivers/nfc/nfcmrvl/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for NFCMRVL NCI based NFC driver | 3 | # Makefile for NFCMRVL NCI based NFC driver |
| 3 | # | 4 | # |
diff --git a/drivers/nfc/st-nci/Makefile b/drivers/nfc/st-nci/Makefile index 439b2fa8654a..e0310743fed1 100644 --- a/drivers/nfc/st-nci/Makefile +++ b/drivers/nfc/st-nci/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for ST_NCI NCI based NFC driver | 3 | # Makefile for ST_NCI NCI based NFC driver |
| 3 | # | 4 | # |
diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c index df431e8a0631..8ce69c833362 100644 --- a/drivers/nubus/nubus.c +++ b/drivers/nubus/nubus.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Macintosh Nubus Interface Code | 3 | * Macintosh Nubus Interface Code |
| 3 | * | 4 | * |
diff --git a/drivers/nubus/proc.c b/drivers/nubus/proc.c index e8f68f5732f1..004a122ac0ff 100644 --- a/drivers/nubus/proc.c +++ b/drivers/nubus/proc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* drivers/nubus/proc.c: Proc FS interface for NuBus. | 2 | /* drivers/nubus/proc.c: Proc FS interface for NuBus. |
| 2 | 3 | ||
| 3 | By David Huggins-Daines <dhd@debian.org> | 4 | By David Huggins-Daines <dhd@debian.org> |
diff --git a/drivers/nvdimm/Makefile b/drivers/nvdimm/Makefile index 909554c3f955..447e0e14f3b6 100644 --- a/drivers/nvdimm/Makefile +++ b/drivers/nvdimm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o | 2 | obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o |
| 2 | obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o | 3 | obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o |
| 3 | obj-$(CONFIG_ND_BTT) += nd_btt.o | 4 | obj-$(CONFIG_ND_BTT) += nd_btt.o |
diff --git a/drivers/nvdimm/pmem.h b/drivers/nvdimm/pmem.h index c5917f040fa7..6a3cd2a10db6 100644 --- a/drivers/nvdimm/pmem.h +++ b/drivers/nvdimm/pmem.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NVDIMM_PMEM_H__ | 2 | #ifndef __NVDIMM_PMEM_H__ |
| 2 | #define __NVDIMM_PMEM_H__ | 3 | #define __NVDIMM_PMEM_H__ |
| 3 | #include <linux/badblocks.h> | 4 | #include <linux/badblocks.h> |
diff --git a/drivers/nvme/host/Makefile b/drivers/nvme/host/Makefile index cc0aacb4c8b4..7b96e4588a12 100644 --- a/drivers/nvme/host/Makefile +++ b/drivers/nvme/host/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_NVME_CORE) += nvme-core.o | 2 | obj-$(CONFIG_NVME_CORE) += nvme-core.o |
| 2 | obj-$(CONFIG_BLK_DEV_NVME) += nvme.o | 3 | obj-$(CONFIG_BLK_DEV_NVME) += nvme.o |
| 3 | obj-$(CONFIG_NVME_FABRICS) += nvme-fabrics.o | 4 | obj-$(CONFIG_NVME_FABRICS) += nvme-fabrics.o |
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 5a14cc7f28ee..37f9039bb9ca 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c | |||
| @@ -1249,6 +1249,7 @@ static int nvme_revalidate_disk(struct gendisk *disk) | |||
| 1249 | goto out; | 1249 | goto out; |
| 1250 | } | 1250 | } |
| 1251 | 1251 | ||
| 1252 | __nvme_revalidate_disk(disk, id); | ||
| 1252 | nvme_report_ns_ids(ctrl, ns->ns_id, id, eui64, nguid, &uuid); | 1253 | nvme_report_ns_ids(ctrl, ns->ns_id, id, eui64, nguid, &uuid); |
| 1253 | if (!uuid_equal(&ns->uuid, &uuid) || | 1254 | if (!uuid_equal(&ns->uuid, &uuid) || |
| 1254 | memcmp(&ns->nguid, &nguid, sizeof(ns->nguid)) || | 1255 | memcmp(&ns->nguid, &nguid, sizeof(ns->nguid)) || |
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index af075e998944..be49d0f79381 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c | |||
| @@ -2545,10 +2545,10 @@ nvme_fc_delete_association(struct nvme_fc_ctrl *ctrl) | |||
| 2545 | nvme_fc_abort_aen_ops(ctrl); | 2545 | nvme_fc_abort_aen_ops(ctrl); |
| 2546 | 2546 | ||
| 2547 | /* wait for all io that had to be aborted */ | 2547 | /* wait for all io that had to be aborted */ |
| 2548 | spin_lock_irqsave(&ctrl->lock, flags); | 2548 | spin_lock_irq(&ctrl->lock); |
| 2549 | wait_event_lock_irq(ctrl->ioabort_wait, ctrl->iocnt == 0, ctrl->lock); | 2549 | wait_event_lock_irq(ctrl->ioabort_wait, ctrl->iocnt == 0, ctrl->lock); |
| 2550 | ctrl->flags &= ~FCCTRL_TERMIO; | 2550 | ctrl->flags &= ~FCCTRL_TERMIO; |
| 2551 | spin_unlock_irqrestore(&ctrl->lock, flags); | 2551 | spin_unlock_irq(&ctrl->lock); |
| 2552 | 2552 | ||
| 2553 | nvme_fc_term_aen_ops(ctrl); | 2553 | nvme_fc_term_aen_ops(ctrl); |
| 2554 | 2554 | ||
| @@ -2734,7 +2734,7 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, | |||
| 2734 | { | 2734 | { |
| 2735 | struct nvme_fc_ctrl *ctrl; | 2735 | struct nvme_fc_ctrl *ctrl; |
| 2736 | unsigned long flags; | 2736 | unsigned long flags; |
| 2737 | int ret, idx; | 2737 | int ret, idx, retry; |
| 2738 | 2738 | ||
| 2739 | if (!(rport->remoteport.port_role & | 2739 | if (!(rport->remoteport.port_role & |
| 2740 | (FC_PORT_ROLE_NVME_DISCOVERY | FC_PORT_ROLE_NVME_TARGET))) { | 2740 | (FC_PORT_ROLE_NVME_DISCOVERY | FC_PORT_ROLE_NVME_TARGET))) { |
| @@ -2760,6 +2760,7 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, | |||
| 2760 | ctrl->rport = rport; | 2760 | ctrl->rport = rport; |
| 2761 | ctrl->dev = lport->dev; | 2761 | ctrl->dev = lport->dev; |
| 2762 | ctrl->cnum = idx; | 2762 | ctrl->cnum = idx; |
| 2763 | init_waitqueue_head(&ctrl->ioabort_wait); | ||
| 2763 | 2764 | ||
| 2764 | get_device(ctrl->dev); | 2765 | get_device(ctrl->dev); |
| 2765 | kref_init(&ctrl->ref); | 2766 | kref_init(&ctrl->ref); |
| @@ -2825,9 +2826,37 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, | |||
| 2825 | list_add_tail(&ctrl->ctrl_list, &rport->ctrl_list); | 2826 | list_add_tail(&ctrl->ctrl_list, &rport->ctrl_list); |
| 2826 | spin_unlock_irqrestore(&rport->lock, flags); | 2827 | spin_unlock_irqrestore(&rport->lock, flags); |
| 2827 | 2828 | ||
| 2828 | ret = nvme_fc_create_association(ctrl); | 2829 | /* |
| 2830 | * It's possible that transactions used to create the association | ||
| 2831 | * may fail. Examples: CreateAssociation LS or CreateIOConnection | ||
| 2832 | * LS gets dropped/corrupted/fails; or a frame gets dropped or a | ||
| 2833 | * command times out for one of the actions to init the controller | ||
| 2834 | * (Connect, Get/Set_Property, Set_Features, etc). Many of these | ||
| 2835 | * transport errors (frame drop, LS failure) inherently must kill | ||
| 2836 | * the association. The transport is coded so that any command used | ||
| 2837 | * to create the association (prior to a LIVE state transition | ||
| 2838 | * while NEW or RECONNECTING) will fail if it completes in error or | ||
| 2839 | * times out. | ||
| 2840 | * | ||
| 2841 | * As such: as the connect request was mostly likely due to a | ||
| 2842 | * udev event that discovered the remote port, meaning there is | ||
| 2843 | * not an admin or script there to restart if the connect | ||
| 2844 | * request fails, retry the initial connection creation up to | ||
| 2845 | * three times before giving up and declaring failure. | ||
| 2846 | */ | ||
| 2847 | for (retry = 0; retry < 3; retry++) { | ||
| 2848 | ret = nvme_fc_create_association(ctrl); | ||
| 2849 | if (!ret) | ||
| 2850 | break; | ||
| 2851 | } | ||
| 2852 | |||
| 2829 | if (ret) { | 2853 | if (ret) { |
| 2854 | /* couldn't schedule retry - fail out */ | ||
| 2855 | dev_err(ctrl->ctrl.device, | ||
| 2856 | "NVME-FC{%d}: Connect retry failed\n", ctrl->cnum); | ||
| 2857 | |||
| 2830 | ctrl->ctrl.opts = NULL; | 2858 | ctrl->ctrl.opts = NULL; |
| 2859 | |||
| 2831 | /* initiate nvme ctrl ref counting teardown */ | 2860 | /* initiate nvme ctrl ref counting teardown */ |
| 2832 | nvme_uninit_ctrl(&ctrl->ctrl); | 2861 | nvme_uninit_ctrl(&ctrl->ctrl); |
| 2833 | nvme_put_ctrl(&ctrl->ctrl); | 2862 | nvme_put_ctrl(&ctrl->ctrl); |
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 92a03ff5fb4d..0ebb539f3bd3 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c | |||
| @@ -571,6 +571,12 @@ static void nvme_rdma_free_queue(struct nvme_rdma_queue *queue) | |||
| 571 | if (test_and_set_bit(NVME_RDMA_Q_DELETING, &queue->flags)) | 571 | if (test_and_set_bit(NVME_RDMA_Q_DELETING, &queue->flags)) |
| 572 | return; | 572 | return; |
| 573 | 573 | ||
| 574 | if (nvme_rdma_queue_idx(queue) == 0) { | ||
| 575 | nvme_rdma_free_qe(queue->device->dev, | ||
| 576 | &queue->ctrl->async_event_sqe, | ||
| 577 | sizeof(struct nvme_command), DMA_TO_DEVICE); | ||
| 578 | } | ||
| 579 | |||
| 574 | nvme_rdma_destroy_queue_ib(queue); | 580 | nvme_rdma_destroy_queue_ib(queue); |
| 575 | rdma_destroy_id(queue->cm_id); | 581 | rdma_destroy_id(queue->cm_id); |
| 576 | } | 582 | } |
| @@ -739,8 +745,6 @@ out: | |||
| 739 | static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl, | 745 | static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl, |
| 740 | bool remove) | 746 | bool remove) |
| 741 | { | 747 | { |
| 742 | nvme_rdma_free_qe(ctrl->queues[0].device->dev, &ctrl->async_event_sqe, | ||
| 743 | sizeof(struct nvme_command), DMA_TO_DEVICE); | ||
| 744 | nvme_rdma_stop_queue(&ctrl->queues[0]); | 748 | nvme_rdma_stop_queue(&ctrl->queues[0]); |
| 745 | if (remove) { | 749 | if (remove) { |
| 746 | blk_cleanup_queue(ctrl->ctrl.admin_q); | 750 | blk_cleanup_queue(ctrl->ctrl.admin_q); |
| @@ -765,8 +769,10 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl, | |||
| 765 | 769 | ||
| 766 | if (new) { | 770 | if (new) { |
| 767 | ctrl->ctrl.admin_tagset = nvme_rdma_alloc_tagset(&ctrl->ctrl, true); | 771 | ctrl->ctrl.admin_tagset = nvme_rdma_alloc_tagset(&ctrl->ctrl, true); |
| 768 | if (IS_ERR(ctrl->ctrl.admin_tagset)) | 772 | if (IS_ERR(ctrl->ctrl.admin_tagset)) { |
| 773 | error = PTR_ERR(ctrl->ctrl.admin_tagset); | ||
| 769 | goto out_free_queue; | 774 | goto out_free_queue; |
| 775 | } | ||
| 770 | 776 | ||
| 771 | ctrl->ctrl.admin_q = blk_mq_init_queue(&ctrl->admin_tag_set); | 777 | ctrl->ctrl.admin_q = blk_mq_init_queue(&ctrl->admin_tag_set); |
| 772 | if (IS_ERR(ctrl->ctrl.admin_q)) { | 778 | if (IS_ERR(ctrl->ctrl.admin_q)) { |
| @@ -846,8 +852,10 @@ static int nvme_rdma_configure_io_queues(struct nvme_rdma_ctrl *ctrl, bool new) | |||
| 846 | 852 | ||
| 847 | if (new) { | 853 | if (new) { |
| 848 | ctrl->ctrl.tagset = nvme_rdma_alloc_tagset(&ctrl->ctrl, false); | 854 | ctrl->ctrl.tagset = nvme_rdma_alloc_tagset(&ctrl->ctrl, false); |
| 849 | if (IS_ERR(ctrl->ctrl.tagset)) | 855 | if (IS_ERR(ctrl->ctrl.tagset)) { |
| 856 | ret = PTR_ERR(ctrl->ctrl.tagset); | ||
| 850 | goto out_free_io_queues; | 857 | goto out_free_io_queues; |
| 858 | } | ||
| 851 | 859 | ||
| 852 | ctrl->ctrl.connect_q = blk_mq_init_queue(&ctrl->tag_set); | 860 | ctrl->ctrl.connect_q = blk_mq_init_queue(&ctrl->tag_set); |
| 853 | if (IS_ERR(ctrl->ctrl.connect_q)) { | 861 | if (IS_ERR(ctrl->ctrl.connect_q)) { |
| @@ -1606,12 +1614,15 @@ nvme_rdma_queue_is_ready(struct nvme_rdma_queue *queue, struct request *rq) | |||
| 1606 | /* | 1614 | /* |
| 1607 | * reconnecting state means transport disruption, which | 1615 | * reconnecting state means transport disruption, which |
| 1608 | * can take a long time and even might fail permanently, | 1616 | * can take a long time and even might fail permanently, |
| 1609 | * so we can't let incoming I/O be requeued forever. | 1617 | * fail fast to give upper layers a chance to failover. |
| 1610 | * fail it fast to allow upper layers a chance to | 1618 | * deleting state means that the ctrl will never accept |
| 1611 | * failover. | 1619 | * commands again, fail it permanently. |
| 1612 | */ | 1620 | */ |
| 1613 | if (queue->ctrl->ctrl.state == NVME_CTRL_RECONNECTING) | 1621 | if (queue->ctrl->ctrl.state == NVME_CTRL_RECONNECTING || |
| 1622 | queue->ctrl->ctrl.state == NVME_CTRL_DELETING) { | ||
| 1623 | nvme_req(rq)->status = NVME_SC_ABORT_REQ; | ||
| 1614 | return BLK_STS_IOERR; | 1624 | return BLK_STS_IOERR; |
| 1625 | } | ||
| 1615 | return BLK_STS_RESOURCE; /* try again later */ | 1626 | return BLK_STS_RESOURCE; /* try again later */ |
| 1616 | } | 1627 | } |
| 1617 | } | 1628 | } |
diff --git a/drivers/nvme/target/Makefile b/drivers/nvme/target/Makefile index fecc14f535b2..488250189c99 100644 --- a/drivers/nvme/target/Makefile +++ b/drivers/nvme/target/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | obj-$(CONFIG_NVME_TARGET) += nvmet.o | 3 | obj-$(CONFIG_NVME_TARGET) += nvmet.o |
| 3 | obj-$(CONFIG_NVME_TARGET_LOOP) += nvme-loop.o | 4 | obj-$(CONFIG_NVME_TARGET_LOOP) += nvme-loop.o |
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index 1b208beeef50..645ba7eee35d 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c | |||
| @@ -387,12 +387,21 @@ struct nvmet_ns *nvmet_ns_alloc(struct nvmet_subsys *subsys, u32 nsid) | |||
| 387 | 387 | ||
| 388 | static void __nvmet_req_complete(struct nvmet_req *req, u16 status) | 388 | static void __nvmet_req_complete(struct nvmet_req *req, u16 status) |
| 389 | { | 389 | { |
| 390 | u32 old_sqhd, new_sqhd; | ||
| 391 | u16 sqhd; | ||
| 392 | |||
| 390 | if (status) | 393 | if (status) |
| 391 | nvmet_set_status(req, status); | 394 | nvmet_set_status(req, status); |
| 392 | 395 | ||
| 393 | if (req->sq->size) | 396 | if (req->sq->size) { |
| 394 | req->sq->sqhd = (req->sq->sqhd + 1) % req->sq->size; | 397 | do { |
| 395 | req->rsp->sq_head = cpu_to_le16(req->sq->sqhd); | 398 | old_sqhd = req->sq->sqhd; |
| 399 | new_sqhd = (old_sqhd + 1) % req->sq->size; | ||
| 400 | } while (cmpxchg(&req->sq->sqhd, old_sqhd, new_sqhd) != | ||
| 401 | old_sqhd); | ||
| 402 | } | ||
| 403 | sqhd = req->sq->sqhd & 0x0000FFFF; | ||
| 404 | req->rsp->sq_head = cpu_to_le16(sqhd); | ||
| 396 | req->rsp->sq_id = cpu_to_le16(req->sq->qid); | 405 | req->rsp->sq_id = cpu_to_le16(req->sq->qid); |
| 397 | req->rsp->command_id = req->cmd->common.command_id; | 406 | req->rsp->command_id = req->cmd->common.command_id; |
| 398 | 407 | ||
diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h index 7b8e20adf760..87e429bfcd8a 100644 --- a/drivers/nvme/target/nvmet.h +++ b/drivers/nvme/target/nvmet.h | |||
| @@ -74,7 +74,7 @@ struct nvmet_sq { | |||
| 74 | struct percpu_ref ref; | 74 | struct percpu_ref ref; |
| 75 | u16 qid; | 75 | u16 qid; |
| 76 | u16 size; | 76 | u16 size; |
| 77 | u16 sqhd; | 77 | u32 sqhd; |
| 78 | struct completion free_done; | 78 | struct completion free_done; |
| 79 | struct completion confirm_done; | 79 | struct completion confirm_done; |
| 80 | }; | 80 | }; |
diff --git a/drivers/nvmem/Makefile b/drivers/nvmem/Makefile index 173140658693..6f7a77fb3ee7 100644 --- a/drivers/nvmem/Makefile +++ b/drivers/nvmem/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for nvmem drivers. | 3 | # Makefile for nvmem drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/of/Makefile b/drivers/of/Makefile index 97dc01c81438..8f19d342eed8 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-y = base.o device.o platform.o property.o | 2 | obj-y = base.o device.o platform.o property.o |
| 2 | obj-$(CONFIG_OF_DYNAMIC) += dynamic.o | 3 | obj-$(CONFIG_OF_DYNAMIC) += dynamic.o |
| 3 | obj-$(CONFIG_OF_FLATTREE) += fdt.o | 4 | obj-$(CONFIG_OF_FLATTREE) += fdt.o |
diff --git a/drivers/of/unittest-data/Makefile b/drivers/of/unittest-data/Makefile index 2d135fba94c1..3031fc2f18f6 100644 --- a/drivers/of/unittest-data/Makefile +++ b/drivers/of/unittest-data/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-y += testcases.dtb.o | 2 | obj-y += testcases.dtb.o |
| 2 | 3 | ||
| 3 | targets += testcases.dtb testcases.dtb.S | 4 | targets += testcases.dtb testcases.dtb.S |
diff --git a/drivers/of/unittest-data/overlay.dts b/drivers/of/unittest-data/overlay.dts index 9e791fcf05dd..ab5e89b5e27e 100644 --- a/drivers/of/unittest-data/overlay.dts +++ b/drivers/of/unittest-data/overlay.dts | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /dts-v1/; | 2 | /dts-v1/; |
| 2 | /plugin/; | 3 | /plugin/; |
| 3 | 4 | ||
diff --git a/drivers/of/unittest-data/overlay_bad_phandle.dts b/drivers/of/unittest-data/overlay_bad_phandle.dts index 270ee885a623..4d5b99723bad 100644 --- a/drivers/of/unittest-data/overlay_bad_phandle.dts +++ b/drivers/of/unittest-data/overlay_bad_phandle.dts | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /dts-v1/; | 2 | /dts-v1/; |
| 2 | /plugin/; | 3 | /plugin/; |
| 3 | 4 | ||
diff --git a/drivers/of/unittest-data/overlay_base.dts b/drivers/of/unittest-data/overlay_base.dts index 453d0bd83320..820b79ca378a 100644 --- a/drivers/of/unittest-data/overlay_base.dts +++ b/drivers/of/unittest-data/overlay_base.dts | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /dts-v1/; | 2 | /dts-v1/; |
| 2 | /plugin/; | 3 | /plugin/; |
| 3 | 4 | ||
diff --git a/drivers/of/unittest-data/testcases.dts b/drivers/of/unittest-data/testcases.dts index 12f7c3d649c8..ce49463d9d32 100644 --- a/drivers/of/unittest-data/testcases.dts +++ b/drivers/of/unittest-data/testcases.dts | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /dts-v1/; | 2 | /dts-v1/; |
| 2 | / { | 3 | / { |
| 3 | testcase-data { | 4 | testcase-data { |
diff --git a/drivers/of/unittest-data/tests-interrupts.dtsi b/drivers/of/unittest-data/tests-interrupts.dtsi index da4695f60351..ec175e800725 100644 --- a/drivers/of/unittest-data/tests-interrupts.dtsi +++ b/drivers/of/unittest-data/tests-interrupts.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | / { | 3 | / { |
| 3 | testcase-data { | 4 | testcase-data { |
diff --git a/drivers/of/unittest-data/tests-match.dtsi b/drivers/of/unittest-data/tests-match.dtsi index c9e541129534..1fd3b21313f5 100644 --- a/drivers/of/unittest-data/tests-match.dtsi +++ b/drivers/of/unittest-data/tests-match.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | / { | 3 | / { |
| 3 | testcase-data { | 4 | testcase-data { |
diff --git a/drivers/of/unittest-data/tests-overlay.dtsi b/drivers/of/unittest-data/tests-overlay.dtsi index 02ba56c20fe1..7b8001ab9f3a 100644 --- a/drivers/of/unittest-data/tests-overlay.dtsi +++ b/drivers/of/unittest-data/tests-overlay.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | / { | 3 | / { |
| 3 | testcase-data { | 4 | testcase-data { |
diff --git a/drivers/of/unittest-data/tests-phandle.dtsi b/drivers/of/unittest-data/tests-phandle.dtsi index 5b1527e8a7fb..3c2f09e56b61 100644 --- a/drivers/of/unittest-data/tests-phandle.dtsi +++ b/drivers/of/unittest-data/tests-phandle.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | / { | 3 | / { |
| 3 | aliases { | 4 | aliases { |
diff --git a/drivers/of/unittest-data/tests-platform.dtsi b/drivers/of/unittest-data/tests-platform.dtsi index a0c93822aee3..fa39611071b3 100644 --- a/drivers/of/unittest-data/tests-platform.dtsi +++ b/drivers/of/unittest-data/tests-platform.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | / { | 3 | / { |
| 3 | testcase-data { | 4 | testcase-data { |
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 29a35cb1da64..168ef0bbabde 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Self tests for device tree subsystem | 3 | * Self tests for device tree subsystem |
| 3 | */ | 4 | */ |
diff --git a/drivers/oprofile/nmi_timer_int.c b/drivers/oprofile/nmi_timer_int.c index e65a576e4032..f343bd96609a 100644 --- a/drivers/oprofile/nmi_timer_int.c +++ b/drivers/oprofile/nmi_timer_int.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /** | 2 | /** |
| 2 | * @file nmi_timer_int.c | 3 | * @file nmi_timer_int.c |
| 3 | * | 4 | * |
diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c index d5b2732b1b81..4b150a754890 100644 --- a/drivers/oprofile/oprofile_perf.c +++ b/drivers/oprofile/oprofile_perf.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright 2010 ARM Ltd. | 3 | * Copyright 2010 ARM Ltd. |
| 3 | * Copyright 2012 Advanced Micro Devices, Inc., Robert Richter | 4 | * Copyright 2012 Advanced Micro Devices, Inc., Robert Richter |
diff --git a/drivers/parisc/Makefile b/drivers/parisc/Makefile index f95cab57133a..3cd5e6cb8478 100644 --- a/drivers/parisc/Makefile +++ b/drivers/parisc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for most of the non-PCI devices in PA-RISC machines | 3 | # Makefile for most of the non-PCI devices in PA-RISC machines |
| 3 | # | 4 | # |
diff --git a/drivers/parisc/iommu-helpers.h b/drivers/parisc/iommu-helpers.h index e56f1569f6c3..0905be256de0 100644 --- a/drivers/parisc/iommu-helpers.h +++ b/drivers/parisc/iommu-helpers.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/prefetch.h> | 2 | #include <linux/prefetch.h> |
| 2 | 3 | ||
| 3 | /** | 4 | /** |
diff --git a/drivers/parport/Makefile b/drivers/parport/Makefile index 696b8d4ca887..6fa41f8173b6 100644 --- a/drivers/parport/Makefile +++ b/drivers/parport/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel Parallel port device drivers. | 3 | # Makefile for the kernel Parallel port device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/parport/ieee1284_ops.c b/drivers/parport/ieee1284_ops.c index a959224d011b..5d41dda6da4e 100644 --- a/drivers/parport/ieee1284_ops.c +++ b/drivers/parport/ieee1284_ops.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* IEEE-1284 operations for parport. | 2 | /* IEEE-1284 operations for parport. |
| 2 | * | 3 | * |
| 3 | * This file is for generic IEEE 1284 operations. The idea is that | 4 | * This file is for generic IEEE 1284 operations. The idea is that |
diff --git a/drivers/parport/multiface.h b/drivers/parport/multiface.h index 56769dd5d315..6513a44b9ca7 100644 --- a/drivers/parport/multiface.h +++ b/drivers/parport/multiface.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _MULTIFACE_H_ | 2 | #ifndef _MULTIFACE_H_ |
| 2 | #define _MULTIFACE_H_ | 3 | #define _MULTIFACE_H_ |
| 3 | 4 | ||
diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c index 4d1d6eaf333d..e035174ba205 100644 --- a/drivers/parport/probe.c +++ b/drivers/parport/probe.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Parallel port device probing code | 3 | * Parallel port device probing code |
| 3 | * | 4 | * |
diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c index 8ee44a104ac4..48804049d697 100644 --- a/drivers/parport/procfs.c +++ b/drivers/parport/procfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* Sysctl interface for parport devices. | 2 | /* Sysctl interface for parport devices. |
| 2 | * | 3 | * |
| 3 | * Authors: David Campbell | 4 | * Authors: David Campbell |
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 66a21acad952..80adbdbcecce 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the PCI bus specific drivers. | 3 | # Makefile for the PCI bus specific drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/pci/dwc/Makefile b/drivers/pci/dwc/Makefile index c61be9738cce..e73661182da0 100644 --- a/drivers/pci/dwc/Makefile +++ b/drivers/pci/dwc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_PCIE_DW) += pcie-designware.o | 2 | obj-$(CONFIG_PCIE_DW) += pcie-designware.o |
| 2 | obj-$(CONFIG_PCIE_DW_HOST) += pcie-designware-host.o | 3 | obj-$(CONFIG_PCIE_DW_HOST) += pcie-designware-host.o |
| 3 | obj-$(CONFIG_PCIE_DW_EP) += pcie-designware-ep.o | 4 | obj-$(CONFIG_PCIE_DW_EP) += pcie-designware-ep.o |
diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile index 12382785e02a..95f5b80ca52a 100644 --- a/drivers/pci/host/Makefile +++ b/drivers/pci/host/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_PCI_FTPCI100) += pci-ftpci100.o | 2 | obj-$(CONFIG_PCI_FTPCI100) += pci-ftpci100.o |
| 2 | obj-$(CONFIG_PCI_HYPERV) += pci-hyperv.o | 3 | obj-$(CONFIG_PCI_HYPERV) += pci-hyperv.o |
| 3 | obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o | 4 | obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o |
diff --git a/drivers/pci/host/pci-ftpci100.c b/drivers/pci/host/pci-ftpci100.c index 96028f01bc90..4ea7d2ebcc5c 100644 --- a/drivers/pci/host/pci-ftpci100.c +++ b/drivers/pci/host/pci-ftpci100.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Support for Faraday Technology FTPC100 PCI Controller | 3 | * Support for Faraday Technology FTPC100 PCI Controller |
| 3 | * | 4 | * |
diff --git a/drivers/pci/host/pcie-tango.c b/drivers/pci/host/pcie-tango.c index 6bbb81f06a53..95049de4131c 100644 --- a/drivers/pci/host/pcie-tango.c +++ b/drivers/pci/host/pcie-tango.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/pci-ecam.h> | 2 | #include <linux/pci-ecam.h> |
| 2 | #include <linux/delay.h> | 3 | #include <linux/delay.h> |
| 3 | #include <linux/of.h> | 4 | #include <linux/of.h> |
diff --git a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile index e33cdda45a4d..7e3331603714 100644 --- a/drivers/pci/hotplug/Makefile +++ b/drivers/pci/hotplug/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux kernel pci hotplug controller drivers. | 3 | # Makefile for the Linux kernel pci hotplug controller drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/pci/htirq.c b/drivers/pci/htirq.c index 7eb4109a3df4..bb88c26f5144 100644 --- a/drivers/pci/htirq.c +++ b/drivers/pci/htirq.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * File: htirq.c | 3 | * File: htirq.c |
| 3 | * Purpose: Hypertransport Interrupt Capability | 4 | * Purpose: Hypertransport Interrupt Capability |
diff --git a/drivers/pci/irq.c b/drivers/pci/irq.c index 83d30953ce19..10929cd43d5d 100644 --- a/drivers/pci/irq.c +++ b/drivers/pci/irq.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * PCI IRQ handling code | 3 | * PCI IRQ handling code |
| 3 | * | 4 | * |
diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c index 7e9e79575d93..a961a71d950f 100644 --- a/drivers/pci/pci-label.c +++ b/drivers/pci/pci-label.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Purpose: Export the firmware instance and label associated with | 3 | * Purpose: Export the firmware instance and label associated with |
| 3 | * a pci device to sysfs | 4 | * a pci device to sysfs |
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 8e075ea2743e..00fa4278c1f4 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * drivers/pci/pci-sysfs.c | 3 | * drivers/pci/pci-sysfs.c |
| 3 | * | 4 | * |
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index a6560c9baa52..fdb02c1f94bb 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DRIVERS_PCI_H | 2 | #ifndef DRIVERS_PCI_H |
| 2 | #define DRIVERS_PCI_H | 3 | #define DRIVERS_PCI_H |
| 3 | 4 | ||
diff --git a/drivers/pci/pcie/Makefile b/drivers/pci/pcie/Makefile index 36e35ea8fde7..223e4c34c29a 100644 --- a/drivers/pci/pcie/Makefile +++ b/drivers/pci/pcie/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for PCI-Express PORT Driver | 3 | # Makefile for PCI-Express PORT Driver |
| 3 | # | 4 | # |
diff --git a/drivers/pci/pcie/aer/Makefile b/drivers/pci/pcie/aer/Makefile index 2cba67510dc8..09bd890875a3 100644 --- a/drivers/pci/pcie/aer/Makefile +++ b/drivers/pci/pcie/aer/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for PCI-Express Root Port Advanced Error Reporting Driver | 3 | # Makefile for PCI-Express Root Port Advanced Error Reporting Driver |
| 3 | # | 4 | # |
diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h index d51e4a57b190..5449e5ce139d 100644 --- a/drivers/pci/pcie/aer/aerdrv.h +++ b/drivers/pci/pcie/aer/aerdrv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 2006 Intel Corp. | 3 | * Copyright (C) 2006 Intel Corp. |
| 3 | * Tom Long Nguyen (tom.l.nguyen@intel.com) | 4 | * Tom Long Nguyen (tom.l.nguyen@intel.com) |
diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c index 01906576ab91..b2019440e882 100644 --- a/drivers/pci/pcie/aer/aerdrv_acpi.c +++ b/drivers/pci/pcie/aer/aerdrv_acpi.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Access ACPI _OSC method | 3 | * Access ACPI _OSC method |
| 3 | * | 4 | * |
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 1dfa10cc566b..83e4a892b14b 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * File: drivers/pci/pcie/aspm.c | 3 | * File: drivers/pci/pcie/aspm.c |
| 3 | * Enabling PCIe link L0s/L1 state and Clock Power Management | 4 | * Enabling PCIe link L0s/L1 state and Clock Power Management |
diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h index 4334fd5d7de9..a854bc569117 100644 --- a/drivers/pci/pcie/portdrv.h +++ b/drivers/pci/pcie/portdrv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * File: portdrv.h | 3 | * File: portdrv.h |
| 3 | * Purpose: PCI Express Port Bus Driver's Internal Data Structures | 4 | * Purpose: PCI Express Port Bus Driver's Internal Data Structures |
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c index 313a21df1692..ebc9d45bd731 100644 --- a/drivers/pci/pcie/portdrv_core.c +++ b/drivers/pci/pcie/portdrv_core.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * File: portdrv_core.c | 3 | * File: portdrv_core.c |
| 3 | * Purpose: PCI Express Port Bus Driver's Core Functions | 4 | * Purpose: PCI Express Port Bus Driver's Core Functions |
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c index 083276e03c38..68c389c7b975 100644 --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * File: portdrv_pci.c | 3 | * File: portdrv_pci.c |
| 3 | * Purpose: PCI Express Port Bus Driver | 4 | * Purpose: PCI Express Port Bus Driver |
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 098360d7ff81..58a662e3c4a6 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Procfs interface for the PCI bus. | 3 | * Procfs interface for the PCI bus. |
| 3 | * | 4 | * |
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index a4d33619a7bb..911b3b65c8b2 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * This file contains work-arounds for many known PCI hardware | 3 | * This file contains work-arounds for many known PCI hardware |
| 3 | * bugs. Devices present only on certain architectures (host | 4 | * bugs. Devices present only on certain architectures (host |
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index e576e1a8d978..c039149cacb0 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * drivers/pci/setup-res.c | 3 | * drivers/pci/setup-res.c |
| 3 | * | 4 | * |
diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c index 9bf993e1f71e..83efa001c2e7 100644 --- a/drivers/pci/syscall.c +++ b/drivers/pci/syscall.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * pci_syscall.c | 3 | * pci_syscall.c |
| 3 | * | 4 | * |
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index 27e94b30cf96..e7dae16b9a43 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel pcmcia subsystem (c/o David Hinds) | 3 | # Makefile for the kernel pcmcia subsystem (c/o David Hinds) |
| 3 | # | 4 | # |
diff --git a/drivers/pcmcia/bcm63xx_pcmcia.h b/drivers/pcmcia/bcm63xx_pcmcia.h index ed957399d863..2122c59a1c4a 100644 --- a/drivers/pcmcia/bcm63xx_pcmcia.h +++ b/drivers/pcmcia/bcm63xx_pcmcia.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef BCM63XX_PCMCIA_H_ | 2 | #ifndef BCM63XX_PCMCIA_H_ |
| 2 | #define BCM63XX_PCMCIA_H_ | 3 | #define BCM63XX_PCMCIA_H_ |
| 3 | 4 | ||
diff --git a/drivers/pcmcia/i82092aa.h b/drivers/pcmcia/i82092aa.h index 8836d393ad02..fabe08c3e33d 100644 --- a/drivers/pcmcia/i82092aa.h +++ b/drivers/pcmcia/i82092aa.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _INCLUDE_GUARD_i82092aa_H_ | 2 | #ifndef _INCLUDE_GUARD_i82092aa_H_ |
| 2 | #define _INCLUDE_GUARD_i82092aa_H_ | 3 | #define _INCLUDE_GUARD_i82092aa_H_ |
| 3 | 4 | ||
diff --git a/drivers/pcmcia/m32r_cfc.h b/drivers/pcmcia/m32r_cfc.h index f558e1adf954..05fec98617d0 100644 --- a/drivers/pcmcia/m32r_cfc.h +++ b/drivers/pcmcia/m32r_cfc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 2001 by Hiroyuki Kondo | 3 | * Copyright (C) 2001 by Hiroyuki Kondo |
| 3 | */ | 4 | */ |
diff --git a/drivers/pcmcia/m32r_pcc.h b/drivers/pcmcia/m32r_pcc.h index f95c58563bc8..d99ad3864ff3 100644 --- a/drivers/pcmcia/m32r_pcc.h +++ b/drivers/pcmcia/m32r_pcc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 2001 by Hiroyuki Kondo | 3 | * Copyright (C) 2001 by Hiroyuki Kondo |
| 3 | */ | 4 | */ |
diff --git a/drivers/pcmcia/pd6729.h b/drivers/pcmcia/pd6729.h index c8e84bdece38..605cc2ccf9c5 100644 --- a/drivers/pcmcia/pd6729.h +++ b/drivers/pcmcia/pd6729.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _INCLUDE_GUARD_PD6729_H_ | 2 | #ifndef _INCLUDE_GUARD_PD6729_H_ |
| 2 | #define _INCLUDE_GUARD_PD6729_H_ | 3 | #define _INCLUDE_GUARD_PD6729_H_ |
| 3 | 4 | ||
diff --git a/drivers/pcmcia/sa1100_assabet.c b/drivers/pcmcia/sa1100_assabet.c index 71ace6910d7e..78ad2bba76db 100644 --- a/drivers/pcmcia/sa1100_assabet.c +++ b/drivers/pcmcia/sa1100_assabet.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * drivers/pcmcia/sa1100_assabet.c | 3 | * drivers/pcmcia/sa1100_assabet.c |
| 3 | * | 4 | * |
diff --git a/drivers/pcmcia/sa1100_cerf.c b/drivers/pcmcia/sa1100_cerf.c index c3f67363f6a1..2a54081d161d 100644 --- a/drivers/pcmcia/sa1100_cerf.c +++ b/drivers/pcmcia/sa1100_cerf.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * drivers/pcmcia/sa1100_cerf.c | 3 | * drivers/pcmcia/sa1100_cerf.c |
| 3 | * | 4 | * |
diff --git a/drivers/pcmcia/sa1100_generic.h b/drivers/pcmcia/sa1100_generic.h index adb08dbc723f..a5f1f1dd63cb 100644 --- a/drivers/pcmcia/sa1100_generic.h +++ b/drivers/pcmcia/sa1100_generic.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include "soc_common.h" | 2 | #include "soc_common.h" |
| 2 | #include "sa11xx_base.h" | 3 | #include "sa11xx_base.h" |
| 3 | 4 | ||
diff --git a/drivers/pcmcia/sa1100_h3600.c b/drivers/pcmcia/sa1100_h3600.c index 431d8b07cbaf..aebf9a66fdde 100644 --- a/drivers/pcmcia/sa1100_h3600.c +++ b/drivers/pcmcia/sa1100_h3600.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * drivers/pcmcia/sa1100_h3600.c | 3 | * drivers/pcmcia/sa1100_h3600.c |
| 3 | * | 4 | * |
diff --git a/drivers/pcmcia/sa1100_shannon.c b/drivers/pcmcia/sa1100_shannon.c index b07a2dc3296e..0e52a575986e 100644 --- a/drivers/pcmcia/sa1100_shannon.c +++ b/drivers/pcmcia/sa1100_shannon.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * drivers/pcmcia/sa1100_shannon.c | 3 | * drivers/pcmcia/sa1100_shannon.c |
| 3 | * | 4 | * |
diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c index 73fd37968b6a..7ce65bb23a8e 100644 --- a/drivers/pcmcia/sa1100_simpad.c +++ b/drivers/pcmcia/sa1100_simpad.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * drivers/pcmcia/sa1100_simpad.c | 3 | * drivers/pcmcia/sa1100_simpad.c |
| 3 | * | 4 | * |
diff --git a/drivers/pcmcia/sa1111_generic.h b/drivers/pcmcia/sa1111_generic.h index e74ecfdc1b26..c01571d46982 100644 --- a/drivers/pcmcia/sa1111_generic.h +++ b/drivers/pcmcia/sa1111_generic.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include "soc_common.h" | 2 | #include "soc_common.h" |
| 2 | #include "sa11xx_base.h" | 3 | #include "sa11xx_base.h" |
| 3 | 4 | ||
diff --git a/drivers/pcmcia/sa1111_jornada720.c b/drivers/pcmcia/sa1111_jornada720.c index 480a3ede27c8..3d4ca87ca76c 100644 --- a/drivers/pcmcia/sa1111_jornada720.c +++ b/drivers/pcmcia/sa1111_jornada720.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * drivers/pcmcia/sa1100_jornada720.c | 3 | * drivers/pcmcia/sa1100_jornada720.c |
| 3 | * | 4 | * |
diff --git a/drivers/pcmcia/sa1111_neponset.c b/drivers/pcmcia/sa1111_neponset.c index 019c395eb4bf..0ccf05a28a4b 100644 --- a/drivers/pcmcia/sa1111_neponset.c +++ b/drivers/pcmcia/sa1111_neponset.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * linux/drivers/pcmcia/sa1100_neponset.c | 3 | * linux/drivers/pcmcia/sa1100_neponset.c |
| 3 | * | 4 | * |
diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h index 3f3625805353..b7f993f1bbd0 100644 --- a/drivers/pcmcia/soc_common.h +++ b/drivers/pcmcia/soc_common.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * linux/drivers/pcmcia/soc_common.h | 3 | * linux/drivers/pcmcia/soc_common.h |
| 3 | * | 4 | * |
diff --git a/drivers/pcmcia/yenta_socket.h b/drivers/pcmcia/yenta_socket.h index 4e75e9e258cd..efeed19e28c7 100644 --- a/drivers/pcmcia/yenta_socket.h +++ b/drivers/pcmcia/yenta_socket.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __YENTA_H | 2 | #ifndef __YENTA_H |
| 2 | #define __YENTA_H | 3 | #define __YENTA_H |
| 3 | 4 | ||
diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile index 6420bd4394d5..9402dc8ff22c 100644 --- a/drivers/perf/Makefile +++ b/drivers/perf/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_ARM_PMU) += arm_pmu.o arm_pmu_platform.o | 2 | obj-$(CONFIG_ARM_PMU) += arm_pmu.o arm_pmu_platform.o |
| 2 | obj-$(CONFIG_ARM_PMU_ACPI) += arm_pmu_acpi.o | 3 | obj-$(CONFIG_ARM_PMU_ACPI) += arm_pmu_acpi.o |
| 3 | obj-$(CONFIG_QCOM_L2_PMU) += qcom_l2_pmu.o | 4 | obj-$(CONFIG_QCOM_L2_PMU) += qcom_l2_pmu.o |
diff --git a/drivers/perf/arm_pmu_platform.c b/drivers/perf/arm_pmu_platform.c index 4eafa7a42e52..4428852e1da1 100644 --- a/drivers/perf/arm_pmu_platform.c +++ b/drivers/perf/arm_pmu_platform.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * platform_device probing code for ARM performance counters. | 3 | * platform_device probing code for ARM performance counters. |
| 3 | * | 4 | * |
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile index 3a52dcb09566..84e3bd9c5665 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the phy drivers. | 3 | # Makefile for the phy drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/phy/broadcom/Makefile b/drivers/phy/broadcom/Makefile index 4eb82ec8d491..fdd9ec8fd70b 100644 --- a/drivers/phy/broadcom/Makefile +++ b/drivers/phy/broadcom/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_PHY_CYGNUS_PCIE) += phy-bcm-cygnus-pcie.o | 2 | obj-$(CONFIG_PHY_CYGNUS_PCIE) += phy-bcm-cygnus-pcie.o |
| 2 | obj-$(CONFIG_BCM_KONA_USB2_PHY) += phy-bcm-kona-usb2.o | 3 | obj-$(CONFIG_BCM_KONA_USB2_PHY) += phy-bcm-kona-usb2.o |
| 3 | obj-$(CONFIG_PHY_BCM_NS_USB2) += phy-bcm-ns-usb2.o | 4 | obj-$(CONFIG_PHY_BCM_NS_USB2) += phy-bcm-ns-usb2.o |
diff --git a/drivers/phy/marvell/Makefile b/drivers/phy/marvell/Makefile index 0cf6a7cbaf9f..5c3ec5d10e0d 100644 --- a/drivers/phy/marvell/Makefile +++ b/drivers/phy/marvell/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_ARMADA375_USBCLUSTER_PHY) += phy-armada375-usb2.o | 2 | obj-$(CONFIG_ARMADA375_USBCLUSTER_PHY) += phy-armada375-usb2.o |
| 2 | obj-$(CONFIG_PHY_BERLIN_SATA) += phy-berlin-sata.o | 3 | obj-$(CONFIG_PHY_BERLIN_SATA) += phy-berlin-sata.o |
| 3 | obj-$(CONFIG_PHY_BERLIN_USB) += phy-berlin-usb.o | 4 | obj-$(CONFIG_PHY_BERLIN_USB) += phy-berlin-usb.o |
diff --git a/drivers/phy/qualcomm/Makefile b/drivers/phy/qualcomm/Makefile index 2e183d7695fd..9abb7899762a 100644 --- a/drivers/phy/qualcomm/Makefile +++ b/drivers/phy/qualcomm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_PHY_QCOM_APQ8064_SATA) += phy-qcom-apq8064-sata.o | 2 | obj-$(CONFIG_PHY_QCOM_APQ8064_SATA) += phy-qcom-apq8064-sata.o |
| 2 | obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA) += phy-qcom-ipq806x-sata.o | 3 | obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA) += phy-qcom-ipq806x-sata.o |
| 3 | obj-$(CONFIG_PHY_QCOM_QMP) += phy-qcom-qmp.o | 4 | obj-$(CONFIG_PHY_QCOM_QMP) += phy-qcom-qmp.o |
diff --git a/drivers/phy/rockchip/Makefile b/drivers/phy/rockchip/Makefile index bd0acdf38e0f..7f149d989046 100644 --- a/drivers/phy/rockchip/Makefile +++ b/drivers/phy/rockchip/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_PHY_ROCKCHIP_DP) += phy-rockchip-dp.o | 2 | obj-$(CONFIG_PHY_ROCKCHIP_DP) += phy-rockchip-dp.o |
| 2 | obj-$(CONFIG_PHY_ROCKCHIP_EMMC) += phy-rockchip-emmc.o | 3 | obj-$(CONFIG_PHY_ROCKCHIP_EMMC) += phy-rockchip-emmc.o |
| 3 | obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB2) += phy-rockchip-inno-usb2.o | 4 | obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB2) += phy-rockchip-inno-usb2.o |
diff --git a/drivers/phy/samsung/Makefile b/drivers/phy/samsung/Makefile index 20d7f2424772..db9b1aa0de6e 100644 --- a/drivers/phy/samsung/Makefile +++ b/drivers/phy/samsung/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o | 2 | obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o |
| 2 | obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o | 3 | obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o |
| 3 | obj-$(CONFIG_PHY_EXYNOS_PCIE) += phy-exynos-pcie.o | 4 | obj-$(CONFIG_PHY_EXYNOS_PCIE) += phy-exynos-pcie.o |
diff --git a/drivers/phy/ti/Makefile b/drivers/phy/ti/Makefile index 0cc3a1a557a3..9f361756eaf2 100644 --- a/drivers/phy/ti/Makefile +++ b/drivers/phy/ti/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_PHY_DA8XX_USB) += phy-da8xx-usb.o | 2 | obj-$(CONFIG_PHY_DA8XX_USB) += phy-da8xx-usb.o |
| 2 | obj-$(CONFIG_PHY_DM816X_USB) += phy-dm816x-usb.o | 3 | obj-$(CONFIG_PHY_DM816X_USB) += phy-dm816x-usb.o |
| 3 | obj-$(CONFIG_OMAP_CONTROL_PHY) += phy-omap-control.o | 4 | obj-$(CONFIG_OMAP_CONTROL_PHY) += phy-omap-control.o |
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index c16e27900dbb..d0d4844f8022 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # generic pinmux support | 2 | # generic pinmux support |
| 2 | 3 | ||
| 3 | subdir-ccflags-$(CONFIG_DEBUG_PINCTRL) += -DDEBUG | 4 | subdir-ccflags-$(CONFIG_DEBUG_PINCTRL) += -DDEBUG |
diff --git a/drivers/pinctrl/bcm/Makefile b/drivers/pinctrl/bcm/Makefile index 2a65111f3c70..80ceb9dae944 100644 --- a/drivers/pinctrl/bcm/Makefile +++ b/drivers/pinctrl/bcm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Broadcom pinctrl support | 2 | # Broadcom pinctrl support |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_PINCTRL_BCM281XX) += pinctrl-bcm281xx.o | 4 | obj-$(CONFIG_PINCTRL_BCM281XX) += pinctrl-bcm281xx.o |
diff --git a/drivers/pinctrl/freescale/Makefile b/drivers/pinctrl/freescale/Makefile index 525a5ff5dcb4..19bb9a55a567 100644 --- a/drivers/pinctrl/freescale/Makefile +++ b/drivers/pinctrl/freescale/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Freescale pin control drivers | 2 | # Freescale pin control drivers |
| 2 | obj-$(CONFIG_PINCTRL_IMX) += pinctrl-imx.o | 3 | obj-$(CONFIG_PINCTRL_IMX) += pinctrl-imx.o |
| 3 | obj-$(CONFIG_PINCTRL_IMX1_CORE) += pinctrl-imx1-core.o | 4 | obj-$(CONFIG_PINCTRL_IMX1_CORE) += pinctrl-imx1-core.o |
diff --git a/drivers/pinctrl/intel/Makefile b/drivers/pinctrl/intel/Makefile index c12874da5992..624d367caa09 100644 --- a/drivers/pinctrl/intel/Makefile +++ b/drivers/pinctrl/intel/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Intel pin control drivers | 2 | # Intel pin control drivers |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_PINCTRL_BAYTRAIL) += pinctrl-baytrail.o | 4 | obj-$(CONFIG_PINCTRL_BAYTRAIL) += pinctrl-baytrail.o |
diff --git a/drivers/pinctrl/mediatek/Makefile b/drivers/pinctrl/mediatek/Makefile index e59c613d4ddd..10d90140a38a 100644 --- a/drivers/pinctrl/mediatek/Makefile +++ b/drivers/pinctrl/mediatek/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Core | 2 | # Core |
| 2 | obj-y += pinctrl-mtk-common.o | 3 | obj-y += pinctrl-mtk-common.o |
| 3 | 4 | ||
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-mt6397.h b/drivers/pinctrl/mediatek/pinctrl-mtk-mt6397.h index 4eb98ddb40a4..17df4cfbde4e 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-mt6397.h +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-mt6397.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __PINCTRL_MTK_MT6397_H | 2 | #ifndef __PINCTRL_MTK_MT6397_H |
| 2 | #define __PINCTRL_MTK_MT6397_H | 3 | #define __PINCTRL_MTK_MT6397_H |
| 3 | 4 | ||
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-mt8127.h b/drivers/pinctrl/mediatek/pinctrl-mtk-mt8127.h index 212559c147f8..850483d7d9be 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-mt8127.h +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-mt8127.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __PINCTRL_MTK_MT8127_H | 2 | #ifndef __PINCTRL_MTK_MT8127_H |
| 2 | #define __PINCTRL_MTK_MT8127_H | 3 | #define __PINCTRL_MTK_MT8127_H |
| 3 | 4 | ||
diff --git a/drivers/pinctrl/mvebu/Makefile b/drivers/pinctrl/mvebu/Makefile index 5b03fd55e28d..cd082dca4482 100644 --- a/drivers/pinctrl/mvebu/Makefile +++ b/drivers/pinctrl/mvebu/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_PINCTRL_MVEBU) += pinctrl-mvebu.o | 2 | obj-$(CONFIG_PINCTRL_MVEBU) += pinctrl-mvebu.o |
| 2 | obj-$(CONFIG_PINCTRL_DOVE) += pinctrl-dove.o | 3 | obj-$(CONFIG_PINCTRL_DOVE) += pinctrl-dove.o |
| 3 | obj-$(CONFIG_PINCTRL_KIRKWOOD) += pinctrl-kirkwood.o | 4 | obj-$(CONFIG_PINCTRL_KIRKWOOD) += pinctrl-kirkwood.o |
diff --git a/drivers/pinctrl/nomadik/Makefile b/drivers/pinctrl/nomadik/Makefile index 30b27f18cd52..bf8b7517ee4a 100644 --- a/drivers/pinctrl/nomadik/Makefile +++ b/drivers/pinctrl/nomadik/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Nomadik family pin control drivers | 2 | # Nomadik family pin control drivers |
| 2 | obj-$(CONFIG_PINCTRL_ABX500) += pinctrl-abx500.o | 3 | obj-$(CONFIG_PINCTRL_ABX500) += pinctrl-abx500.o |
| 3 | obj-$(CONFIG_PINCTRL_AB8500) += pinctrl-ab8500.o | 4 | obj-$(CONFIG_PINCTRL_AB8500) += pinctrl-ab8500.o |
diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.h b/drivers/pinctrl/nomadik/pinctrl-abx500.h index 2beef3bfe9ca..43f9b718a8ef 100644 --- a/drivers/pinctrl/nomadik/pinctrl-abx500.h +++ b/drivers/pinctrl/nomadik/pinctrl-abx500.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef PINCTRL_PINCTRL_ABx500_H | 2 | #ifndef PINCTRL_PINCTRL_ABx500_H |
| 2 | #define PINCTRL_PINCTRL_ABx500_H | 3 | #define PINCTRL_PINCTRL_ABx500_H |
| 3 | 4 | ||
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c b/drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c index af4814479eb0..726c0b5501fa 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/pinctrl/pinctrl.h> | 3 | #include <linux/pinctrl/pinctrl.h> |
| 3 | #include "pinctrl-nomadik.h" | 4 | #include "pinctrl-nomadik.h" |
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik-db8540.c b/drivers/pinctrl/nomadik/pinctrl-nomadik-db8540.c index 2860eafd1b42..ae3ac7b799a6 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik-db8540.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik-db8540.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/pinctrl/pinctrl.h> | 3 | #include <linux/pinctrl/pinctrl.h> |
| 3 | #include "pinctrl-nomadik.h" | 4 | #include "pinctrl-nomadik.h" |
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c b/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c index e852048c4c04..7e814764da7d 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/pinctrl/pinctrl.h> | 3 | #include <linux/pinctrl/pinctrl.h> |
| 3 | #include "pinctrl-nomadik.h" | 4 | #include "pinctrl-nomadik.h" |
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.h b/drivers/pinctrl/nomadik/pinctrl-nomadik.h index 30bba2a75a58..ae0bac06639f 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik.h +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef PINCTRL_PINCTRL_NOMADIK_H | 2 | #ifndef PINCTRL_PINCTRL_NOMADIK_H |
| 2 | #define PINCTRL_PINCTRL_NOMADIK_H | 3 | #define PINCTRL_PINCTRL_NOMADIK_H |
| 3 | 4 | ||
diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c index 3f6b34febbf1..433af328d981 100644 --- a/drivers/pinctrl/pinctrl-amd.c +++ b/drivers/pinctrl/pinctrl-amd.c | |||
| @@ -534,8 +534,16 @@ static irqreturn_t amd_gpio_irq_handler(int irq, void *dev_id) | |||
| 534 | continue; | 534 | continue; |
| 535 | irq = irq_find_mapping(gc->irqdomain, irqnr + i); | 535 | irq = irq_find_mapping(gc->irqdomain, irqnr + i); |
| 536 | generic_handle_irq(irq); | 536 | generic_handle_irq(irq); |
| 537 | /* Clear interrupt */ | 537 | |
| 538 | /* Clear interrupt. | ||
| 539 | * We must read the pin register again, in case the | ||
| 540 | * value was changed while executing | ||
| 541 | * generic_handle_irq() above. | ||
| 542 | */ | ||
| 543 | raw_spin_lock_irqsave(&gpio_dev->lock, flags); | ||
| 544 | regval = readl(regs + i); | ||
| 538 | writel(regval, regs + i); | 545 | writel(regval, regs + i); |
| 546 | raw_spin_unlock_irqrestore(&gpio_dev->lock, flags); | ||
| 539 | ret = IRQ_HANDLED; | 547 | ret = IRQ_HANDLED; |
| 540 | } | 548 | } |
| 541 | } | 549 | } |
diff --git a/drivers/pinctrl/pinctrl-coh901.h b/drivers/pinctrl/pinctrl-coh901.h index 87294222583e..ba2678665168 100644 --- a/drivers/pinctrl/pinctrl-coh901.h +++ b/drivers/pinctrl/pinctrl-coh901.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | int u300_gpio_config_get(struct gpio_chip *chip, | 2 | int u300_gpio_config_get(struct gpio_chip *chip, |
| 2 | unsigned offset, | 3 | unsigned offset, |
| 3 | unsigned long *config); | 4 | unsigned long *config); |
diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c index 3e40d4245512..9c950bbf07ba 100644 --- a/drivers/pinctrl/pinctrl-mcp23s08.c +++ b/drivers/pinctrl/pinctrl-mcp23s08.c | |||
| @@ -407,10 +407,10 @@ static int mcp23s08_get(struct gpio_chip *chip, unsigned offset) | |||
| 407 | ret = mcp_read(mcp, MCP_GPIO, &status); | 407 | ret = mcp_read(mcp, MCP_GPIO, &status); |
| 408 | if (ret < 0) | 408 | if (ret < 0) |
| 409 | status = 0; | 409 | status = 0; |
| 410 | else | 410 | else { |
| 411 | mcp->cached_gpio = status; | ||
| 411 | status = !!(status & (1 << offset)); | 412 | status = !!(status & (1 << offset)); |
| 412 | 413 | } | |
| 413 | mcp->cached_gpio = status; | ||
| 414 | 414 | ||
| 415 | mutex_unlock(&mcp->lock); | 415 | mutex_unlock(&mcp->lock); |
| 416 | return status; | 416 | return status; |
diff --git a/drivers/pinctrl/qcom/Makefile b/drivers/pinctrl/qcom/Makefile index 06c8b2ace05f..a1db345ded1c 100644 --- a/drivers/pinctrl/qcom/Makefile +++ b/drivers/pinctrl/qcom/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Qualcomm pin control drivers | 2 | # Qualcomm pin control drivers |
| 2 | obj-$(CONFIG_PINCTRL_MSM) += pinctrl-msm.o | 3 | obj-$(CONFIG_PINCTRL_MSM) += pinctrl-msm.o |
| 3 | obj-$(CONFIG_PINCTRL_APQ8064) += pinctrl-apq8064.o | 4 | obj-$(CONFIG_PINCTRL_APQ8064) += pinctrl-apq8064.o |
diff --git a/drivers/pinctrl/samsung/Makefile b/drivers/pinctrl/samsung/Makefile index 595995851ea5..df426561d067 100644 --- a/drivers/pinctrl/samsung/Makefile +++ b/drivers/pinctrl/samsung/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Samsung pin control drivers | 2 | # Samsung pin control drivers |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_PINCTRL_SAMSUNG) += pinctrl-samsung.o | 4 | obj-$(CONFIG_PINCTRL_SAMSUNG) += pinctrl-samsung.o |
diff --git a/drivers/pinctrl/sh-pfc/Makefile b/drivers/pinctrl/sh-pfc/Makefile index 1d4f05a96bd4..a7903904b64e 100644 --- a/drivers/pinctrl/sh-pfc/Makefile +++ b/drivers/pinctrl/sh-pfc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_PINCTRL_SH_PFC) += core.o pinctrl.o | 2 | obj-$(CONFIG_PINCTRL_SH_PFC) += core.o pinctrl.o |
| 2 | obj-$(CONFIG_PINCTRL_SH_PFC_GPIO) += gpio.o | 3 | obj-$(CONFIG_PINCTRL_SH_PFC_GPIO) += gpio.o |
| 3 | obj-$(CONFIG_PINCTRL_PFC_EMEV2) += pfc-emev2.o | 4 | obj-$(CONFIG_PINCTRL_PFC_EMEV2) += pfc-emev2.o |
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7722.c b/drivers/pinctrl/sh-pfc/pfc-sh7722.c index 29c69133b0ef..0e733bffdb38 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7722.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7722.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/init.h> | 2 | #include <linux/init.h> |
| 2 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 3 | #include <linux/gpio.h> | 4 | #include <linux/gpio.h> |
diff --git a/drivers/pinctrl/spear/Makefile b/drivers/pinctrl/spear/Makefile index 37b8412ac8a3..da52d17550a3 100644 --- a/drivers/pinctrl/spear/Makefile +++ b/drivers/pinctrl/spear/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # SPEAr pinmux support | 2 | # SPEAr pinmux support |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_PINCTRL_SPEAR_PLGPIO) += pinctrl-plgpio.o | 4 | obj-$(CONFIG_PINCTRL_SPEAR_PLGPIO) += pinctrl-plgpio.o |
diff --git a/drivers/pinctrl/stm32/Makefile b/drivers/pinctrl/stm32/Makefile index 5f379f5153f1..d13ca3573486 100644 --- a/drivers/pinctrl/stm32/Makefile +++ b/drivers/pinctrl/stm32/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Core | 2 | # Core |
| 2 | obj-$(CONFIG_PINCTRL_STM32) += pinctrl-stm32.o | 3 | obj-$(CONFIG_PINCTRL_STM32) += pinctrl-stm32.o |
| 3 | 4 | ||
diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile index dc6c9619e41c..12a752e836ef 100644 --- a/drivers/pinctrl/sunxi/Makefile +++ b/drivers/pinctrl/sunxi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Core | 2 | # Core |
| 2 | obj-y += pinctrl-sunxi.o | 3 | obj-y += pinctrl-sunxi.o |
| 3 | 4 | ||
diff --git a/drivers/pinctrl/tegra/Makefile b/drivers/pinctrl/tegra/Makefile index d9ea2be69cc4..bbcb043c34a2 100644 --- a/drivers/pinctrl/tegra/Makefile +++ b/drivers/pinctrl/tegra/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_PINCTRL_TEGRA) += pinctrl-tegra.o | 2 | obj-$(CONFIG_PINCTRL_TEGRA) += pinctrl-tegra.o |
| 2 | obj-$(CONFIG_PINCTRL_TEGRA20) += pinctrl-tegra20.o | 3 | obj-$(CONFIG_PINCTRL_TEGRA20) += pinctrl-tegra20.o |
| 3 | obj-$(CONFIG_PINCTRL_TEGRA30) += pinctrl-tegra30.o | 4 | obj-$(CONFIG_PINCTRL_TEGRA30) += pinctrl-tegra30.o |
diff --git a/drivers/pinctrl/uniphier/Makefile b/drivers/pinctrl/uniphier/Makefile index d592ff77d60f..ec66c86e276e 100644 --- a/drivers/pinctrl/uniphier/Makefile +++ b/drivers/pinctrl/uniphier/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-y += pinctrl-uniphier-core.o | 2 | obj-y += pinctrl-uniphier-core.o |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_PINCTRL_UNIPHIER_LD4) += pinctrl-uniphier-ld4.o | 4 | obj-$(CONFIG_PINCTRL_UNIPHIER_LD4) += pinctrl-uniphier-ld4.o |
diff --git a/drivers/pinctrl/vt8500/Makefile b/drivers/pinctrl/vt8500/Makefile index 24ec45dd0d80..c6a5c3b14e9e 100644 --- a/drivers/pinctrl/vt8500/Makefile +++ b/drivers/pinctrl/vt8500/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # VIA/Wondermedia pinctrl support | 2 | # VIA/Wondermedia pinctrl support |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_PINCTRL_WMT) += pinctrl-wmt.o | 4 | obj-$(CONFIG_PINCTRL_WMT) += pinctrl-wmt.o |
diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile index ca2692510733..d3a6630266a0 100644 --- a/drivers/platform/Makefile +++ b/drivers/platform/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for linux/drivers/platform | 3 | # Makefile for linux/drivers/platform |
| 3 | # | 4 | # |
diff --git a/drivers/platform/chrome/Makefile b/drivers/platform/chrome/Makefile index 66c345ca35fc..a077b1f0211d 100644 --- a/drivers/platform/chrome/Makefile +++ b/drivers/platform/chrome/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | obj-$(CONFIG_CHROMEOS_LAPTOP) += chromeos_laptop.o | 3 | obj-$(CONFIG_CHROMEOS_LAPTOP) += chromeos_laptop.o |
| 3 | obj-$(CONFIG_CHROMEOS_PSTORE) += chromeos_pstore.o | 4 | obj-$(CONFIG_CHROMEOS_PSTORE) += chromeos_pstore.o |
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 91cec1751461..f9e3ae683bbe 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for linux/drivers/platform/x86 | 3 | # Makefile for linux/drivers/platform/x86 |
| 3 | # x86 Platform-Specific Drivers | 4 | # x86 Platform-Specific Drivers |
diff --git a/drivers/platform/x86/intel_pmc_ipc.c b/drivers/platform/x86/intel_pmc_ipc.c index bb792a52248b..e03fa31446ca 100644 --- a/drivers/platform/x86/intel_pmc_ipc.c +++ b/drivers/platform/x86/intel_pmc_ipc.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/suspend.h> | 33 | #include <linux/suspend.h> |
| 34 | #include <linux/acpi.h> | 34 | #include <linux/acpi.h> |
| 35 | #include <linux/io-64-nonatomic-lo-hi.h> | 35 | #include <linux/io-64-nonatomic-lo-hi.h> |
| 36 | #include <linux/spinlock.h> | ||
| 36 | 37 | ||
| 37 | #include <asm/intel_pmc_ipc.h> | 38 | #include <asm/intel_pmc_ipc.h> |
| 38 | 39 | ||
| @@ -131,6 +132,7 @@ static struct intel_pmc_ipc_dev { | |||
| 131 | /* gcr */ | 132 | /* gcr */ |
| 132 | void __iomem *gcr_mem_base; | 133 | void __iomem *gcr_mem_base; |
| 133 | bool has_gcr_regs; | 134 | bool has_gcr_regs; |
| 135 | spinlock_t gcr_lock; | ||
| 134 | 136 | ||
| 135 | /* punit */ | 137 | /* punit */ |
| 136 | struct platform_device *punit_dev; | 138 | struct platform_device *punit_dev; |
| @@ -225,17 +227,17 @@ int intel_pmc_gcr_read(u32 offset, u32 *data) | |||
| 225 | { | 227 | { |
| 226 | int ret; | 228 | int ret; |
| 227 | 229 | ||
| 228 | mutex_lock(&ipclock); | 230 | spin_lock(&ipcdev.gcr_lock); |
| 229 | 231 | ||
| 230 | ret = is_gcr_valid(offset); | 232 | ret = is_gcr_valid(offset); |
| 231 | if (ret < 0) { | 233 | if (ret < 0) { |
| 232 | mutex_unlock(&ipclock); | 234 | spin_unlock(&ipcdev.gcr_lock); |
| 233 | return ret; | 235 | return ret; |
| 234 | } | 236 | } |
| 235 | 237 | ||
| 236 | *data = readl(ipcdev.gcr_mem_base + offset); | 238 | *data = readl(ipcdev.gcr_mem_base + offset); |
| 237 | 239 | ||
| 238 | mutex_unlock(&ipclock); | 240 | spin_unlock(&ipcdev.gcr_lock); |
| 239 | 241 | ||
| 240 | return 0; | 242 | return 0; |
| 241 | } | 243 | } |
| @@ -255,17 +257,17 @@ int intel_pmc_gcr_write(u32 offset, u32 data) | |||
| 255 | { | 257 | { |
| 256 | int ret; | 258 | int ret; |
| 257 | 259 | ||
| 258 | mutex_lock(&ipclock); | 260 | spin_lock(&ipcdev.gcr_lock); |
| 259 | 261 | ||
| 260 | ret = is_gcr_valid(offset); | 262 | ret = is_gcr_valid(offset); |
| 261 | if (ret < 0) { | 263 | if (ret < 0) { |
| 262 | mutex_unlock(&ipclock); | 264 | spin_unlock(&ipcdev.gcr_lock); |
| 263 | return ret; | 265 | return ret; |
| 264 | } | 266 | } |
| 265 | 267 | ||
| 266 | writel(data, ipcdev.gcr_mem_base + offset); | 268 | writel(data, ipcdev.gcr_mem_base + offset); |
| 267 | 269 | ||
| 268 | mutex_unlock(&ipclock); | 270 | spin_unlock(&ipcdev.gcr_lock); |
| 269 | 271 | ||
| 270 | return 0; | 272 | return 0; |
| 271 | } | 273 | } |
| @@ -287,7 +289,7 @@ int intel_pmc_gcr_update(u32 offset, u32 mask, u32 val) | |||
| 287 | u32 new_val; | 289 | u32 new_val; |
| 288 | int ret = 0; | 290 | int ret = 0; |
| 289 | 291 | ||
| 290 | mutex_lock(&ipclock); | 292 | spin_lock(&ipcdev.gcr_lock); |
| 291 | 293 | ||
| 292 | ret = is_gcr_valid(offset); | 294 | ret = is_gcr_valid(offset); |
| 293 | if (ret < 0) | 295 | if (ret < 0) |
| @@ -309,7 +311,7 @@ int intel_pmc_gcr_update(u32 offset, u32 mask, u32 val) | |||
| 309 | } | 311 | } |
| 310 | 312 | ||
| 311 | gcr_ipc_unlock: | 313 | gcr_ipc_unlock: |
| 312 | mutex_unlock(&ipclock); | 314 | spin_unlock(&ipcdev.gcr_lock); |
| 313 | return ret; | 315 | return ret; |
| 314 | } | 316 | } |
| 315 | EXPORT_SYMBOL_GPL(intel_pmc_gcr_update); | 317 | EXPORT_SYMBOL_GPL(intel_pmc_gcr_update); |
| @@ -480,52 +482,41 @@ static irqreturn_t ioc(int irq, void *dev_id) | |||
| 480 | 482 | ||
| 481 | static int ipc_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) | 483 | static int ipc_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) |
| 482 | { | 484 | { |
| 483 | resource_size_t pci_resource; | 485 | struct intel_pmc_ipc_dev *pmc = &ipcdev; |
| 484 | int ret; | 486 | int ret; |
| 485 | int len; | ||
| 486 | 487 | ||
| 487 | ipcdev.dev = &pci_dev_get(pdev)->dev; | 488 | /* Only one PMC is supported */ |
| 488 | ipcdev.irq_mode = IPC_TRIGGER_MODE_IRQ; | 489 | if (pmc->dev) |
| 490 | return -EBUSY; | ||
| 489 | 491 | ||
| 490 | ret = pci_enable_device(pdev); | 492 | pmc->irq_mode = IPC_TRIGGER_MODE_IRQ; |
| 493 | |||
| 494 | spin_lock_init(&ipcdev.gcr_lock); | ||
| 495 | |||
| 496 | ret = pcim_enable_device(pdev); | ||
| 491 | if (ret) | 497 | if (ret) |
| 492 | return ret; | 498 | return ret; |
| 493 | 499 | ||
| 494 | ret = pci_request_regions(pdev, "intel_pmc_ipc"); | 500 | ret = pcim_iomap_regions(pdev, 1 << 0, pci_name(pdev)); |
| 495 | if (ret) | 501 | if (ret) |
| 496 | return ret; | 502 | return ret; |
| 497 | 503 | ||
| 498 | pci_resource = pci_resource_start(pdev, 0); | 504 | init_completion(&pmc->cmd_complete); |
| 499 | len = pci_resource_len(pdev, 0); | ||
| 500 | if (!pci_resource || !len) { | ||
| 501 | dev_err(&pdev->dev, "Failed to get resource\n"); | ||
| 502 | return -ENOMEM; | ||
| 503 | } | ||
| 504 | 505 | ||
| 505 | init_completion(&ipcdev.cmd_complete); | 506 | pmc->ipc_base = pcim_iomap_table(pdev)[0]; |
| 506 | 507 | ||
| 507 | if (request_irq(pdev->irq, ioc, 0, "intel_pmc_ipc", &ipcdev)) { | 508 | ret = devm_request_irq(&pdev->dev, pdev->irq, ioc, 0, "intel_pmc_ipc", |
| 509 | pmc); | ||
| 510 | if (ret) { | ||
| 508 | dev_err(&pdev->dev, "Failed to request irq\n"); | 511 | dev_err(&pdev->dev, "Failed to request irq\n"); |
| 509 | return -EBUSY; | 512 | return ret; |
| 510 | } | 513 | } |
| 511 | 514 | ||
| 512 | ipcdev.ipc_base = ioremap_nocache(pci_resource, len); | 515 | pmc->dev = &pdev->dev; |
| 513 | if (!ipcdev.ipc_base) { | ||
| 514 | dev_err(&pdev->dev, "Failed to ioremap ipc base\n"); | ||
| 515 | free_irq(pdev->irq, &ipcdev); | ||
| 516 | ret = -ENOMEM; | ||
| 517 | } | ||
| 518 | 516 | ||
| 519 | return ret; | 517 | pci_set_drvdata(pdev, pmc); |
| 520 | } | ||
| 521 | 518 | ||
| 522 | static void ipc_pci_remove(struct pci_dev *pdev) | 519 | return 0; |
| 523 | { | ||
| 524 | free_irq(pdev->irq, &ipcdev); | ||
| 525 | pci_release_regions(pdev); | ||
| 526 | pci_dev_put(pdev); | ||
| 527 | iounmap(ipcdev.ipc_base); | ||
| 528 | ipcdev.dev = NULL; | ||
| 529 | } | 520 | } |
| 530 | 521 | ||
| 531 | static const struct pci_device_id ipc_pci_ids[] = { | 522 | static const struct pci_device_id ipc_pci_ids[] = { |
| @@ -540,7 +531,6 @@ static struct pci_driver ipc_pci_driver = { | |||
| 540 | .name = "intel_pmc_ipc", | 531 | .name = "intel_pmc_ipc", |
| 541 | .id_table = ipc_pci_ids, | 532 | .id_table = ipc_pci_ids, |
| 542 | .probe = ipc_pci_probe, | 533 | .probe = ipc_pci_probe, |
| 543 | .remove = ipc_pci_remove, | ||
| 544 | }; | 534 | }; |
| 545 | 535 | ||
| 546 | static ssize_t intel_pmc_ipc_simple_cmd_store(struct device *dev, | 536 | static ssize_t intel_pmc_ipc_simple_cmd_store(struct device *dev, |
| @@ -850,17 +840,12 @@ static int ipc_plat_get_res(struct platform_device *pdev) | |||
| 850 | return -ENXIO; | 840 | return -ENXIO; |
| 851 | } | 841 | } |
| 852 | size = PLAT_RESOURCE_IPC_SIZE + PLAT_RESOURCE_GCR_SIZE; | 842 | size = PLAT_RESOURCE_IPC_SIZE + PLAT_RESOURCE_GCR_SIZE; |
| 843 | res->end = res->start + size - 1; | ||
| 844 | |||
| 845 | addr = devm_ioremap_resource(&pdev->dev, res); | ||
| 846 | if (IS_ERR(addr)) | ||
| 847 | return PTR_ERR(addr); | ||
| 853 | 848 | ||
| 854 | if (!request_mem_region(res->start, size, pdev->name)) { | ||
| 855 | dev_err(&pdev->dev, "Failed to request ipc resource\n"); | ||
| 856 | return -EBUSY; | ||
| 857 | } | ||
| 858 | addr = ioremap_nocache(res->start, size); | ||
| 859 | if (!addr) { | ||
| 860 | dev_err(&pdev->dev, "I/O memory remapping failed\n"); | ||
| 861 | release_mem_region(res->start, size); | ||
| 862 | return -ENOMEM; | ||
| 863 | } | ||
| 864 | ipcdev.ipc_base = addr; | 849 | ipcdev.ipc_base = addr; |
| 865 | 850 | ||
| 866 | ipcdev.gcr_mem_base = addr + PLAT_RESOURCE_GCR_OFFSET; | 851 | ipcdev.gcr_mem_base = addr + PLAT_RESOURCE_GCR_OFFSET; |
| @@ -917,12 +902,12 @@ MODULE_DEVICE_TABLE(acpi, ipc_acpi_ids); | |||
| 917 | 902 | ||
| 918 | static int ipc_plat_probe(struct platform_device *pdev) | 903 | static int ipc_plat_probe(struct platform_device *pdev) |
| 919 | { | 904 | { |
| 920 | struct resource *res; | ||
| 921 | int ret; | 905 | int ret; |
| 922 | 906 | ||
| 923 | ipcdev.dev = &pdev->dev; | 907 | ipcdev.dev = &pdev->dev; |
| 924 | ipcdev.irq_mode = IPC_TRIGGER_MODE_IRQ; | 908 | ipcdev.irq_mode = IPC_TRIGGER_MODE_IRQ; |
| 925 | init_completion(&ipcdev.cmd_complete); | 909 | init_completion(&ipcdev.cmd_complete); |
| 910 | spin_lock_init(&ipcdev.gcr_lock); | ||
| 926 | 911 | ||
| 927 | ipcdev.irq = platform_get_irq(pdev, 0); | 912 | ipcdev.irq = platform_get_irq(pdev, 0); |
| 928 | if (ipcdev.irq < 0) { | 913 | if (ipcdev.irq < 0) { |
| @@ -939,11 +924,11 @@ static int ipc_plat_probe(struct platform_device *pdev) | |||
| 939 | ret = ipc_create_pmc_devices(); | 924 | ret = ipc_create_pmc_devices(); |
| 940 | if (ret) { | 925 | if (ret) { |
| 941 | dev_err(&pdev->dev, "Failed to create pmc devices\n"); | 926 | dev_err(&pdev->dev, "Failed to create pmc devices\n"); |
| 942 | goto err_device; | 927 | return ret; |
| 943 | } | 928 | } |
| 944 | 929 | ||
| 945 | if (request_irq(ipcdev.irq, ioc, IRQF_NO_SUSPEND, | 930 | if (devm_request_irq(&pdev->dev, ipcdev.irq, ioc, IRQF_NO_SUSPEND, |
| 946 | "intel_pmc_ipc", &ipcdev)) { | 931 | "intel_pmc_ipc", &ipcdev)) { |
| 947 | dev_err(&pdev->dev, "Failed to request irq\n"); | 932 | dev_err(&pdev->dev, "Failed to request irq\n"); |
| 948 | ret = -EBUSY; | 933 | ret = -EBUSY; |
| 949 | goto err_irq; | 934 | goto err_irq; |
| @@ -960,40 +945,22 @@ static int ipc_plat_probe(struct platform_device *pdev) | |||
| 960 | 945 | ||
| 961 | return 0; | 946 | return 0; |
| 962 | err_sys: | 947 | err_sys: |
| 963 | free_irq(ipcdev.irq, &ipcdev); | 948 | devm_free_irq(&pdev->dev, ipcdev.irq, &ipcdev); |
| 964 | err_irq: | 949 | err_irq: |
| 965 | platform_device_unregister(ipcdev.tco_dev); | 950 | platform_device_unregister(ipcdev.tco_dev); |
| 966 | platform_device_unregister(ipcdev.punit_dev); | 951 | platform_device_unregister(ipcdev.punit_dev); |
| 967 | platform_device_unregister(ipcdev.telemetry_dev); | 952 | platform_device_unregister(ipcdev.telemetry_dev); |
| 968 | err_device: | 953 | |
| 969 | iounmap(ipcdev.ipc_base); | ||
| 970 | res = platform_get_resource(pdev, IORESOURCE_MEM, | ||
| 971 | PLAT_RESOURCE_IPC_INDEX); | ||
| 972 | if (res) { | ||
| 973 | release_mem_region(res->start, | ||
| 974 | PLAT_RESOURCE_IPC_SIZE + | ||
| 975 | PLAT_RESOURCE_GCR_SIZE); | ||
| 976 | } | ||
| 977 | return ret; | 954 | return ret; |
| 978 | } | 955 | } |
| 979 | 956 | ||
| 980 | static int ipc_plat_remove(struct platform_device *pdev) | 957 | static int ipc_plat_remove(struct platform_device *pdev) |
| 981 | { | 958 | { |
| 982 | struct resource *res; | ||
| 983 | |||
| 984 | sysfs_remove_group(&pdev->dev.kobj, &intel_ipc_group); | 959 | sysfs_remove_group(&pdev->dev.kobj, &intel_ipc_group); |
| 985 | free_irq(ipcdev.irq, &ipcdev); | 960 | devm_free_irq(&pdev->dev, ipcdev.irq, &ipcdev); |
| 986 | platform_device_unregister(ipcdev.tco_dev); | 961 | platform_device_unregister(ipcdev.tco_dev); |
| 987 | platform_device_unregister(ipcdev.punit_dev); | 962 | platform_device_unregister(ipcdev.punit_dev); |
| 988 | platform_device_unregister(ipcdev.telemetry_dev); | 963 | platform_device_unregister(ipcdev.telemetry_dev); |
| 989 | iounmap(ipcdev.ipc_base); | ||
| 990 | res = platform_get_resource(pdev, IORESOURCE_MEM, | ||
| 991 | PLAT_RESOURCE_IPC_INDEX); | ||
| 992 | if (res) { | ||
| 993 | release_mem_region(res->start, | ||
| 994 | PLAT_RESOURCE_IPC_SIZE + | ||
| 995 | PLAT_RESOURCE_GCR_SIZE); | ||
| 996 | } | ||
| 997 | ipcdev.dev = NULL; | 964 | ipcdev.dev = NULL; |
| 998 | return 0; | 965 | return 0; |
| 999 | } | 966 | } |
diff --git a/drivers/pnp/Makefile b/drivers/pnp/Makefile index bfba893cb321..71d532f18219 100644 --- a/drivers/pnp/Makefile +++ b/drivers/pnp/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux Plug-and-Play Support. | 3 | # Makefile for the Linux Plug-and-Play Support. |
| 3 | # | 4 | # |
diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h index 3151fd164614..cdcfa39cf167 100644 --- a/drivers/pnp/base.h +++ b/drivers/pnp/base.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 2008 Hewlett-Packard Development Company, L.P. | 3 | * Copyright (C) 2008 Hewlett-Packard Development Company, L.P. |
| 3 | * Bjorn Helgaas <bjorn.helgaas@hp.com> | 4 | * Bjorn Helgaas <bjorn.helgaas@hp.com> |
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index 31ad9fc3f701..c2464ee08e4a 100644 --- a/drivers/pnp/card.c +++ b/drivers/pnp/card.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * card.c - contains functions for managing groups of PnP devices | 3 | * card.c - contains functions for managing groups of PnP devices |
| 3 | * | 4 | * |
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c index b54620e53830..3bf18d718975 100644 --- a/drivers/pnp/core.c +++ b/drivers/pnp/core.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * core.c - contains all core device and protocol registration functions | 3 | * core.c - contains all core device and protocol registration functions |
| 3 | * | 4 | * |
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c index 63452f20e3e9..93a30a8f88d1 100644 --- a/drivers/pnp/driver.c +++ b/drivers/pnp/driver.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * driver.c - device id matching, driver model, etc. | 3 | * driver.c - device id matching, driver model, etc. |
| 3 | * | 4 | * |
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c index 5c5b3d47b5f6..187e4a1175b0 100644 --- a/drivers/pnp/interface.c +++ b/drivers/pnp/interface.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * interface.c - contains everything related to the user interface | 3 | * interface.c - contains everything related to the user interface |
| 3 | * | 4 | * |
diff --git a/drivers/pnp/isapnp/compat.c b/drivers/pnp/isapnp/compat.c index 10bdcc4d4f7b..6c845b628316 100644 --- a/drivers/pnp/isapnp/compat.c +++ b/drivers/pnp/isapnp/compat.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * compat.c - A series of functions to make it easier to convert drivers that use | 3 | * compat.c - A series of functions to make it easier to convert drivers that use |
| 3 | * the old isapnp APIs. If possible use the new APIs instead. | 4 | * the old isapnp APIs. If possible use the new APIs instead. |
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c index 7ad3295752ef..144055593ec8 100644 --- a/drivers/pnp/manager.c +++ b/drivers/pnp/manager.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * manager.c - Resource Management, Conflict Resolution, Activation and Disabling of Devices | 3 | * manager.c - Resource Management, Conflict Resolution, Activation and Disabling of Devices |
| 3 | * | 4 | * |
diff --git a/drivers/pnp/pnpacpi/pnpacpi.h b/drivers/pnp/pnpacpi/pnpacpi.h index 051ef9699777..4489cd6dbc84 100644 --- a/drivers/pnp/pnpacpi/pnpacpi.h +++ b/drivers/pnp/pnpacpi/pnpacpi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ACPI_PNP_H | 2 | #ifndef ACPI_PNP_H |
| 2 | #define ACPI_PNP_H | 3 | #define ACPI_PNP_H |
| 3 | 4 | ||
diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c index ff563db025b3..ba5cfc3dbe11 100644 --- a/drivers/pnp/pnpbios/bioscalls.c +++ b/drivers/pnp/pnpbios/bioscalls.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * bioscalls.c - the lowlevel layer of the PnPBIOS driver | 3 | * bioscalls.c - the lowlevel layer of the PnPBIOS driver |
| 3 | */ | 4 | */ |
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c index 5ee6b2a5f8d5..7d4aca7948dd 100644 --- a/drivers/pnp/pnpbios/proc.c +++ b/drivers/pnp/pnpbios/proc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * /proc/bus/pnp interface for Plug and Play devices | 3 | * /proc/bus/pnp interface for Plug and Play devices |
| 3 | * | 4 | * |
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c index cca2f9f9f3e3..2f31b212b1a5 100644 --- a/drivers/pnp/pnpbios/rsparser.c +++ b/drivers/pnp/pnpbios/rsparser.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * rsparser.c - parses and encodes pnpbios resource data streams | 3 | * rsparser.c - parses and encodes pnpbios resource data streams |
| 3 | */ | 4 | */ |
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c index d28e3ab9479c..f054cdddfef8 100644 --- a/drivers/pnp/quirks.c +++ b/drivers/pnp/quirks.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * This file contains quirk handling code for PnP devices | 3 | * This file contains quirk handling code for PnP devices |
| 3 | * Some devices do not report all their resources, and need to have extra | 4 | * Some devices do not report all their resources, and need to have extra |
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index f980ff7166e9..70d4ba95735a 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * resource.c - Contains functions for registering and analyzing resource information | 3 | * resource.c - Contains functions for registering and analyzing resource information |
| 3 | * | 4 | * |
diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c index f5beb24d036a..e4f53d31191d 100644 --- a/drivers/pnp/support.c +++ b/drivers/pnp/support.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * support.c - standard functions for the use of pnp protocol drivers | 3 | * support.c - standard functions for the use of pnp protocol drivers |
| 3 | * | 4 | * |
diff --git a/drivers/pnp/system.c b/drivers/pnp/system.c index 49c1720df59a..6950503741eb 100644 --- a/drivers/pnp/system.c +++ b/drivers/pnp/system.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * system.c - a driver for reserving pnp system resources | 3 | * system.c - a driver for reserving pnp system resources |
| 3 | * | 4 | * |
diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile index 58cf5b30559f..aeb65edb17b7 100644 --- a/drivers/power/reset/Makefile +++ b/drivers/power/reset/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_POWER_RESET_AS3722) += as3722-poweroff.o | 2 | obj-$(CONFIG_POWER_RESET_AS3722) += as3722-poweroff.o |
| 2 | obj-$(CONFIG_POWER_RESET_AT91_POWEROFF) += at91-poweroff.o | 3 | obj-$(CONFIG_POWER_RESET_AT91_POWEROFF) += at91-poweroff.o |
| 3 | obj-$(CONFIG_POWER_RESET_AT91_RESET) += at91-reset.o | 4 | obj-$(CONFIG_POWER_RESET_AT91_RESET) += at91-reset.o |
diff --git a/drivers/power/reset/gemini-poweroff.c b/drivers/power/reset/gemini-poweroff.c index de878fd26f27..ff75af5abbc5 100644 --- a/drivers/power/reset/gemini-poweroff.c +++ b/drivers/power/reset/gemini-poweroff.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Gemini power management controller | 3 | * Gemini power management controller |
| 3 | * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org> | 4 | * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org> |
diff --git a/drivers/power/reset/piix4-poweroff.c b/drivers/power/reset/piix4-poweroff.c index bacfc95783f0..20ce3ff5e039 100644 --- a/drivers/power/reset/piix4-poweroff.c +++ b/drivers/power/reset/piix4-poweroff.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2016 Imagination Technologies | 2 | * Copyright (C) 2016 Imagination Technologies |
| 3 | * Author: Paul Burton <paul.burton@imgtec.com> | 3 | * Author: Paul Burton <paul.burton@mips.com> |
| 4 | * | 4 | * |
| 5 | * This program is free software; you can redistribute it and/or modify it | 5 | * This program is free software; you can redistribute it and/or modify it |
| 6 | * under the terms of the GNU General Public License as published by the | 6 | * under the terms of the GNU General Public License as published by the |
| @@ -109,5 +109,5 @@ static struct pci_driver piix4_poweroff_driver = { | |||
| 109 | }; | 109 | }; |
| 110 | 110 | ||
| 111 | module_pci_driver(piix4_poweroff_driver); | 111 | module_pci_driver(piix4_poweroff_driver); |
| 112 | MODULE_AUTHOR("Paul Burton <paul.burton@imgtec.com>"); | 112 | MODULE_AUTHOR("Paul Burton <paul.burton@mips.com>"); |
| 113 | MODULE_LICENSE("GPL"); | 113 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index 621a19058fec..aae4e4a8bbb3 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | subdir-ccflags-$(CONFIG_POWER_SUPPLY_DEBUG) := -DDEBUG | 2 | subdir-ccflags-$(CONFIG_POWER_SUPPLY_DEBUG) := -DDEBUG |
| 2 | 3 | ||
| 3 | power_supply-y := power_supply_core.o | 4 | power_supply-y := power_supply_core.o |
diff --git a/drivers/power/supply/ab8500_bmdata.c b/drivers/power/supply/ab8500_bmdata.c index 8c49586015d0..4a7ed50d1dc5 100644 --- a/drivers/power/supply/ab8500_bmdata.c +++ b/drivers/power/supply/ab8500_bmdata.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/export.h> | 2 | #include <linux/export.h> |
| 2 | #include <linux/power_supply.h> | 3 | #include <linux/power_supply.h> |
| 3 | #include <linux/of.h> | 4 | #include <linux/of.h> |
diff --git a/drivers/ptp/Makefile b/drivers/ptp/Makefile index d1f2fb19c980..fd28207f5379 100644 --- a/drivers/ptp/Makefile +++ b/drivers/ptp/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for PTP 1588 clock support. | 3 | # Makefile for PTP 1588 clock support. |
| 3 | # | 4 | # |
diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile index ebefba5f528b..0258a745f30c 100644 --- a/drivers/pwm/Makefile +++ b/drivers/pwm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_PWM) += core.o | 2 | obj-$(CONFIG_PWM) += core.o |
| 2 | obj-$(CONFIG_PWM_SYSFS) += sysfs.o | 3 | obj-$(CONFIG_PWM_SYSFS) += sysfs.o |
| 3 | obj-$(CONFIG_PWM_AB8500) += pwm-ab8500.o | 4 | obj-$(CONFIG_PWM_AB8500) += pwm-ab8500.o |
diff --git a/drivers/rapidio/Makefile b/drivers/rapidio/Makefile index 74dcea45ad49..a34b0254ba38 100644 --- a/drivers/rapidio/Makefile +++ b/drivers/rapidio/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for RapidIO interconnect services | 3 | # Makefile for RapidIO interconnect services |
| 3 | # | 4 | # |
diff --git a/drivers/rapidio/switches/Makefile b/drivers/rapidio/switches/Makefile index 6bdd54c4e733..69e7de31e41c 100644 --- a/drivers/rapidio/switches/Makefile +++ b/drivers/rapidio/switches/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for RIO switches | 3 | # Makefile for RIO switches |
| 3 | # | 4 | # |
diff --git a/drivers/ras/cec.c b/drivers/ras/cec.c index e2c1988cd7c0..adbf1a9e089e 100644 --- a/drivers/ras/cec.c +++ b/drivers/ras/cec.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/mm.h> | 2 | #include <linux/mm.h> |
| 2 | #include <linux/gfp.h> | 3 | #include <linux/gfp.h> |
| 3 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
diff --git a/drivers/ras/debugfs.h b/drivers/ras/debugfs.h index db72e4513191..c07443b462ad 100644 --- a/drivers/ras/debugfs.h +++ b/drivers/ras/debugfs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __RAS_DEBUGFS_H__ | 2 | #ifndef __RAS_DEBUGFS_H__ |
| 2 | #define __RAS_DEBUGFS_H__ | 3 | #define __RAS_DEBUGFS_H__ |
| 3 | 4 | ||
diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c index 5429d3795732..3f38907320dc 100644 --- a/drivers/ras/ras.c +++ b/drivers/ras/ras.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 2014 Intel Corporation | 3 | * Copyright (C) 2014 Intel Corporation |
| 3 | * | 4 | * |
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index cbb6e45c77b2..80ffc57a9ca3 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for regulator drivers. | 3 | # Makefile for regulator drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c index f18b36dd57dd..376a99b7cf5d 100644 --- a/drivers/regulator/axp20x-regulator.c +++ b/drivers/regulator/axp20x-regulator.c | |||
| @@ -590,7 +590,7 @@ static bool axp20x_is_polyphase_slave(struct axp20x_dev *axp20x, int id) | |||
| 590 | case AXP803_DCDC3: | 590 | case AXP803_DCDC3: |
| 591 | return !!(reg & BIT(6)); | 591 | return !!(reg & BIT(6)); |
| 592 | case AXP803_DCDC6: | 592 | case AXP803_DCDC6: |
| 593 | return !!(reg & BIT(7)); | 593 | return !!(reg & BIT(5)); |
| 594 | } | 594 | } |
| 595 | break; | 595 | break; |
| 596 | 596 | ||
diff --git a/drivers/regulator/fixed-helper.c b/drivers/regulator/fixed-helper.c index f9d027992aae..777fac6fb4cb 100644 --- a/drivers/regulator/fixed-helper.c +++ b/drivers/regulator/fixed-helper.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/slab.h> | 2 | #include <linux/slab.h> |
| 2 | #include <linux/string.h> | 3 | #include <linux/string.h> |
| 3 | #include <linux/platform_device.h> | 4 | #include <linux/platform_device.h> |
diff --git a/drivers/regulator/rn5t618-regulator.c b/drivers/regulator/rn5t618-regulator.c index ef2be56460fe..790a4a73ea2c 100644 --- a/drivers/regulator/rn5t618-regulator.c +++ b/drivers/regulator/rn5t618-regulator.c | |||
| @@ -29,7 +29,7 @@ static const struct regulator_ops rn5t618_reg_ops = { | |||
| 29 | }; | 29 | }; |
| 30 | 30 | ||
| 31 | #define REG(rid, ereg, emask, vreg, vmask, min, max, step) \ | 31 | #define REG(rid, ereg, emask, vreg, vmask, min, max, step) \ |
| 32 | [RN5T618_##rid] = { \ | 32 | { \ |
| 33 | .name = #rid, \ | 33 | .name = #rid, \ |
| 34 | .of_match = of_match_ptr(#rid), \ | 34 | .of_match = of_match_ptr(#rid), \ |
| 35 | .regulators_node = of_match_ptr("regulators"), \ | 35 | .regulators_node = of_match_ptr("regulators"), \ |
diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile index 1a0b3dd44b8c..6e16450ce11f 100644 --- a/drivers/remoteproc/Makefile +++ b/drivers/remoteproc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Generic framework for controlling remote processors | 3 | # Generic framework for controlling remote processors |
| 3 | # | 4 | # |
diff --git a/drivers/remoteproc/qcom_common.h b/drivers/remoteproc/qcom_common.h index 4f8bc168473c..832e20271664 100644 --- a/drivers/remoteproc/qcom_common.h +++ b/drivers/remoteproc/qcom_common.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __RPROC_QCOM_COMMON_H__ | 2 | #ifndef __RPROC_QCOM_COMMON_H__ |
| 2 | #define __RPROC_QCOM_COMMON_H__ | 3 | #define __RPROC_QCOM_COMMON_H__ |
| 3 | 4 | ||
diff --git a/drivers/remoteproc/qcom_wcnss.h b/drivers/remoteproc/qcom_wcnss.h index 25fb7f62a457..62c8682d0a92 100644 --- a/drivers/remoteproc/qcom_wcnss.h +++ b/drivers/remoteproc/qcom_wcnss.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __QCOM_WNCSS_H__ | 2 | #ifndef __QCOM_WNCSS_H__ |
| 2 | #define __QCOM_WNCSS_H__ | 3 | #define __QCOM_WNCSS_H__ |
| 3 | 4 | ||
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile index af1c15c330b3..c1fd702ac57c 100644 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-y += core.o | 2 | obj-y += core.o |
| 2 | obj-y += hisilicon/ | 3 | obj-y += hisilicon/ |
| 3 | obj-$(CONFIG_ARCH_STI) += sti/ | 4 | obj-$(CONFIG_ARCH_STI) += sti/ |
diff --git a/drivers/rpmsg/Makefile b/drivers/rpmsg/Makefile index c71f4ab1ae17..9aa859502d27 100644 --- a/drivers/rpmsg/Makefile +++ b/drivers/rpmsg/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_RPMSG) += rpmsg_core.o | 2 | obj-$(CONFIG_RPMSG) += rpmsg_core.o |
| 2 | obj-$(CONFIG_RPMSG_CHAR) += rpmsg_char.o | 3 | obj-$(CONFIG_RPMSG_CHAR) += rpmsg_char.o |
| 3 | obj-$(CONFIG_RPMSG_QCOM_GLINK_RPM) += qcom_glink_rpm.o | 4 | obj-$(CONFIG_RPMSG_QCOM_GLINK_RPM) += qcom_glink_rpm.o |
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 7230014c92af..0bf1fc02b82c 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for RTC class/drivers. | 3 | # Makefile for RTC class/drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/rtc/rtc-core.h b/drivers/rtc/rtc-core.h index ecab76a3207c..513b9bedd2c8 100644 --- a/drivers/rtc/rtc-core.h +++ b/drivers/rtc/rtc-core.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifdef CONFIG_RTC_INTF_DEV | 2 | #ifdef CONFIG_RTC_INTF_DEV |
| 2 | 3 | ||
| 3 | extern void __init rtc_dev_init(void); | 4 | extern void __init rtc_dev_init(void); |
diff --git a/drivers/rtc/rtc-efi-platform.c b/drivers/rtc/rtc-efi-platform.c index 1a7f1d1bc174..6c037dc4e3dc 100644 --- a/drivers/rtc/rtc-efi-platform.c +++ b/drivers/rtc/rtc-efi-platform.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Moved from arch/ia64/kernel/time.c | 3 | * Moved from arch/ia64/kernel/time.c |
| 3 | * | 4 | * |
diff --git a/drivers/rtc/rtc-sa1100.h b/drivers/rtc/rtc-sa1100.h index 2c79c0c57822..cc724f5b07bc 100644 --- a/drivers/rtc/rtc-sa1100.h +++ b/drivers/rtc/rtc-sa1100.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __RTC_SA1100_H__ | 2 | #ifndef __RTC_SA1100_H__ |
| 2 | #define __RTC_SA1100_H__ | 3 | #define __RTC_SA1100_H__ |
| 3 | 4 | ||
diff --git a/drivers/s390/block/Makefile b/drivers/s390/block/Makefile index b64e2b32c753..60c85cff556f 100644 --- a/drivers/s390/block/Makefile +++ b/drivers/s390/block/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # S/390 block devices | 3 | # S/390 block devices |
| 3 | # | 4 | # |
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c index e448a0fc0c09..c94b606e0df8 100644 --- a/drivers/s390/block/dasd_3990_erp.c +++ b/drivers/s390/block/dasd_3990_erp.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Author(s)......: Horst Hummel <Horst.Hummel@de.ibm.com> | 3 | * Author(s)......: Horst Hummel <Horst.Hummel@de.ibm.com> |
| 3 | * Holger Smolinski <Holger.Smolinski@de.ibm.com> | 4 | * Holger Smolinski <Holger.Smolinski@de.ibm.com> |
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c index 0e0e622eadc3..62f5f04d8f61 100644 --- a/drivers/s390/block/dasd_alias.c +++ b/drivers/s390/block/dasd_alias.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * PAV alias management for the DASD ECKD discipline | 3 | * PAV alias management for the DASD ECKD discipline |
| 3 | * | 4 | * |
diff --git a/drivers/s390/block/dasd_diag.h b/drivers/s390/block/dasd_diag.h index e84a5468d810..405b6feed465 100644 --- a/drivers/s390/block/dasd_diag.h +++ b/drivers/s390/block/dasd_diag.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> | 3 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> |
| 3 | * Based on.......: linux/drivers/s390/block/mdisk.h | 4 | * Based on.......: linux/drivers/s390/block/mdisk.h |
diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h index 34e153a6b19c..5869d2fede35 100644 --- a/drivers/s390/block/dasd_eckd.h +++ b/drivers/s390/block/dasd_eckd.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> | 3 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> |
| 3 | * Horst Hummel <Horst.Hummel@de.ibm.com> | 4 | * Horst Hummel <Horst.Hummel@de.ibm.com> |
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c index 8713fefd794b..4630782b5456 100644 --- a/drivers/s390/block/dasd_eer.c +++ b/drivers/s390/block/dasd_eer.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Character device driver for extended error reporting. | 3 | * Character device driver for extended error reporting. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/block/dasd_erp.c b/drivers/s390/block/dasd_erp.c index 6389feb2fb7a..ba4fa372d02d 100644 --- a/drivers/s390/block/dasd_erp.c +++ b/drivers/s390/block/dasd_erp.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> | 3 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> |
| 3 | * Horst Hummel <Horst.Hummel@de.ibm.com> | 4 | * Horst Hummel <Horst.Hummel@de.ibm.com> |
diff --git a/drivers/s390/block/dasd_fba.h b/drivers/s390/block/dasd_fba.h index b5d3db0e5efb..b14bf1b2c691 100644 --- a/drivers/s390/block/dasd_fba.h +++ b/drivers/s390/block/dasd_fba.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> | 3 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> |
| 3 | * Bugreports.to..: <Linux390@de.ibm.com> | 4 | * Bugreports.to..: <Linux390@de.ibm.com> |
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index 8b1341fb2e0d..7036a6c6f86f 100644 --- a/drivers/s390/block/dasd_genhd.c +++ b/drivers/s390/block/dasd_genhd.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> | 3 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> |
| 3 | * Horst Hummel <Horst.Hummel@de.ibm.com> | 4 | * Horst Hummel <Horst.Hummel@de.ibm.com> |
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h index db470bd10175..e94080a5196f 100644 --- a/drivers/s390/block/dasd_int.h +++ b/drivers/s390/block/dasd_int.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> | 3 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> |
| 3 | * Horst Hummel <Horst.Hummel@de.ibm.com> | 4 | * Horst Hummel <Horst.Hummel@de.ibm.com> |
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c index ec65c1e51c2a..7bdc6aaa0ba3 100644 --- a/drivers/s390/block/dasd_ioctl.c +++ b/drivers/s390/block/dasd_ioctl.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> | 3 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> |
| 3 | * Horst Hummel <Horst.Hummel@de.ibm.com> | 4 | * Horst Hummel <Horst.Hummel@de.ibm.com> |
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c index 7104d6765773..c33788a829c3 100644 --- a/drivers/s390/block/dasd_proc.c +++ b/drivers/s390/block/dasd_proc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> | 3 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> |
| 3 | * Horst Hummel <Horst.Hummel@de.ibm.com> | 4 | * Horst Hummel <Horst.Hummel@de.ibm.com> |
diff --git a/drivers/s390/block/scm_blk.h b/drivers/s390/block/scm_blk.h index 71288dd9dd7f..aa42c3a2c90a 100644 --- a/drivers/s390/block/scm_blk.h +++ b/drivers/s390/block/scm_blk.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef SCM_BLK_H | 2 | #ifndef SCM_BLK_H |
| 2 | #define SCM_BLK_H | 3 | #define SCM_BLK_H |
| 3 | 4 | ||
diff --git a/drivers/s390/block/scm_drv.c b/drivers/s390/block/scm_drv.c index c98cf52d78d1..3134fd6e058e 100644 --- a/drivers/s390/block/scm_drv.c +++ b/drivers/s390/block/scm_drv.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Device driver for s390 storage class memory. | 3 | * Device driver for s390 storage class memory. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile index 0c443e26835d..05ac6ba15a53 100644 --- a/drivers/s390/char/Makefile +++ b/drivers/s390/char/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # S/390 character devices | 3 | # S/390 character devices |
| 3 | # | 4 | # |
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index 9ec4ae056158..353f0bebcf8c 100644 --- a/drivers/s390/char/con3215.c +++ b/drivers/s390/char/con3215.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * 3215 line mode terminal driver. | 3 | * 3215 line mode terminal driver. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c index 8522cfce5b4e..be3e3c1206c2 100644 --- a/drivers/s390/char/con3270.c +++ b/drivers/s390/char/con3270.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * IBM/3270 Driver - console view. | 3 | * IBM/3270 Driver - console view. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/ctrlchar.c b/drivers/s390/char/ctrlchar.c index f7d92584b993..e1686a69a68e 100644 --- a/drivers/s390/char/ctrlchar.c +++ b/drivers/s390/char/ctrlchar.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Unified handling of special chars. | 3 | * Unified handling of special chars. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/ctrlchar.h b/drivers/s390/char/ctrlchar.h index 59c2d6e55e55..e52afa3b8180 100644 --- a/drivers/s390/char/ctrlchar.h +++ b/drivers/s390/char/ctrlchar.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Unified handling of special chars. | 3 | * Unified handling of special chars. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/defkeymap.c b/drivers/s390/char/defkeymap.c index 07c7f31081bc..98a5c459a1bf 100644 --- a/drivers/s390/char/defkeymap.c +++ b/drivers/s390/char/defkeymap.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | /* Do not edit this file! It was automatically generated by */ | 3 | /* Do not edit this file! It was automatically generated by */ |
| 3 | /* loadkeys --mktable defkeymap.map > defkeymap.c */ | 4 | /* loadkeys --mktable defkeymap.map > defkeymap.c */ |
diff --git a/drivers/s390/char/diag_ftp.c b/drivers/s390/char/diag_ftp.c index a5ccbf6f0d36..6bf1058de873 100644 --- a/drivers/s390/char/diag_ftp.c +++ b/drivers/s390/char/diag_ftp.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * DIAGNOSE X'2C4' instruction based HMC FTP services, useable on z/VM | 3 | * DIAGNOSE X'2C4' instruction based HMC FTP services, useable on z/VM |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/diag_ftp.h b/drivers/s390/char/diag_ftp.h index 3abd2614053a..5d036ba7114f 100644 --- a/drivers/s390/char/diag_ftp.h +++ b/drivers/s390/char/diag_ftp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * DIAGNOSE X'2C4' instruction based SE/HMC FTP Services, useable on z/VM | 3 | * DIAGNOSE X'2C4' instruction based SE/HMC FTP Services, useable on z/VM |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/hmcdrv_cache.c b/drivers/s390/char/hmcdrv_cache.c index 4cda5ada143a..1f5bdb237862 100644 --- a/drivers/s390/char/hmcdrv_cache.c +++ b/drivers/s390/char/hmcdrv_cache.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * SE/HMC Drive (Read) Cache Functions | 3 | * SE/HMC Drive (Read) Cache Functions |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/hmcdrv_cache.h b/drivers/s390/char/hmcdrv_cache.h index a14b57526781..d69f9fe87faa 100644 --- a/drivers/s390/char/hmcdrv_cache.h +++ b/drivers/s390/char/hmcdrv_cache.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * SE/HMC Drive (Read) Cache Functions | 3 | * SE/HMC Drive (Read) Cache Functions |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/hmcdrv_dev.c b/drivers/s390/char/hmcdrv_dev.c index 43cee7fcd01c..20e9cd542e03 100644 --- a/drivers/s390/char/hmcdrv_dev.c +++ b/drivers/s390/char/hmcdrv_dev.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * HMC Drive CD/DVD Device | 3 | * HMC Drive CD/DVD Device |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/hmcdrv_dev.h b/drivers/s390/char/hmcdrv_dev.h index cb17f07e02de..558eba929130 100644 --- a/drivers/s390/char/hmcdrv_dev.h +++ b/drivers/s390/char/hmcdrv_dev.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * SE/HMC Drive FTP Device | 3 | * SE/HMC Drive FTP Device |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/hmcdrv_ftp.c b/drivers/s390/char/hmcdrv_ftp.c index 8cb7d8fbadd6..0e70397d6e04 100644 --- a/drivers/s390/char/hmcdrv_ftp.c +++ b/drivers/s390/char/hmcdrv_ftp.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * HMC Drive FTP Services | 3 | * HMC Drive FTP Services |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/hmcdrv_ftp.h b/drivers/s390/char/hmcdrv_ftp.h index f3643a7b3676..d12ca12b5ccd 100644 --- a/drivers/s390/char/hmcdrv_ftp.h +++ b/drivers/s390/char/hmcdrv_ftp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * SE/HMC Drive FTP Services | 3 | * SE/HMC Drive FTP Services |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c index 186d05e4c767..5b505fdaedec 100644 --- a/drivers/s390/char/keyboard.c +++ b/drivers/s390/char/keyboard.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * ebcdic keycode functions for s390 console drivers | 3 | * ebcdic keycode functions for s390 console drivers |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/keyboard.h b/drivers/s390/char/keyboard.h index a31f339211d5..a074d9711628 100644 --- a/drivers/s390/char/keyboard.h +++ b/drivers/s390/char/keyboard.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * ebcdic keycode functions for s390 console drivers | 3 | * ebcdic keycode functions for s390 console drivers |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/raw3270.h b/drivers/s390/char/raw3270.h index 56519cbb165c..114ca7cbf889 100644 --- a/drivers/s390/char/raw3270.h +++ b/drivers/s390/char/raw3270.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * IBM/3270 Driver | 3 | * IBM/3270 Driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c index 6111c1fa2d1e..41d8aa96801f 100644 --- a/drivers/s390/char/sclp.c +++ b/drivers/s390/char/sclp.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * core function to access sclp interface | 3 | * core function to access sclp interface |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp.h b/drivers/s390/char/sclp.h index 53b5d1b9761a..f41f6e2ca063 100644 --- a/drivers/s390/char/sclp.h +++ b/drivers/s390/char/sclp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 1999,2012 | 3 | * Copyright IBM Corp. 1999,2012 |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c index dff8b94871f0..d7686a68c093 100644 --- a/drivers/s390/char/sclp_cmd.c +++ b/drivers/s390/char/sclp_cmd.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2007,2012 | 3 | * Copyright IBM Corp. 2007,2012 |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_con.c b/drivers/s390/char/sclp_con.c index 6037bc87e767..d247f238faf8 100644 --- a/drivers/s390/char/sclp_con.c +++ b/drivers/s390/char/sclp_con.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * SCLP line mode console driver | 3 | * SCLP line mode console driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_config.c b/drivers/s390/char/sclp_config.c index 7003d52c2191..194ffd5c8580 100644 --- a/drivers/s390/char/sclp_config.c +++ b/drivers/s390/char/sclp_config.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2007 | 3 | * Copyright IBM Corp. 2007 |
| 3 | * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com> | 4 | * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com> |
diff --git a/drivers/s390/char/sclp_cpi_sys.c b/drivers/s390/char/sclp_cpi_sys.c index 90d92fbe7b9b..f60d7ea8268d 100644 --- a/drivers/s390/char/sclp_cpi_sys.c +++ b/drivers/s390/char/sclp_cpi_sys.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * SCLP control program identification sysfs interface | 3 | * SCLP control program identification sysfs interface |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_cpi_sys.h b/drivers/s390/char/sclp_cpi_sys.h index 65bb6a99c97f..edf60d1ca633 100644 --- a/drivers/s390/char/sclp_cpi_sys.h +++ b/drivers/s390/char/sclp_cpi_sys.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * SCLP control program identification sysfs interface | 3 | * SCLP control program identification sysfs interface |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_ctl.c b/drivers/s390/char/sclp_ctl.c index 78a7e4f94721..a78cea0c3a09 100644 --- a/drivers/s390/char/sclp_ctl.c +++ b/drivers/s390/char/sclp_ctl.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * IOCTL interface for SCLP | 3 | * IOCTL interface for SCLP |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_diag.h b/drivers/s390/char/sclp_diag.h index 59c4afa5e670..796c5311b865 100644 --- a/drivers/s390/char/sclp_diag.h +++ b/drivers/s390/char/sclp_diag.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2013 | 3 | * Copyright IBM Corp. 2013 |
| 3 | * Author(s): Ralf Hoppe (rhoppe@de.ibm.com) | 4 | * Author(s): Ralf Hoppe (rhoppe@de.ibm.com) |
diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c index bc1fc00910b0..d06bc5674e5f 100644 --- a/drivers/s390/char/sclp_early.c +++ b/drivers/s390/char/sclp_early.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * SCLP early driver | 3 | * SCLP early driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_early_core.c b/drivers/s390/char/sclp_early_core.c index 5029cc87e80f..edeb2597b0b8 100644 --- a/drivers/s390/char/sclp_early_core.c +++ b/drivers/s390/char/sclp_early_core.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2015 | 3 | * Copyright IBM Corp. 2015 |
| 3 | * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com> | 4 | * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com> |
diff --git a/drivers/s390/char/sclp_ftp.c b/drivers/s390/char/sclp_ftp.c index 6561cc5b2d5d..dfdd6c8fd17e 100644 --- a/drivers/s390/char/sclp_ftp.c +++ b/drivers/s390/char/sclp_ftp.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * SCLP Event Type (ET) 7 - Diagnostic Test FTP Services, useable on LPAR | 3 | * SCLP Event Type (ET) 7 - Diagnostic Test FTP Services, useable on LPAR |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_ftp.h b/drivers/s390/char/sclp_ftp.h index 98ba3183e7d9..d64da18c194d 100644 --- a/drivers/s390/char/sclp_ftp.h +++ b/drivers/s390/char/sclp_ftp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * SCLP Event Type (ET) 7 - Diagnostic Test FTP Services, useable on LPAR | 3 | * SCLP Event Type (ET) 7 - Diagnostic Test FTP Services, useable on LPAR |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_ocf.c b/drivers/s390/char/sclp_ocf.c index f9cbb1ab047b..d35f10ea5b52 100644 --- a/drivers/s390/char/sclp_ocf.c +++ b/drivers/s390/char/sclp_ocf.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * SCLP OCF communication parameters sysfs interface | 3 | * SCLP OCF communication parameters sysfs interface |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_pci.c b/drivers/s390/char/sclp_pci.c index 4dbb3dfd4bc7..e7c84a4e5eb5 100644 --- a/drivers/s390/char/sclp_pci.c +++ b/drivers/s390/char/sclp_pci.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * PCI I/O adapter configuration related functions. | 3 | * PCI I/O adapter configuration related functions. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_quiesce.c b/drivers/s390/char/sclp_quiesce.c index e4958511168a..76956c2131cd 100644 --- a/drivers/s390/char/sclp_quiesce.c +++ b/drivers/s390/char/sclp_quiesce.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * signal quiesce handler | 3 | * signal quiesce handler |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_rw.c b/drivers/s390/char/sclp_rw.c index 91b26df5227d..44594a492553 100644 --- a/drivers/s390/char/sclp_rw.c +++ b/drivers/s390/char/sclp_rw.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * driver: reading from and writing to system console on S/390 via SCLP | 3 | * driver: reading from and writing to system console on S/390 via SCLP |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_rw.h b/drivers/s390/char/sclp_rw.h index e3b0290995ba..a2eb22f67393 100644 --- a/drivers/s390/char/sclp_rw.h +++ b/drivers/s390/char/sclp_rw.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * interface to the SCLP-read/write driver | 3 | * interface to the SCLP-read/write driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c index 7cdd13dd7be1..8e0b69a2f11a 100644 --- a/drivers/s390/char/sclp_sdias.c +++ b/drivers/s390/char/sclp_sdias.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * SCLP "store data in absolute storage" | 3 | * SCLP "store data in absolute storage" |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_sdias.h b/drivers/s390/char/sclp_sdias.h index f2431c414150..bc36cf881010 100644 --- a/drivers/s390/char/sclp_sdias.h +++ b/drivers/s390/char/sclp_sdias.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * SCLP "store data in absolute storage" | 3 | * SCLP "store data in absolute storage" |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c index 236b736ae136..875628dab419 100644 --- a/drivers/s390/char/sclp_tty.c +++ b/drivers/s390/char/sclp_tty.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * SCLP line mode terminal driver. | 3 | * SCLP line mode terminal driver. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_tty.h b/drivers/s390/char/sclp_tty.h index c8773421c31f..0fa2d5971d0f 100644 --- a/drivers/s390/char/sclp_tty.h +++ b/drivers/s390/char/sclp_tty.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * interface to the SCLP-read/write driver | 3 | * interface to the SCLP-read/write driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c index 095481d32236..e84395d71389 100644 --- a/drivers/s390/char/sclp_vt220.c +++ b/drivers/s390/char/sclp_vt220.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * SCLP VT220 terminal driver. | 3 | * SCLP VT220 terminal driver. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/tape.h b/drivers/s390/char/tape.h index ea664dd4f56d..997b25f6e4cc 100644 --- a/drivers/s390/char/tape.h +++ b/drivers/s390/char/tape.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * tape device driver for 3480/3490E/3590 tapes. | 3 | * tape device driver for 3480/3490E/3590 tapes. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/tape_3590.h b/drivers/s390/char/tape_3590.h index 36b759e89d22..b398d8a3ed3c 100644 --- a/drivers/s390/char/tape_3590.h +++ b/drivers/s390/char/tape_3590.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * tape device discipline for 3590 tapes. | 3 | * tape device discipline for 3590 tapes. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c index 46ac1164f242..fc206c9d1c56 100644 --- a/drivers/s390/char/tape_char.c +++ b/drivers/s390/char/tape_char.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * character device frontend for tape device driver | 3 | * character device frontend for tape device driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/tape_class.h b/drivers/s390/char/tape_class.h index a332c10d50ad..d25ac075b1ad 100644 --- a/drivers/s390/char/tape_class.h +++ b/drivers/s390/char/tape_class.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2004 All Rights Reserved. | 3 | * Copyright IBM Corp. 2004 All Rights Reserved. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/tape_proc.c b/drivers/s390/char/tape_proc.c index 8733b232a116..faae30476f4b 100644 --- a/drivers/s390/char/tape_proc.c +++ b/drivers/s390/char/tape_proc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * tape device driver for S/390 and zSeries tapes. | 3 | * tape device driver for S/390 and zSeries tapes. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c index 3478e19ae194..7caba0cc8b2a 100644 --- a/drivers/s390/char/tape_std.c +++ b/drivers/s390/char/tape_std.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * standard tape device functions for ibm tapes. | 3 | * standard tape device functions for ibm tapes. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/tape_std.h b/drivers/s390/char/tape_std.h index 8c760c036832..53ec8e2870d4 100644 --- a/drivers/s390/char/tape_std.h +++ b/drivers/s390/char/tape_std.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * standard tape device functions for ibm tapes. | 3 | * standard tape device functions for ibm tapes. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/tty3270.h b/drivers/s390/char/tty3270.h index 11141a8f8974..52ceed6f8408 100644 --- a/drivers/s390/char/tty3270.h +++ b/drivers/s390/char/tty3270.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2007 | 3 | * Copyright IBM Corp. 2007 |
| 3 | * | 4 | * |
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c index 7898bbcc28fc..17e411c57576 100644 --- a/drivers/s390/char/vmcp.c +++ b/drivers/s390/char/vmcp.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2004, 2010 | 3 | * Copyright IBM Corp. 2004, 2010 |
| 3 | * Interface implementation for communication with the z/VM control program | 4 | * Interface implementation for communication with the z/VM control program |
diff --git a/drivers/s390/char/vmur.h b/drivers/s390/char/vmur.h index fa320ad4593d..67164ba22f11 100644 --- a/drivers/s390/char/vmur.h +++ b/drivers/s390/char/vmur.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Linux driver for System z and s390 unit record devices | 3 | * Linux driver for System z and s390 unit record devices |
| 3 | * (z/VM virtual punch, reader, printer) | 4 | * (z/VM virtual punch, reader, printer) |
diff --git a/drivers/s390/cio/Makefile b/drivers/s390/cio/Makefile index bdf47526038a..a070ef0efe65 100644 --- a/drivers/s390/cio/Makefile +++ b/drivers/s390/cio/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the S/390 common i/o drivers | 3 | # Makefile for the S/390 common i/o drivers |
| 3 | # | 4 | # |
diff --git a/drivers/s390/cio/airq.c b/drivers/s390/cio/airq.c index 99b5db469097..a45011e4529e 100644 --- a/drivers/s390/cio/airq.c +++ b/drivers/s390/cio/airq.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Support for adapter interruptions | 3 | * Support for adapter interruptions |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c index bf7f5d4c50e1..2a3f874a21d5 100644 --- a/drivers/s390/cio/blacklist.c +++ b/drivers/s390/cio/blacklist.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * S/390 common I/O routines -- blacklisting of specific devices | 3 | * S/390 common I/O routines -- blacklisting of specific devices |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/ccwreq.c b/drivers/s390/cio/ccwreq.c index 2782100b2c07..603268a33ea1 100644 --- a/drivers/s390/cio/ccwreq.c +++ b/drivers/s390/cio/ccwreq.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Handling of internal CCW device requests. | 3 | * Handling of internal CCW device requests. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/chp.h b/drivers/s390/cio/chp.h index 0d8437b7ea72..7e80323cd261 100644 --- a/drivers/s390/cio/chp.h +++ b/drivers/s390/cio/chp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2007, 2010 | 3 | * Copyright IBM Corp. 2007, 2010 |
| 3 | * Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com> | 4 | * Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com> |
diff --git a/drivers/s390/cio/chsc.h b/drivers/s390/cio/chsc.h index 321a3f765810..dda5953534b7 100644 --- a/drivers/s390/cio/chsc.h +++ b/drivers/s390/cio/chsc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef S390_CHSC_H | 2 | #ifndef S390_CHSC_H |
| 2 | #define S390_CHSC_H | 3 | #define S390_CHSC_H |
| 3 | 4 | ||
diff --git a/drivers/s390/cio/chsc_sch.h b/drivers/s390/cio/chsc_sch.h index 589ebfad6aad..ff5328b0bc8a 100644 --- a/drivers/s390/cio/chsc_sch.h +++ b/drivers/s390/cio/chsc_sch.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _CHSC_SCH_H | 2 | #ifndef _CHSC_SCH_H |
| 2 | #define _CHSC_SCH_H | 3 | #define _CHSC_SCH_H |
| 3 | 4 | ||
diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h index 939596d81b73..94cd813bdcfe 100644 --- a/drivers/s390/cio/cio.h +++ b/drivers/s390/cio/cio.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef S390_CIO_H | 2 | #ifndef S390_CIO_H |
| 2 | #define S390_CIO_H | 3 | #define S390_CIO_H |
| 3 | 4 | ||
diff --git a/drivers/s390/cio/cio_debug.h b/drivers/s390/cio/cio_debug.h index e64e8278c42e..fa817efcec8f 100644 --- a/drivers/s390/cio/cio_debug.h +++ b/drivers/s390/cio/cio_debug.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef CIO_DEBUG_H | 2 | #ifndef CIO_DEBUG_H |
| 2 | #define CIO_DEBUG_H | 3 | #define CIO_DEBUG_H |
| 3 | 4 | ||
diff --git a/drivers/s390/cio/crw.c b/drivers/s390/cio/crw.c index 3d3cd402b376..fc285ca41141 100644 --- a/drivers/s390/cio/crw.c +++ b/drivers/s390/cio/crw.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Channel report handling code | 3 | * Channel report handling code |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h index c9f3fb39ebeb..30357cbf350a 100644 --- a/drivers/s390/cio/css.h +++ b/drivers/s390/cio/css.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _CSS_H | 2 | #ifndef _CSS_H |
| 2 | #define _CSS_H | 3 | #define _CSS_H |
| 3 | 4 | ||
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h index 69cb70f080a5..b37c22adcc7a 100644 --- a/drivers/s390/cio/device.h +++ b/drivers/s390/cio/device.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef S390_DEVICE_H | 2 | #ifndef S390_DEVICE_H |
| 2 | #define S390_DEVICE_H | 3 | #define S390_DEVICE_H |
| 3 | 4 | ||
diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c index d4fa30541a33..f6df83a9dfbb 100644 --- a/drivers/s390/cio/device_id.c +++ b/drivers/s390/cio/device_id.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * CCW device SENSE ID I/O handling. | 3 | * CCW device SENSE ID I/O handling. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c index da246b67edfe..d30a3babf176 100644 --- a/drivers/s390/cio/device_pgid.c +++ b/drivers/s390/cio/device_pgid.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * CCW device PGID and path verification I/O handling. | 3 | * CCW device PGID and path verification I/O handling. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c index 9bc3512374c9..7d5c7892b2c4 100644 --- a/drivers/s390/cio/device_status.c +++ b/drivers/s390/cio/device_status.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2002 | 3 | * Copyright IBM Corp. 2002 |
| 3 | * Author(s): Cornelia Huck (cornelia.huck@de.ibm.com) | 4 | * Author(s): Cornelia Huck (cornelia.huck@de.ibm.com) |
diff --git a/drivers/s390/cio/eadm_sch.h b/drivers/s390/cio/eadm_sch.h index 9664e4653f98..390ab5a6b72f 100644 --- a/drivers/s390/cio/eadm_sch.h +++ b/drivers/s390/cio/eadm_sch.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef EADM_SCH_H | 2 | #ifndef EADM_SCH_H |
| 2 | #define EADM_SCH_H | 3 | #define EADM_SCH_H |
| 3 | 4 | ||
diff --git a/drivers/s390/cio/fcx.c b/drivers/s390/cio/fcx.c index ca5e9bb9d458..99c900cc3e5b 100644 --- a/drivers/s390/cio/fcx.c +++ b/drivers/s390/cio/fcx.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Functions for assembling fcx enabled I/O control blocks. | 3 | * Functions for assembling fcx enabled I/O control blocks. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/idset.c b/drivers/s390/cio/idset.c index b3e06a7b9480..835de44dbbcc 100644 --- a/drivers/s390/cio/idset.c +++ b/drivers/s390/cio/idset.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2007, 2012 | 3 | * Copyright IBM Corp. 2007, 2012 |
| 3 | * Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com> | 4 | * Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com> |
diff --git a/drivers/s390/cio/idset.h b/drivers/s390/cio/idset.h index 89a787790888..a3ece8d8091a 100644 --- a/drivers/s390/cio/idset.h +++ b/drivers/s390/cio/idset.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2007, 2012 | 3 | * Copyright IBM Corp. 2007, 2012 |
| 3 | * Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com> | 4 | * Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com> |
diff --git a/drivers/s390/cio/io_sch.h b/drivers/s390/cio/io_sch.h index 9a1b56b2df3e..af571d8d6925 100644 --- a/drivers/s390/cio/io_sch.h +++ b/drivers/s390/cio/io_sch.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef S390_IO_SCH_H | 2 | #ifndef S390_IO_SCH_H |
| 2 | #define S390_IO_SCH_H | 3 | #define S390_IO_SCH_H |
| 3 | 4 | ||
diff --git a/drivers/s390/cio/ioasm.c b/drivers/s390/cio/ioasm.c index 4182f60124da..4fa9ee1d09fa 100644 --- a/drivers/s390/cio/ioasm.c +++ b/drivers/s390/cio/ioasm.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Channel subsystem I/O instructions. | 3 | * Channel subsystem I/O instructions. |
| 3 | */ | 4 | */ |
diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h index b31ee6bff1e4..35ad4ddd61e0 100644 --- a/drivers/s390/cio/ioasm.h +++ b/drivers/s390/cio/ioasm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef S390_CIO_IOASM_H | 2 | #ifndef S390_CIO_IOASM_H |
| 2 | #define S390_CIO_IOASM_H | 3 | #define S390_CIO_IOASM_H |
| 3 | 4 | ||
diff --git a/drivers/s390/cio/itcw.c b/drivers/s390/cio/itcw.c index 358ee16d10a2..deaf59f93326 100644 --- a/drivers/s390/cio/itcw.c +++ b/drivers/s390/cio/itcw.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Functions for incremental construction of fcx enabled I/O control blocks. | 3 | * Functions for incremental construction of fcx enabled I/O control blocks. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/orb.h b/drivers/s390/cio/orb.h index 7a640530e7f5..a2d3778b2c95 100644 --- a/drivers/s390/cio/orb.h +++ b/drivers/s390/cio/orb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Orb related data structures. | 3 | * Orb related data structures. |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h index 7e70f9298cc1..29d6b5222f1c 100644 --- a/drivers/s390/cio/qdio.h +++ b/drivers/s390/cio/qdio.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2000, 2009 | 3 | * Copyright IBM Corp. 2000, 2009 |
| 3 | * Author(s): Utz Bacher <utz.bacher@de.ibm.com> | 4 | * Author(s): Utz Bacher <utz.bacher@de.ibm.com> |
diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c index b6fc147f83d8..68a82f3e2e92 100644 --- a/drivers/s390/cio/qdio_debug.c +++ b/drivers/s390/cio/qdio_debug.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2008, 2009 | 3 | * Copyright IBM Corp. 2008, 2009 |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/qdio_debug.h b/drivers/s390/cio/qdio_debug.h index 1d595d17bf11..e06496ab0036 100644 --- a/drivers/s390/cio/qdio_debug.h +++ b/drivers/s390/cio/qdio_debug.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2008 | 3 | * Copyright IBM Corp. 2008 |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c index c61164f4528e..a739bdf9630e 100644 --- a/drivers/s390/cio/qdio_thinint.c +++ b/drivers/s390/cio/qdio_thinint.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2000, 2009 | 3 | * Copyright IBM Corp. 2000, 2009 |
| 3 | * Author(s): Utz Bacher <utz.bacher@de.ibm.com> | 4 | * Author(s): Utz Bacher <utz.bacher@de.ibm.com> |
diff --git a/drivers/s390/cio/trace.c b/drivers/s390/cio/trace.c index 8e706669ac8b..e331cd97e83b 100644 --- a/drivers/s390/cio/trace.c +++ b/drivers/s390/cio/trace.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Tracepoint definitions for s390_cio | 3 | * Tracepoint definitions for s390_cio |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/trace.h b/drivers/s390/cio/trace.h index 5b807a09f21b..1f8d1c1e566d 100644 --- a/drivers/s390/cio/trace.h +++ b/drivers/s390/cio/trace.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Tracepoint header for the s390 Common I/O layer (CIO) | 3 | * Tracepoint header for the s390 Common I/O layer (CIO) |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/vfio_ccw_cp.c b/drivers/s390/cio/vfio_ccw_cp.c index 5ccfdc80d0ec..f20b4d66c75f 100644 --- a/drivers/s390/cio/vfio_ccw_cp.c +++ b/drivers/s390/cio/vfio_ccw_cp.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * channel program interfaces | 3 | * channel program interfaces |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/vfio_ccw_cp.h b/drivers/s390/cio/vfio_ccw_cp.h index 7a1996b3b36d..a4b74fb1aa57 100644 --- a/drivers/s390/cio/vfio_ccw_cp.h +++ b/drivers/s390/cio/vfio_ccw_cp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * channel program interfaces | 3 | * channel program interfaces |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/vfio_ccw_fsm.c b/drivers/s390/cio/vfio_ccw_fsm.c index 80a0559cd7ce..c30420c517b1 100644 --- a/drivers/s390/cio/vfio_ccw_fsm.c +++ b/drivers/s390/cio/vfio_ccw_fsm.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Finite state machine for vfio-ccw device handling | 3 | * Finite state machine for vfio-ccw device handling |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/vfio_ccw_ops.c b/drivers/s390/cio/vfio_ccw_ops.c index a66a317f3e4f..41eeb57d68a3 100644 --- a/drivers/s390/cio/vfio_ccw_ops.c +++ b/drivers/s390/cio/vfio_ccw_ops.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Physical device callbacks for vfio_ccw | 3 | * Physical device callbacks for vfio_ccw |
| 3 | * | 4 | * |
diff --git a/drivers/s390/cio/vfio_ccw_private.h b/drivers/s390/cio/vfio_ccw_private.h index fc0f01c16ef9..78a66d96756b 100644 --- a/drivers/s390/cio/vfio_ccw_private.h +++ b/drivers/s390/cio/vfio_ccw_private.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Private stuff for vfio_ccw driver | 3 | * Private stuff for vfio_ccw driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/crypto/Makefile b/drivers/s390/crypto/Makefile index be36f1010d75..b59af548ed1c 100644 --- a/drivers/s390/crypto/Makefile +++ b/drivers/s390/crypto/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # S/390 crypto devices | 3 | # S/390 crypto devices |
| 3 | # | 4 | # |
diff --git a/drivers/s390/crypto/ap_asm.h b/drivers/s390/crypto/ap_asm.h index cd350345b3d2..6c0474c834d4 100644 --- a/drivers/s390/crypto/ap_asm.h +++ b/drivers/s390/crypto/ap_asm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2016 | 3 | * Copyright IBM Corp. 2016 |
| 3 | * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com> | 4 | * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com> |
diff --git a/drivers/s390/crypto/ap_card.c b/drivers/s390/crypto/ap_card.c index 836efac96813..8a31c9e95430 100644 --- a/drivers/s390/crypto/ap_card.c +++ b/drivers/s390/crypto/ap_card.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2016 | 3 | * Copyright IBM Corp. 2016 |
| 3 | * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com> | 4 | * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com> |
diff --git a/drivers/s390/crypto/ap_debug.h b/drivers/s390/crypto/ap_debug.h index 78dbff842dae..6a9d77c75ec3 100644 --- a/drivers/s390/crypto/ap_debug.h +++ b/drivers/s390/crypto/ap_debug.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2016 | 3 | * Copyright IBM Corp. 2016 |
| 3 | * Author(s): Harald Freudenberger <freude@de.ibm.com> | 4 | * Author(s): Harald Freudenberger <freude@de.ibm.com> |
diff --git a/drivers/s390/crypto/ap_queue.c b/drivers/s390/crypto/ap_queue.c index 56b96edffd5b..6c8bd8ad6185 100644 --- a/drivers/s390/crypto/ap_queue.c +++ b/drivers/s390/crypto/ap_queue.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2016 | 3 | * Copyright IBM Corp. 2016 |
| 3 | * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com> | 4 | * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com> |
diff --git a/drivers/s390/crypto/zcrypt_cex4.h b/drivers/s390/crypto/zcrypt_cex4.h index 719571375ccc..748390a3799b 100644 --- a/drivers/s390/crypto/zcrypt_cex4.h +++ b/drivers/s390/crypto/zcrypt_cex4.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2012 | 3 | * Copyright IBM Corp. 2012 |
| 3 | * Author(s): Holger Dengler <hd@linux.vnet.ibm.com> | 4 | * Author(s): Holger Dengler <hd@linux.vnet.ibm.com> |
diff --git a/drivers/s390/crypto/zcrypt_debug.h b/drivers/s390/crypto/zcrypt_debug.h index 13e38defb6b8..241dbb5f75bf 100644 --- a/drivers/s390/crypto/zcrypt_debug.h +++ b/drivers/s390/crypto/zcrypt_debug.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2016 | 3 | * Copyright IBM Corp. 2016 |
| 3 | * Author(s): Holger Dengler (hd@linux.vnet.ibm.com) | 4 | * Author(s): Holger Dengler (hd@linux.vnet.ibm.com) |
diff --git a/drivers/s390/net/Makefile b/drivers/s390/net/Makefile index c351b07603e0..513b7ae64980 100644 --- a/drivers/s390/net/Makefile +++ b/drivers/s390/net/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # S/390 network devices | 3 | # S/390 network devices |
| 3 | # | 4 | # |
diff --git a/drivers/s390/net/ctcm_dbug.c b/drivers/s390/net/ctcm_dbug.c index 8363f1c966ef..f7ec51db3cd6 100644 --- a/drivers/s390/net/ctcm_dbug.c +++ b/drivers/s390/net/ctcm_dbug.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2001, 2007 | 3 | * Copyright IBM Corp. 2001, 2007 |
| 3 | * Authors: Peter Tiedemann (ptiedem@de.ibm.com) | 4 | * Authors: Peter Tiedemann (ptiedem@de.ibm.com) |
diff --git a/drivers/s390/net/ctcm_dbug.h b/drivers/s390/net/ctcm_dbug.h index 47bf0501995e..675575ef162e 100644 --- a/drivers/s390/net/ctcm_dbug.h +++ b/drivers/s390/net/ctcm_dbug.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2001, 2007 | 3 | * Copyright IBM Corp. 2001, 2007 |
| 3 | * Authors: Peter Tiedemann (ptiedem@de.ibm.com) | 4 | * Authors: Peter Tiedemann (ptiedem@de.ibm.com) |
diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c index 570ae3b7adf6..1b4ee570b712 100644 --- a/drivers/s390/net/ctcm_fsms.c +++ b/drivers/s390/net/ctcm_fsms.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2001, 2007 | 3 | * Copyright IBM Corp. 2001, 2007 |
| 3 | * Authors: Fritz Elfert (felfert@millenux.com) | 4 | * Authors: Fritz Elfert (felfert@millenux.com) |
diff --git a/drivers/s390/net/ctcm_fsms.h b/drivers/s390/net/ctcm_fsms.h index c963d04799c0..225737295cb4 100644 --- a/drivers/s390/net/ctcm_fsms.h +++ b/drivers/s390/net/ctcm_fsms.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2001, 2007 | 3 | * Copyright IBM Corp. 2001, 2007 |
| 3 | * Authors: Fritz Elfert (felfert@millenux.com) | 4 | * Authors: Fritz Elfert (felfert@millenux.com) |
diff --git a/drivers/s390/net/ctcm_main.h b/drivers/s390/net/ctcm_main.h index 6f4417c80247..16bdf23ee02b 100644 --- a/drivers/s390/net/ctcm_main.h +++ b/drivers/s390/net/ctcm_main.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2001, 2007 | 3 | * Copyright IBM Corp. 2001, 2007 |
| 3 | * Authors: Fritz Elfert (felfert@millenux.com) | 4 | * Authors: Fritz Elfert (felfert@millenux.com) |
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c index f8be39634f03..e02f295d38a9 100644 --- a/drivers/s390/net/ctcm_mpc.c +++ b/drivers/s390/net/ctcm_mpc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2004, 2007 | 3 | * Copyright IBM Corp. 2004, 2007 |
| 3 | * Authors: Belinda Thompson (belindat@us.ibm.com) | 4 | * Authors: Belinda Thompson (belindat@us.ibm.com) |
diff --git a/drivers/s390/net/ctcm_mpc.h b/drivers/s390/net/ctcm_mpc.h index bd1b1cc54ffa..441d7b211f0f 100644 --- a/drivers/s390/net/ctcm_mpc.h +++ b/drivers/s390/net/ctcm_mpc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2007 | 3 | * Copyright IBM Corp. 2007 |
| 3 | * Authors: Peter Tiedemann (ptiedem@de.ibm.com) | 4 | * Authors: Peter Tiedemann (ptiedem@de.ibm.com) |
diff --git a/drivers/s390/net/ctcm_sysfs.c b/drivers/s390/net/ctcm_sysfs.c index ddb0aa321339..ded1930a00b2 100644 --- a/drivers/s390/net/ctcm_sysfs.c +++ b/drivers/s390/net/ctcm_sysfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2007, 2007 | 3 | * Copyright IBM Corp. 2007, 2007 |
| 3 | * Authors: Peter Tiedemann (ptiedem@de.ibm.com) | 4 | * Authors: Peter Tiedemann (ptiedem@de.ibm.com) |
diff --git a/drivers/s390/net/fsm.h b/drivers/s390/net/fsm.h index a4510cf59034..16dc071a2973 100644 --- a/drivers/s390/net/fsm.h +++ b/drivers/s390/net/fsm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _FSM_H_ | 2 | #ifndef _FSM_H_ |
| 2 | #define _FSM_H_ | 3 | #define _FSM_H_ |
| 3 | 4 | ||
diff --git a/drivers/s390/net/lcs.h b/drivers/s390/net/lcs.h index 150fcb4cebc3..f94d8f6dd7a8 100644 --- a/drivers/s390/net/lcs.h +++ b/drivers/s390/net/lcs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /*lcs.h*/ | 2 | /*lcs.h*/ |
| 2 | 3 | ||
| 3 | #include <linux/interrupt.h> | 4 | #include <linux/interrupt.h> |
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h index 59e09854c4f7..47a13c5723c6 100644 --- a/drivers/s390/net/qeth_core.h +++ b/drivers/s390/net/qeth_core.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2007 | 3 | * Copyright IBM Corp. 2007 |
| 3 | * Author(s): Utz Bacher <utz.bacher@de.ibm.com>, | 4 | * Author(s): Utz Bacher <utz.bacher@de.ibm.com>, |
diff --git a/drivers/s390/net/qeth_core_mpc.c b/drivers/s390/net/qeth_core_mpc.c index 6dd7d05e5693..dafb8c643426 100644 --- a/drivers/s390/net/qeth_core_mpc.c +++ b/drivers/s390/net/qeth_core_mpc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2007 | 3 | * Copyright IBM Corp. 2007 |
| 3 | * Author(s): Frank Pavlic <fpavlic@de.ibm.com>, | 4 | * Author(s): Frank Pavlic <fpavlic@de.ibm.com>, |
diff --git a/drivers/s390/net/qeth_core_mpc.h b/drivers/s390/net/qeth_core_mpc.h index 912e0107de8f..55f3d234ea1d 100644 --- a/drivers/s390/net/qeth_core_mpc.h +++ b/drivers/s390/net/qeth_core_mpc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2007 | 3 | * Copyright IBM Corp. 2007 |
| 3 | * Author(s): Frank Pavlic <fpavlic@de.ibm.com>, | 4 | * Author(s): Frank Pavlic <fpavlic@de.ibm.com>, |
diff --git a/drivers/s390/net/qeth_l2.h b/drivers/s390/net/qeth_l2.h index 0d59f9a45ea9..d4a8293d318d 100644 --- a/drivers/s390/net/qeth_l2.h +++ b/drivers/s390/net/qeth_l2.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2013 | 3 | * Copyright IBM Corp. 2013 |
| 3 | * Author(s): Eugene Crosser <eugene.crosser@ru.ibm.com> | 4 | * Author(s): Eugene Crosser <eugene.crosser@ru.ibm.com> |
diff --git a/drivers/s390/net/qeth_l2_sys.c b/drivers/s390/net/qeth_l2_sys.c index 9696baa49e2d..d33d413f7150 100644 --- a/drivers/s390/net/qeth_l2_sys.c +++ b/drivers/s390/net/qeth_l2_sys.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2013 | 3 | * Copyright IBM Corp. 2013 |
| 3 | * Author(s): Eugene Crosser <eugene.crosser@ru.ibm.com> | 4 | * Author(s): Eugene Crosser <eugene.crosser@ru.ibm.com> |
diff --git a/drivers/s390/net/qeth_l3.h b/drivers/s390/net/qeth_l3.h index 9b5e439f18cf..194ae9b577cc 100644 --- a/drivers/s390/net/qeth_l3.h +++ b/drivers/s390/net/qeth_l3.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2007 | 3 | * Copyright IBM Corp. 2007 |
| 3 | * Author(s): Utz Bacher <utz.bacher@de.ibm.com>, | 4 | * Author(s): Utz Bacher <utz.bacher@de.ibm.com>, |
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c index e8bcc314cc5f..7a829ad77783 100644 --- a/drivers/s390/net/qeth_l3_sys.c +++ b/drivers/s390/net/qeth_l3_sys.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2007 | 3 | * Copyright IBM Corp. 2007 |
| 3 | * Author(s): Utz Bacher <utz.bacher@de.ibm.com>, | 4 | * Author(s): Utz Bacher <utz.bacher@de.ibm.com>, |
diff --git a/drivers/s390/net/smsgiucv.h b/drivers/s390/net/smsgiucv.h index 45bc925928ca..a0d6c6130c4b 100644 --- a/drivers/s390/net/smsgiucv.h +++ b/drivers/s390/net/smsgiucv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * IUCV special message driver | 3 | * IUCV special message driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c index 82ac331d9125..84752152d41f 100644 --- a/drivers/s390/scsi/zfcp_aux.c +++ b/drivers/s390/scsi/zfcp_aux.c | |||
| @@ -357,6 +357,8 @@ struct zfcp_adapter *zfcp_adapter_enqueue(struct ccw_device *ccw_device) | |||
| 357 | 357 | ||
| 358 | adapter->next_port_scan = jiffies; | 358 | adapter->next_port_scan = jiffies; |
| 359 | 359 | ||
| 360 | adapter->erp_action.adapter = adapter; | ||
| 361 | |||
| 360 | if (zfcp_qdio_setup(adapter)) | 362 | if (zfcp_qdio_setup(adapter)) |
| 361 | goto failed; | 363 | goto failed; |
| 362 | 364 | ||
| @@ -513,6 +515,9 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn, | |||
| 513 | port->dev.groups = zfcp_port_attr_groups; | 515 | port->dev.groups = zfcp_port_attr_groups; |
| 514 | port->dev.release = zfcp_port_release; | 516 | port->dev.release = zfcp_port_release; |
| 515 | 517 | ||
| 518 | port->erp_action.adapter = adapter; | ||
| 519 | port->erp_action.port = port; | ||
| 520 | |||
| 516 | if (dev_set_name(&port->dev, "0x%016llx", (unsigned long long)wwpn)) { | 521 | if (dev_set_name(&port->dev, "0x%016llx", (unsigned long long)wwpn)) { |
| 517 | kfree(port); | 522 | kfree(port); |
| 518 | goto err_out; | 523 | goto err_out; |
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c index 54c7b48fdb46..49eda141ea43 100644 --- a/drivers/s390/scsi/zfcp_ccw.c +++ b/drivers/s390/scsi/zfcp_ccw.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c index 8227076c9cbb..a8b831000b2d 100644 --- a/drivers/s390/scsi/zfcp_dbf.c +++ b/drivers/s390/scsi/zfcp_dbf.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/scsi/zfcp_dbf.h b/drivers/s390/scsi/zfcp_dbf.h index 3508c00458f4..e2a973cd2573 100644 --- a/drivers/s390/scsi/zfcp_dbf.h +++ b/drivers/s390/scsi/zfcp_dbf.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * debug feature declarations | 4 | * debug feature declarations |
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h index b8e853e53546..3396a47721a7 100644 --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index 37408f5f81ce..cbb8156bf5e0 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * | 4 | * |
| @@ -193,9 +194,8 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status, | |||
| 193 | atomic_or(ZFCP_STATUS_COMMON_ERP_INUSE, | 194 | atomic_or(ZFCP_STATUS_COMMON_ERP_INUSE, |
| 194 | &zfcp_sdev->status); | 195 | &zfcp_sdev->status); |
| 195 | erp_action = &zfcp_sdev->erp_action; | 196 | erp_action = &zfcp_sdev->erp_action; |
| 196 | memset(erp_action, 0, sizeof(struct zfcp_erp_action)); | 197 | WARN_ON_ONCE(erp_action->port != port); |
| 197 | erp_action->port = port; | 198 | WARN_ON_ONCE(erp_action->sdev != sdev); |
| 198 | erp_action->sdev = sdev; | ||
| 199 | if (!(atomic_read(&zfcp_sdev->status) & | 199 | if (!(atomic_read(&zfcp_sdev->status) & |
| 200 | ZFCP_STATUS_COMMON_RUNNING)) | 200 | ZFCP_STATUS_COMMON_RUNNING)) |
| 201 | act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY; | 201 | act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY; |
| @@ -208,8 +208,8 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status, | |||
| 208 | zfcp_erp_action_dismiss_port(port); | 208 | zfcp_erp_action_dismiss_port(port); |
| 209 | atomic_or(ZFCP_STATUS_COMMON_ERP_INUSE, &port->status); | 209 | atomic_or(ZFCP_STATUS_COMMON_ERP_INUSE, &port->status); |
| 210 | erp_action = &port->erp_action; | 210 | erp_action = &port->erp_action; |
| 211 | memset(erp_action, 0, sizeof(struct zfcp_erp_action)); | 211 | WARN_ON_ONCE(erp_action->port != port); |
| 212 | erp_action->port = port; | 212 | WARN_ON_ONCE(erp_action->sdev != NULL); |
| 213 | if (!(atomic_read(&port->status) & ZFCP_STATUS_COMMON_RUNNING)) | 213 | if (!(atomic_read(&port->status) & ZFCP_STATUS_COMMON_RUNNING)) |
| 214 | act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY; | 214 | act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY; |
| 215 | break; | 215 | break; |
| @@ -219,7 +219,8 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status, | |||
| 219 | zfcp_erp_action_dismiss_adapter(adapter); | 219 | zfcp_erp_action_dismiss_adapter(adapter); |
| 220 | atomic_or(ZFCP_STATUS_COMMON_ERP_INUSE, &adapter->status); | 220 | atomic_or(ZFCP_STATUS_COMMON_ERP_INUSE, &adapter->status); |
| 221 | erp_action = &adapter->erp_action; | 221 | erp_action = &adapter->erp_action; |
| 222 | memset(erp_action, 0, sizeof(struct zfcp_erp_action)); | 222 | WARN_ON_ONCE(erp_action->port != NULL); |
| 223 | WARN_ON_ONCE(erp_action->sdev != NULL); | ||
| 223 | if (!(atomic_read(&adapter->status) & | 224 | if (!(atomic_read(&adapter->status) & |
| 224 | ZFCP_STATUS_COMMON_RUNNING)) | 225 | ZFCP_STATUS_COMMON_RUNNING)) |
| 225 | act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY; | 226 | act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY; |
| @@ -229,7 +230,11 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status, | |||
| 229 | return NULL; | 230 | return NULL; |
| 230 | } | 231 | } |
| 231 | 232 | ||
| 232 | erp_action->adapter = adapter; | 233 | WARN_ON_ONCE(erp_action->adapter != adapter); |
| 234 | memset(&erp_action->list, 0, sizeof(erp_action->list)); | ||
| 235 | memset(&erp_action->timer, 0, sizeof(erp_action->timer)); | ||
| 236 | erp_action->step = ZFCP_ERP_STEP_UNINITIALIZED; | ||
| 237 | erp_action->fsf_req_id = 0; | ||
| 233 | erp_action->action = need; | 238 | erp_action->action = need; |
| 234 | erp_action->status = act_status; | 239 | erp_action->status = act_status; |
| 235 | 240 | ||
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h index a9e968717dd9..8ca2ab7deaa9 100644 --- a/drivers/s390/scsi/zfcp_ext.h +++ b/drivers/s390/scsi/zfcp_ext.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c index 8210645c2111..ca218c82321f 100644 --- a/drivers/s390/scsi/zfcp_fc.c +++ b/drivers/s390/scsi/zfcp_fc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/scsi/zfcp_fc.h b/drivers/s390/scsi/zfcp_fc.h index 41f22d3dc6d1..6a397ddaadf0 100644 --- a/drivers/s390/scsi/zfcp_fc.h +++ b/drivers/s390/scsi/zfcp_fc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index 69d1dc3ec79d..00fb98f7b2cd 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/scsi/zfcp_fsf.h b/drivers/s390/scsi/zfcp_fsf.h index 88feba5bfda4..4baca67aba6d 100644 --- a/drivers/s390/scsi/zfcp_fsf.h +++ b/drivers/s390/scsi/zfcp_fsf.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c index 9e358fc04b78..4ab02e8d36f3 100644 --- a/drivers/s390/scsi/zfcp_qdio.c +++ b/drivers/s390/scsi/zfcp_qdio.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/scsi/zfcp_qdio.h b/drivers/s390/scsi/zfcp_qdio.h index 7f647a90c750..886c662cc154 100644 --- a/drivers/s390/scsi/zfcp_qdio.h +++ b/drivers/s390/scsi/zfcp_qdio.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/scsi/zfcp_reqlist.h b/drivers/s390/scsi/zfcp_reqlist.h index 703fce59befe..59a943c0d51d 100644 --- a/drivers/s390/scsi/zfcp_reqlist.h +++ b/drivers/s390/scsi/zfcp_reqlist.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c index ec3ddd1d31d5..4d2ba5682493 100644 --- a/drivers/s390/scsi/zfcp_scsi.c +++ b/drivers/s390/scsi/zfcp_scsi.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * | 4 | * |
| @@ -115,10 +116,15 @@ static int zfcp_scsi_slave_alloc(struct scsi_device *sdev) | |||
| 115 | struct zfcp_unit *unit; | 116 | struct zfcp_unit *unit; |
| 116 | int npiv = adapter->connection_features & FSF_FEATURE_NPIV_MODE; | 117 | int npiv = adapter->connection_features & FSF_FEATURE_NPIV_MODE; |
| 117 | 118 | ||
| 119 | zfcp_sdev->erp_action.adapter = adapter; | ||
| 120 | zfcp_sdev->erp_action.sdev = sdev; | ||
| 121 | |||
| 118 | port = zfcp_get_port_by_wwpn(adapter, rport->port_name); | 122 | port = zfcp_get_port_by_wwpn(adapter, rport->port_name); |
| 119 | if (!port) | 123 | if (!port) |
| 120 | return -ENXIO; | 124 | return -ENXIO; |
| 121 | 125 | ||
| 126 | zfcp_sdev->erp_action.port = port; | ||
| 127 | |||
| 122 | unit = zfcp_unit_find(port, zfcp_scsi_dev_lun(sdev)); | 128 | unit = zfcp_unit_find(port, zfcp_scsi_dev_lun(sdev)); |
| 123 | if (unit) | 129 | if (unit) |
| 124 | put_device(&unit->dev); | 130 | put_device(&unit->dev); |
diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c index 96a0be13e841..3ac823f2540f 100644 --- a/drivers/s390/scsi/zfcp_sysfs.c +++ b/drivers/s390/scsi/zfcp_sysfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * | 4 | * |
diff --git a/drivers/s390/scsi/zfcp_unit.c b/drivers/s390/scsi/zfcp_unit.c index 9310a547b89f..1bf0a0984a09 100644 --- a/drivers/s390/scsi/zfcp_unit.c +++ b/drivers/s390/scsi/zfcp_unit.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * zfcp device driver | 3 | * zfcp device driver |
| 3 | * | 4 | * |
diff --git a/drivers/sbus/char/Makefile b/drivers/sbus/char/Makefile index 78b6183c9866..ae478144c551 100644 --- a/drivers/sbus/char/Makefile +++ b/drivers/sbus/char/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel miscellaneous SPARC device drivers. | 3 | # Makefile for the kernel miscellaneous SPARC device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c index 228c782d6433..fb5bcf6dddc1 100644 --- a/drivers/sbus/char/bbc_envctrl.c +++ b/drivers/sbus/char/bbc_envctrl.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* bbc_envctrl.c: UltraSPARC-III environment control driver. | 2 | /* bbc_envctrl.c: UltraSPARC-III environment control driver. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2001, 2008 David S. Miller (davem@davemloft.net) | 4 | * Copyright (C) 2001, 2008 David S. Miller (davem@davemloft.net) |
diff --git a/drivers/sbus/char/bbc_i2c.h b/drivers/sbus/char/bbc_i2c.h index 4b4531066e75..c2d066d3fa41 100644 --- a/drivers/sbus/char/bbc_i2c.h +++ b/drivers/sbus/char/bbc_i2c.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BBC_I2C_H | 2 | #ifndef _BBC_I2C_H |
| 2 | #define _BBC_I2C_H | 3 | #define _BBC_I2C_H |
| 3 | 4 | ||
diff --git a/drivers/sbus/char/max1617.h b/drivers/sbus/char/max1617.h index cd30819a0a30..45c8318787d8 100644 --- a/drivers/sbus/char/max1617.h +++ b/drivers/sbus/char/max1617.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $Id: max1617.h,v 1.1 2001/04/02 09:59:08 davem Exp $ */ | 2 | /* $Id: max1617.h,v 1.1 2001/04/02 09:59:08 davem Exp $ */ |
| 2 | #ifndef _MAX1617_H | 3 | #ifndef _MAX1617_H |
| 3 | #define _MAX1617_H | 4 | #define _MAX1617_H |
diff --git a/drivers/scsi/53c700.h b/drivers/scsi/53c700.h index f34c916b95bc..0c9a100af667 100644 --- a/drivers/scsi/53c700.h +++ b/drivers/scsi/53c700.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* -*- mode: c; c-basic-offset: 8 -*- */ | 2 | /* -*- mode: c; c-basic-offset: 8 -*- */ |
| 2 | 3 | ||
| 3 | /* Driver for 53c700 and 53c700-66 chips from NCR and Symbios | 4 | /* Driver for 53c700 and 53c700-66 chips from NCR and Symbios |
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 93dbe58c47c8..1639bf8b1ab6 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for linux/drivers/scsi | 3 | # Makefile for linux/drivers/scsi |
| 3 | # | 4 | # |
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 8a0812221d72..777b0222d021 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * NCR 5380 generic driver routines. These should make it *trivial* | 3 | * NCR 5380 generic driver routines. These should make it *trivial* |
| 3 | * to implement 5380 SCSI drivers under Linux with a non-trantor | 4 | * to implement 5380 SCSI drivers under Linux with a non-trantor |
diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h index d78f0957d865..31096a0b0fdd 100644 --- a/drivers/scsi/NCR5380.h +++ b/drivers/scsi/NCR5380.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * NCR 5380 defines | 3 | * NCR 5380 defines |
| 3 | * | 4 | * |
diff --git a/drivers/scsi/NCR_D700.h b/drivers/scsi/NCR_D700.h index f167af6bd2af..eb675d782ef6 100644 --- a/drivers/scsi/NCR_D700.h +++ b/drivers/scsi/NCR_D700.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* -*- mode: c; c-basic-offset: 8 -*- */ | 2 | /* -*- mode: c; c-basic-offset: 8 -*- */ |
| 2 | 3 | ||
| 3 | /* NCR Dual 700 MCA SCSI Driver | 4 | /* NCR Dual 700 MCA SCSI Driver |
diff --git a/drivers/scsi/NCR_Q720.h b/drivers/scsi/NCR_Q720.h index 7b9209008187..d5f46cdb736e 100644 --- a/drivers/scsi/NCR_Q720.h +++ b/drivers/scsi/NCR_Q720.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* -*- mode: c; c-basic-offset: 8 -*- */ | 2 | /* -*- mode: c; c-basic-offset: 8 -*- */ |
| 2 | 3 | ||
| 3 | /* NCR Quad 720 MCA SCSI Driver | 4 | /* NCR Quad 720 MCA SCSI Driver |
diff --git a/drivers/scsi/a2091.h b/drivers/scsi/a2091.h index 794b8e65c711..8d8a4074a570 100644 --- a/drivers/scsi/a2091.h +++ b/drivers/scsi/a2091.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef A2091_H | 2 | #ifndef A2091_H |
| 2 | #define A2091_H | 3 | #define A2091_H |
| 3 | 4 | ||
diff --git a/drivers/scsi/a3000.h b/drivers/scsi/a3000.h index 49db4a335aab..5cb3e7535281 100644 --- a/drivers/scsi/a3000.h +++ b/drivers/scsi/a3000.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef A3000_H | 2 | #ifndef A3000_H |
| 2 | #define A3000_H | 3 | #define A3000_H |
| 3 | 4 | ||
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c index 97d269f16888..1bc623ad3faf 100644 --- a/drivers/scsi/aacraid/comminit.c +++ b/drivers/scsi/aacraid/comminit.c | |||
| @@ -302,9 +302,11 @@ int aac_send_shutdown(struct aac_dev * dev) | |||
| 302 | return -ENOMEM; | 302 | return -ENOMEM; |
| 303 | aac_fib_init(fibctx); | 303 | aac_fib_init(fibctx); |
| 304 | 304 | ||
| 305 | mutex_lock(&dev->ioctl_mutex); | 305 | if (!dev->adapter_shutdown) { |
| 306 | dev->adapter_shutdown = 1; | 306 | mutex_lock(&dev->ioctl_mutex); |
| 307 | mutex_unlock(&dev->ioctl_mutex); | 307 | dev->adapter_shutdown = 1; |
| 308 | mutex_unlock(&dev->ioctl_mutex); | ||
| 309 | } | ||
| 308 | 310 | ||
| 309 | cmd = (struct aac_close *) fib_data(fibctx); | 311 | cmd = (struct aac_close *) fib_data(fibctx); |
| 310 | cmd->command = cpu_to_le32(VM_CloseAll); | 312 | cmd->command = cpu_to_le32(VM_CloseAll); |
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 62beb2596466..c9252b138c1f 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
| @@ -1551,8 +1551,9 @@ static void __aac_shutdown(struct aac_dev * aac) | |||
| 1551 | { | 1551 | { |
| 1552 | int i; | 1552 | int i; |
| 1553 | 1553 | ||
| 1554 | mutex_lock(&aac->ioctl_mutex); | ||
| 1554 | aac->adapter_shutdown = 1; | 1555 | aac->adapter_shutdown = 1; |
| 1555 | aac_send_shutdown(aac); | 1556 | mutex_unlock(&aac->ioctl_mutex); |
| 1556 | 1557 | ||
| 1557 | if (aac->aif_thread) { | 1558 | if (aac->aif_thread) { |
| 1558 | int i; | 1559 | int i; |
| @@ -1565,7 +1566,11 @@ static void __aac_shutdown(struct aac_dev * aac) | |||
| 1565 | } | 1566 | } |
| 1566 | kthread_stop(aac->thread); | 1567 | kthread_stop(aac->thread); |
| 1567 | } | 1568 | } |
| 1569 | |||
| 1570 | aac_send_shutdown(aac); | ||
| 1571 | |||
| 1568 | aac_adapter_disable_int(aac); | 1572 | aac_adapter_disable_int(aac); |
| 1573 | |||
| 1569 | if (aac_is_src(aac)) { | 1574 | if (aac_is_src(aac)) { |
| 1570 | if (aac->max_msix > 1) { | 1575 | if (aac->max_msix > 1) { |
| 1571 | for (i = 0; i < aac->max_msix; i++) { | 1576 | for (i = 0; i < aac->max_msix; i++) { |
diff --git a/drivers/scsi/aha152x.h b/drivers/scsi/aha152x.h index ac4bfa438bf2..efd01877d02b 100644 --- a/drivers/scsi/aha152x.h +++ b/drivers/scsi/aha152x.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _AHA152X_H | 2 | #ifndef _AHA152X_H |
| 2 | #define _AHA152X_H | 3 | #define _AHA152X_H |
| 3 | 4 | ||
diff --git a/drivers/scsi/aha1542.h b/drivers/scsi/aha1542.h index 0fe9bae1b3d1..f5b0d210fb3c 100644 --- a/drivers/scsi/aha1542.h +++ b/drivers/scsi/aha1542.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _AHA1542_H_ | 2 | #ifndef _AHA1542_H_ |
| 2 | #define _AHA1542_H_ | 3 | #define _AHA1542_H_ |
| 3 | 4 | ||
diff --git a/drivers/scsi/aha1740.h b/drivers/scsi/aha1740.h index b0c5603461ca..dfdaa4d3ea4e 100644 --- a/drivers/scsi/aha1740.h +++ b/drivers/scsi/aha1740.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _AHA1740_H | 2 | #ifndef _AHA1740_H |
| 2 | 3 | ||
| 3 | /* $Id$ | 4 | /* $Id$ |
diff --git a/drivers/scsi/aic7xxx/Makefile b/drivers/scsi/aic7xxx/Makefile index b03ba0df7a83..c15be2590d1c 100644 --- a/drivers/scsi/aic7xxx/Makefile +++ b/drivers/scsi/aic7xxx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux aic7xxx SCSI driver. | 3 | # Makefile for the Linux aic7xxx SCSI driver. |
| 3 | # | 4 | # |
diff --git a/drivers/scsi/aic7xxx/aicasm/Makefile b/drivers/scsi/aic7xxx/aicasm/Makefile index 45e2d49c1fff..243adb0a38d1 100644 --- a/drivers/scsi/aic7xxx/aicasm/Makefile +++ b/drivers/scsi/aic7xxx/aicasm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | PROG= aicasm | 2 | PROG= aicasm |
| 2 | 3 | ||
| 3 | OUTDIR ?= ./ | 4 | OUTDIR ?= ./ |
diff --git a/drivers/scsi/arm/Makefile b/drivers/scsi/arm/Makefile index 16c3e86a6b1b..b576d9276f71 100644 --- a/drivers/scsi/arm/Makefile +++ b/drivers/scsi/arm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for drivers/scsi/arm | 3 | # Makefile for drivers/scsi/arm |
| 3 | # | 4 | # |
diff --git a/drivers/scsi/atp870u.h b/drivers/scsi/atp870u.h index 9b839b1e895a..75c44399fc88 100644 --- a/drivers/scsi/atp870u.h +++ b/drivers/scsi/atp870u.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _ATP870U_H | 2 | #ifndef _ATP870U_H |
| 2 | #define _ATP870U_H | 3 | #define _ATP870U_H |
| 3 | 4 | ||
diff --git a/drivers/scsi/bfa/Makefile b/drivers/scsi/bfa/Makefile index 475cf925d5e8..442fc3db8f1f 100644 --- a/drivers/scsi/bfa/Makefile +++ b/drivers/scsi/bfa/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_SCSI_BFA_FC) := bfa.o | 2 | obj-$(CONFIG_SCSI_BFA_FC) := bfa.o |
| 2 | 3 | ||
| 3 | bfa-y := bfad.o bfad_im.o bfad_attr.o bfad_debugfs.o bfad_bsg.o | 4 | bfa-y := bfad.o bfad_im.o bfad_attr.o bfad_debugfs.o bfad_bsg.o |
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c index 6dc96c8dfe75..d4c2a2e4c5d4 100644 --- a/drivers/scsi/constants.c +++ b/drivers/scsi/constants.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * ASCII values for a number of symbolic constants, printing functions, | 3 | * ASCII values for a number of symbolic constants, printing functions, |
| 3 | * etc. | 4 | * etc. |
diff --git a/drivers/scsi/csiostor/Makefile b/drivers/scsi/csiostor/Makefile index 3681a3fbd499..d047e22eac0d 100644 --- a/drivers/scsi/csiostor/Makefile +++ b/drivers/scsi/csiostor/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | ## Chelsio FCoE driver | 3 | ## Chelsio FCoE driver |
| 3 | # | 4 | # |
diff --git a/drivers/scsi/dc395x.h b/drivers/scsi/dc395x.h index fbf35e37701e..5379a936141a 100644 --- a/drivers/scsi/dc395x.h +++ b/drivers/scsi/dc395x.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /************************************************************************/ | 2 | /************************************************************************/ |
| 2 | /* */ | 3 | /* */ |
| 3 | /* dc395x.h */ | 4 | /* dc395x.h */ |
diff --git a/drivers/scsi/eata_generic.h b/drivers/scsi/eata_generic.h index 5016af5cf860..1a396c5e7f73 100644 --- a/drivers/scsi/eata_generic.h +++ b/drivers/scsi/eata_generic.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /******************************************************** | 2 | /******************************************************** |
| 2 | * Header file for eata_dma.c and eata_pio.c * | 3 | * Header file for eata_dma.c and eata_pio.c * |
| 3 | * Linux EATA SCSI drivers * | 4 | * Linux EATA SCSI drivers * |
diff --git a/drivers/scsi/eata_pio.h b/drivers/scsi/eata_pio.h index 7deeb935748b..5b5e3d13670b 100644 --- a/drivers/scsi/eata_pio.h +++ b/drivers/scsi/eata_pio.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /******************************************************** | 2 | /******************************************************** |
| 2 | * Header file for eata_pio.c Linux EATA-PIO SCSI driver * | 3 | * Header file for eata_pio.c Linux EATA-PIO SCSI driver * |
| 3 | * (c) 1993-96 Michael Neuffer * | 4 | * (c) 1993-96 Michael Neuffer * |
diff --git a/drivers/scsi/esp_scsi.h b/drivers/scsi/esp_scsi.h index 7e8932ae91f8..8163dca2071b 100644 --- a/drivers/scsi/esp_scsi.h +++ b/drivers/scsi/esp_scsi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* esp_scsi.h: Defines and structures for the ESP driver. | 2 | /* esp_scsi.h: Defines and structures for the ESP driver. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2007 David S. Miller (davem@davemloft.net) | 4 | * Copyright (C) 2007 David S. Miller (davem@davemloft.net) |
diff --git a/drivers/scsi/fcoe/libfcoe.h b/drivers/scsi/fcoe/libfcoe.h index d3bb16d11401..b8bdfab51a58 100644 --- a/drivers/scsi/fcoe/libfcoe.h +++ b/drivers/scsi/fcoe/libfcoe.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _FCOE_LIBFCOE_H_ | 2 | #ifndef _FCOE_LIBFCOE_H_ |
| 2 | #define _FCOE_LIBFCOE_H_ | 3 | #define _FCOE_LIBFCOE_H_ |
| 3 | 4 | ||
diff --git a/drivers/scsi/fnic/Makefile b/drivers/scsi/fnic/Makefile index 383598fadf04..6214a6b2e96d 100644 --- a/drivers/scsi/fnic/Makefile +++ b/drivers/scsi/fnic/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_FCOE_FNIC) += fnic.o | 2 | obj-$(CONFIG_FCOE_FNIC) += fnic.o |
| 2 | 3 | ||
| 3 | fnic-y := \ | 4 | fnic-y := \ |
diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h index 3fd8b83ffbf9..95fc720c1b30 100644 --- a/drivers/scsi/gdth.h +++ b/drivers/scsi/gdth.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _GDTH_H | 2 | #ifndef _GDTH_H |
| 2 | #define _GDTH_H | 3 | #define _GDTH_H |
| 3 | 4 | ||
diff --git a/drivers/scsi/gdth_ioctl.h b/drivers/scsi/gdth_ioctl.h index b004c6165887..4c91894ac244 100644 --- a/drivers/scsi/gdth_ioctl.h +++ b/drivers/scsi/gdth_ioctl.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _GDTH_IOCTL_H | 2 | #ifndef _GDTH_IOCTL_H |
| 2 | #define _GDTH_IOCTL_H | 3 | #define _GDTH_IOCTL_H |
| 3 | 4 | ||
diff --git a/drivers/scsi/gdth_proc.c b/drivers/scsi/gdth_proc.c index d08b2716752c..20add49cdd32 100644 --- a/drivers/scsi/gdth_proc.c +++ b/drivers/scsi/gdth_proc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* gdth_proc.c | 2 | /* gdth_proc.c |
| 2 | * $Id: gdth_proc.c,v 1.43 2006/01/11 16:15:00 achim Exp $ | 3 | * $Id: gdth_proc.c,v 1.43 2006/01/11 16:15:00 achim Exp $ |
| 3 | */ | 4 | */ |
diff --git a/drivers/scsi/gdth_proc.h b/drivers/scsi/gdth_proc.h index aaa618198972..d7d0aa283695 100644 --- a/drivers/scsi/gdth_proc.h +++ b/drivers/scsi/gdth_proc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _GDTH_PROC_H | 2 | #ifndef _GDTH_PROC_H |
| 2 | #define _GDTH_PROC_H | 3 | #define _GDTH_PROC_H |
| 3 | 4 | ||
diff --git a/drivers/scsi/gvp11.h b/drivers/scsi/gvp11.h index 852913cde5dd..61c1a3584461 100644 --- a/drivers/scsi/gvp11.h +++ b/drivers/scsi/gvp11.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef GVP11_H | 2 | #ifndef GVP11_H |
| 2 | 3 | ||
| 3 | /* $Id: gvp11.h,v 1.4 1997/01/19 23:07:12 davem Exp $ | 4 | /* $Id: gvp11.h,v 1.4 1997/01/19 23:07:12 davem Exp $ |
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 9abe81021484..4ed3d26ffdde 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c | |||
| @@ -4091,7 +4091,7 @@ static int hpsa_set_local_logical_count(struct ctlr_info *h, | |||
| 4091 | memset(id_ctlr, 0, sizeof(*id_ctlr)); | 4091 | memset(id_ctlr, 0, sizeof(*id_ctlr)); |
| 4092 | rc = hpsa_bmic_id_controller(h, id_ctlr, sizeof(*id_ctlr)); | 4092 | rc = hpsa_bmic_id_controller(h, id_ctlr, sizeof(*id_ctlr)); |
| 4093 | if (!rc) | 4093 | if (!rc) |
| 4094 | if (id_ctlr->configured_logical_drive_count < 256) | 4094 | if (id_ctlr->configured_logical_drive_count < 255) |
| 4095 | *nlocals = id_ctlr->configured_logical_drive_count; | 4095 | *nlocals = id_ctlr->configured_logical_drive_count; |
| 4096 | else | 4096 | else |
| 4097 | *nlocals = le16_to_cpu( | 4097 | *nlocals = le16_to_cpu( |
diff --git a/drivers/scsi/ibmvscsi_tgt/libsrp.h b/drivers/scsi/ibmvscsi_tgt/libsrp.h index 9fec55b36322..832606ae2908 100644 --- a/drivers/scsi/ibmvscsi_tgt/libsrp.h +++ b/drivers/scsi/ibmvscsi_tgt/libsrp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __LIBSRP_H__ | 2 | #ifndef __LIBSRP_H__ |
| 2 | #define __LIBSRP_H__ | 3 | #define __LIBSRP_H__ |
| 3 | 4 | ||
diff --git a/drivers/scsi/imm.h b/drivers/scsi/imm.h index 8f6f32fc61ff..7f2bb35b1b87 100644 --- a/drivers/scsi/imm.h +++ b/drivers/scsi/imm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | /* Driver for the Iomega MatchMaker parallel port SCSI HBA embedded in | 3 | /* Driver for the Iomega MatchMaker parallel port SCSI HBA embedded in |
| 3 | * the Iomega ZIP Plus drive | 4 | * the Iomega ZIP Plus drive |
diff --git a/drivers/scsi/isci/Makefile b/drivers/scsi/isci/Makefile index 3359e10e0d8f..da6f04cae272 100644 --- a/drivers/scsi/isci/Makefile +++ b/drivers/scsi/isci/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_SCSI_ISCI) += isci.o | 2 | obj-$(CONFIG_SCSI_ISCI) += isci.o |
| 2 | isci-objs := init.o phy.o request.o \ | 3 | isci-objs := init.o phy.o request.o \ |
| 3 | remote_device.o port.o \ | 4 | remote_device.o port.o \ |
diff --git a/drivers/scsi/libfc/Makefile b/drivers/scsi/libfc/Makefile index 4bb23ac86a5c..65396f86c307 100644 --- a/drivers/scsi/libfc/Makefile +++ b/drivers/scsi/libfc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # $Id: Makefile | 2 | # $Id: Makefile |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_LIBFC) += libfc.o | 4 | obj-$(CONFIG_LIBFC) += libfc.o |
diff --git a/drivers/scsi/mac53c94.h b/drivers/scsi/mac53c94.h index 1ad24e4f0a85..5df6e81f78a8 100644 --- a/drivers/scsi/mac53c94.h +++ b/drivers/scsi/mac53c94.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * mac53c94.h: definitions for the driver for the 53c94 SCSI bus adaptor | 3 | * mac53c94.h: definitions for the driver for the 53c94 SCSI bus adaptor |
| 3 | * found on Power Macintosh computers, controlling the external SCSI chain. | 4 | * found on Power Macintosh computers, controlling the external SCSI chain. |
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h index 508d65e5a518..21eba2fd465a 100644 --- a/drivers/scsi/megaraid.h +++ b/drivers/scsi/megaraid.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MEGARAID_H__ | 2 | #ifndef __MEGARAID_H__ |
| 2 | #define __MEGARAID_H__ | 3 | #define __MEGARAID_H__ |
| 3 | 4 | ||
diff --git a/drivers/scsi/megaraid/Makefile b/drivers/scsi/megaraid/Makefile index 5826ed509e3e..6e74d21227a5 100644 --- a/drivers/scsi/megaraid/Makefile +++ b/drivers/scsi/megaraid/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_MEGARAID_MM) += megaraid_mm.o | 2 | obj-$(CONFIG_MEGARAID_MM) += megaraid_mm.o |
| 2 | obj-$(CONFIG_MEGARAID_MAILBOX) += megaraid_mbox.o | 3 | obj-$(CONFIG_MEGARAID_MAILBOX) += megaraid_mbox.o |
| 3 | obj-$(CONFIG_MEGARAID_SAS) += megaraid_sas.o | 4 | obj-$(CONFIG_MEGARAID_SAS) += megaraid_sas.o |
diff --git a/drivers/scsi/mesh.h b/drivers/scsi/mesh.h index 4fdb81fa55e2..ee53c05ace95 100644 --- a/drivers/scsi/mesh.h +++ b/drivers/scsi/mesh.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * mesh.h: definitions for the driver for the MESH SCSI bus adaptor | 3 | * mesh.h: definitions for the driver for the MESH SCSI bus adaptor |
| 3 | * (Macintosh Enhanced SCSI Hardware) found on Power Macintosh computers. | 4 | * (Macintosh Enhanced SCSI Hardware) found on Power Macintosh computers. |
diff --git a/drivers/scsi/mpt3sas/Makefile b/drivers/scsi/mpt3sas/Makefile index b7643f596c1e..84fb3fbdb0ca 100644 --- a/drivers/scsi/mpt3sas/Makefile +++ b/drivers/scsi/mpt3sas/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # mpt3sas makefile | 2 | # mpt3sas makefile |
| 2 | obj-$(CONFIG_SCSI_MPT3SAS) += mpt3sas.o | 3 | obj-$(CONFIG_SCSI_MPT3SAS) += mpt3sas.o |
| 3 | mpt3sas-y += mpt3sas_base.o \ | 4 | mpt3sas-y += mpt3sas_base.o \ |
diff --git a/drivers/scsi/mpt3sas/mpi/mpi2.h b/drivers/scsi/mpt3sas/mpi/mpi2.h index a9a659fc2812..2608011cc7f1 100644 --- a/drivers/scsi/mpt3sas/mpi/mpi2.h +++ b/drivers/scsi/mpt3sas/mpi/mpi2.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright 2000-2015 Avago Technologies. All rights reserved. | 3 | * Copyright 2000-2015 Avago Technologies. All rights reserved. |
| 3 | * | 4 | * |
diff --git a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h index fa61baf7c74d..036c9cf61032 100644 --- a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h +++ b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright 2000-2015 Avago Technologies. All rights reserved. | 3 | * Copyright 2000-2015 Avago Technologies. All rights reserved. |
| 3 | * | 4 | * |
diff --git a/drivers/scsi/mpt3sas/mpi/mpi2_init.h b/drivers/scsi/mpt3sas/mpi/mpi2_init.h index bba56b61d36c..38b2c879bf0f 100644 --- a/drivers/scsi/mpt3sas/mpi/mpi2_init.h +++ b/drivers/scsi/mpt3sas/mpi/mpi2_init.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright 2000-2015 Avago Technologies. All rights reserved. | 3 | * Copyright 2000-2015 Avago Technologies. All rights reserved. |
| 3 | * | 4 | * |
diff --git a/drivers/scsi/mpt3sas/mpi/mpi2_ioc.h b/drivers/scsi/mpt3sas/mpi/mpi2_ioc.h index af4be403582e..673cf05f94dc 100644 --- a/drivers/scsi/mpt3sas/mpi/mpi2_ioc.h +++ b/drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright 2000-2015 Avago Technologies. All rights reserved. | 3 | * Copyright 2000-2015 Avago Technologies. All rights reserved. |
| 3 | * | 4 | * |
diff --git a/drivers/scsi/mpt3sas/mpi/mpi2_raid.h b/drivers/scsi/mpt3sas/mpi/mpi2_raid.h index 1c0eeeeb5eaf..b9bb1c178f12 100644 --- a/drivers/scsi/mpt3sas/mpi/mpi2_raid.h +++ b/drivers/scsi/mpt3sas/mpi/mpi2_raid.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright 2000-2014 Avago Technologies. All rights reserved. | 3 | * Copyright 2000-2014 Avago Technologies. All rights reserved. |
| 3 | * | 4 | * |
diff --git a/drivers/scsi/mpt3sas/mpi/mpi2_sas.h b/drivers/scsi/mpt3sas/mpi/mpi2_sas.h index c10c2c02a945..afa17ff246b4 100644 --- a/drivers/scsi/mpt3sas/mpi/mpi2_sas.h +++ b/drivers/scsi/mpt3sas/mpi/mpi2_sas.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright 2000-2015 Avago Technologies. All rights reserved. | 3 | * Copyright 2000-2015 Avago Technologies. All rights reserved. |
| 3 | * | 4 | * |
diff --git a/drivers/scsi/mpt3sas/mpi/mpi2_tool.h b/drivers/scsi/mpt3sas/mpi/mpi2_tool.h index 5f9289a1166f..593765a4ddb8 100644 --- a/drivers/scsi/mpt3sas/mpi/mpi2_tool.h +++ b/drivers/scsi/mpt3sas/mpi/mpi2_tool.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright 2000-2014 Avago Technologies. All rights reserved. | 3 | * Copyright 2000-2014 Avago Technologies. All rights reserved. |
| 3 | * | 4 | * |
diff --git a/drivers/scsi/mpt3sas/mpi/mpi2_type.h b/drivers/scsi/mpt3sas/mpi/mpi2_type.h index 92a81abc2c31..36494439a419 100644 --- a/drivers/scsi/mpt3sas/mpi/mpi2_type.h +++ b/drivers/scsi/mpt3sas/mpi/mpi2_type.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright 2000-2014 Avago Technologies. All rights reserved. | 3 | * Copyright 2000-2014 Avago Technologies. All rights reserved. |
| 3 | * | 4 | * |
diff --git a/drivers/scsi/mvme147.c b/drivers/scsi/mvme147.c index 4f515700bdc3..e6b2b681fda3 100644 --- a/drivers/scsi/mvme147.c +++ b/drivers/scsi/mvme147.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/types.h> | 2 | #include <linux/types.h> |
| 2 | #include <linux/mm.h> | 3 | #include <linux/mm.h> |
| 3 | #include <linux/blkdev.h> | 4 | #include <linux/blkdev.h> |
diff --git a/drivers/scsi/mvme147.h b/drivers/scsi/mvme147.h index bfd4566ef050..f75ff58ddcd0 100644 --- a/drivers/scsi/mvme147.h +++ b/drivers/scsi/mvme147.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef MVME147_H | 2 | #ifndef MVME147_H |
| 2 | 3 | ||
| 3 | /* $Id: mvme147.h,v 1.4 1997/01/19 23:07:10 davem Exp $ | 4 | /* $Id: mvme147.h,v 1.4 1997/01/19 23:07:10 davem Exp $ |
diff --git a/drivers/scsi/osst.h b/drivers/scsi/osst.h index b4fea98ba276..b90ae280853d 100644 --- a/drivers/scsi/osst.h +++ b/drivers/scsi/osst.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * $Header: /cvsroot/osst/Driver/osst.h,v 1.16 2005/01/01 21:13:35 wriede Exp $ | 3 | * $Header: /cvsroot/osst/Driver/osst.h,v 1.16 2005/01/01 21:13:35 wriede Exp $ |
| 3 | */ | 4 | */ |
diff --git a/drivers/scsi/osst_detect.h b/drivers/scsi/osst_detect.h index 21717d0e6974..83c1d4fb11db 100644 --- a/drivers/scsi/osst_detect.h +++ b/drivers/scsi/osst_detect.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #define SIGS_FROM_OSST \ | 2 | #define SIGS_FROM_OSST \ |
| 2 | {"OnStream", "SC-", "", "osst"}, \ | 3 | {"OnStream", "SC-", "", "osst"}, \ |
| 3 | {"OnStream", "DI-", "", "osst"}, \ | 4 | {"OnStream", "DI-", "", "osst"}, \ |
diff --git a/drivers/scsi/osst_options.h b/drivers/scsi/osst_options.h index ff1e610946ed..a6a389b88876 100644 --- a/drivers/scsi/osst_options.h +++ b/drivers/scsi/osst_options.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | The compile-time configurable defaults for the Linux SCSI tape driver. | 3 | The compile-time configurable defaults for the Linux SCSI tape driver. |
| 3 | 4 | ||
diff --git a/drivers/scsi/pcmcia/Makefile b/drivers/scsi/pcmcia/Makefile index 683bf148b5b7..44eea2d43143 100644 --- a/drivers/scsi/pcmcia/Makefile +++ b/drivers/scsi/pcmcia/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | ccflags-y := -Idrivers/scsi | 3 | ccflags-y := -Idrivers/scsi |
| 3 | 4 | ||
diff --git a/drivers/scsi/pm8001/Makefile b/drivers/scsi/pm8001/Makefile index ce4cd87c7c66..02b7338999cc 100644 --- a/drivers/scsi/pm8001/Makefile +++ b/drivers/scsi/pm8001/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Kernel configuration file for the PM8001 SAS/SATA 8x6G based HBA driver | 3 | # Kernel configuration file for the PM8001 SAS/SATA 8x6G based HBA driver |
| 3 | # | 4 | # |
diff --git a/drivers/scsi/ppa.h b/drivers/scsi/ppa.h index ba8021427b88..6a1f8a2d70eb 100644 --- a/drivers/scsi/ppa.h +++ b/drivers/scsi/ppa.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* Driver for the PPA3 parallel port SCSI HBA embedded in | 2 | /* Driver for the PPA3 parallel port SCSI HBA embedded in |
| 2 | * the Iomega ZIP drive | 3 | * the Iomega ZIP drive |
| 3 | * | 4 | * |
diff --git a/drivers/scsi/qla2xxx/Makefile b/drivers/scsi/qla2xxx/Makefile index 0b767a0bb308..17d5bc1cc56b 100644 --- a/drivers/scsi/qla2xxx/Makefile +++ b/drivers/scsi/qla2xxx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \ | 2 | qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \ |
| 2 | qla_dbg.o qla_sup.o qla_attr.o qla_mid.o qla_dfs.o qla_bsg.o \ | 3 | qla_dbg.o qla_sup.o qla_attr.o qla_mid.o qla_dfs.o qla_bsg.o \ |
| 3 | qla_nx.o qla_mr.o qla_nx2.o qla_target.o qla_tmpl.o qla_nvme.o | 4 | qla_nx.o qla_mr.o qla_nx2.o qla_target.o qla_tmpl.o qla_nvme.o |
diff --git a/drivers/scsi/qla2xxx/qla_devtbl.h b/drivers/scsi/qla2xxx/qla_devtbl.h index d6ea69df7c5c..ffb9694be748 100644 --- a/drivers/scsi/qla2xxx/qla_devtbl.h +++ b/drivers/scsi/qla2xxx/qla_devtbl.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #define QLA_MODEL_NAMES 0x5C | 2 | #define QLA_MODEL_NAMES 0x5C |
| 2 | 3 | ||
| 3 | /* | 4 | /* |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 937209805baf..dce42a416876 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
| @@ -3061,6 +3061,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 3061 | host->max_cmd_len, host->max_channel, host->max_lun, | 3061 | host->max_cmd_len, host->max_channel, host->max_lun, |
| 3062 | host->transportt, sht->vendor_id); | 3062 | host->transportt, sht->vendor_id); |
| 3063 | 3063 | ||
| 3064 | INIT_WORK(&base_vha->iocb_work, qla2x00_iocb_work_fn); | ||
| 3065 | |||
| 3064 | /* Set up the irqs */ | 3066 | /* Set up the irqs */ |
| 3065 | ret = qla2x00_request_irqs(ha, rsp); | 3067 | ret = qla2x00_request_irqs(ha, rsp); |
| 3066 | if (ret) | 3068 | if (ret) |
| @@ -3175,8 +3177,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 3175 | host->can_queue, base_vha->req, | 3177 | host->can_queue, base_vha->req, |
| 3176 | base_vha->mgmt_svr_loop_id, host->sg_tablesize); | 3178 | base_vha->mgmt_svr_loop_id, host->sg_tablesize); |
| 3177 | 3179 | ||
| 3178 | INIT_WORK(&base_vha->iocb_work, qla2x00_iocb_work_fn); | ||
| 3179 | |||
| 3180 | if (ha->mqenable) { | 3180 | if (ha->mqenable) { |
| 3181 | bool mq = false; | 3181 | bool mq = false; |
| 3182 | bool startit = false; | 3182 | bool startit = false; |
| @@ -3212,6 +3212,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 3212 | ql_log(ql_log_fatal, base_vha, 0x00ed, | 3212 | ql_log(ql_log_fatal, base_vha, 0x00ed, |
| 3213 | "Failed to start DPC thread.\n"); | 3213 | "Failed to start DPC thread.\n"); |
| 3214 | ret = PTR_ERR(ha->dpc_thread); | 3214 | ret = PTR_ERR(ha->dpc_thread); |
| 3215 | ha->dpc_thread = NULL; | ||
| 3215 | goto probe_failed; | 3216 | goto probe_failed; |
| 3216 | } | 3217 | } |
| 3217 | ql_dbg(ql_dbg_init, base_vha, 0x00ee, | 3218 | ql_dbg(ql_dbg_init, base_vha, 0x00ee, |
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.h b/drivers/scsi/qla2xxx/tcm_qla2xxx.h index 071035dfa99a..7550ba2831c3 100644 --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.h +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <target/target_core_base.h> | 2 | #include <target/target_core_base.h> |
| 2 | #include <linux/btree.h> | 3 | #include <linux/btree.h> |
| 3 | 4 | ||
diff --git a/drivers/scsi/qlogicfas408.h b/drivers/scsi/qlogicfas408.h index f6b1216af79f..a971db11d293 100644 --- a/drivers/scsi/qlogicfas408.h +++ b/drivers/scsi/qlogicfas408.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* to be used by qlogicfas and qlogic_cs */ | 2 | /* to be used by qlogicfas and qlogic_cs */ |
| 2 | #ifndef __QLOGICFAS408_H | 3 | #ifndef __QLOGICFAS408_H |
| 3 | #define __QLOGICFAS408_H | 4 | #define __QLOGICFAS408_H |
diff --git a/drivers/scsi/qlogicpti.h b/drivers/scsi/qlogicpti.h index 892a0b058b99..884ad72ade57 100644 --- a/drivers/scsi/qlogicpti.h +++ b/drivers/scsi/qlogicpti.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* qlogicpti.h: Performance Technologies QlogicISP sbus card defines. | 2 | /* qlogicpti.h: Performance Technologies QlogicISP sbus card defines. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 1996 David S. Miller (davem@caipfs.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caipfs.rutgers.edu) |
diff --git a/drivers/scsi/scsi.h b/drivers/scsi/scsi.h index d5a55fae60e0..6dcc4c685d1d 100644 --- a/drivers/scsi/scsi.h +++ b/drivers/scsi/scsi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * scsi.h Copyright (C) 1992 Drew Eckhardt | 3 | * scsi.h Copyright (C) 1992 Drew Eckhardt |
| 3 | * Copyright (C) 1993, 1994, 1995, 1998, 1999 Eric Youngdale | 4 | * Copyright (C) 1993, 1994, 1995, 1998, 1999 Eric Youngdale |
diff --git a/drivers/scsi/scsi_common.c b/drivers/scsi/scsi_common.c index a75673bb82b3..40bc616cf8ab 100644 --- a/drivers/scsi/scsi_common.c +++ b/drivers/scsi/scsi_common.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * SCSI functions used by both the initiator and the target code. | 3 | * SCSI functions used by both the initiator and the target code. |
| 3 | */ | 4 | */ |
diff --git a/drivers/scsi/scsi_debugfs.c b/drivers/scsi/scsi_debugfs.c index 5e9755008aed..01f08c03f2c1 100644 --- a/drivers/scsi/scsi_debugfs.c +++ b/drivers/scsi/scsi_debugfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/seq_file.h> | 2 | #include <linux/seq_file.h> |
| 2 | #include <scsi/scsi_cmnd.h> | 3 | #include <scsi/scsi_cmnd.h> |
| 3 | #include <scsi/scsi_dbg.h> | 4 | #include <scsi/scsi_dbg.h> |
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c index 28fea83ae2fe..6bf43d94cdc0 100644 --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | #include <linux/blkdev.h> | 3 | #include <linux/blkdev.h> |
| 3 | #include <linux/init.h> | 4 | #include <linux/init.h> |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 9cf6a80fe297..ad3ea24f0885 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
| @@ -1379,8 +1379,6 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req) | |||
| 1379 | 1379 | ||
| 1380 | ret = scsi_setup_cmnd(sdev, req); | 1380 | ret = scsi_setup_cmnd(sdev, req); |
| 1381 | out: | 1381 | out: |
| 1382 | if (ret != BLKPREP_OK) | ||
| 1383 | cmd->flags &= ~SCMD_INITIALIZED; | ||
| 1384 | return scsi_prep_return(q, req, ret); | 1382 | return scsi_prep_return(q, req, ret); |
| 1385 | } | 1383 | } |
| 1386 | 1384 | ||
| @@ -1900,7 +1898,6 @@ static int scsi_mq_prep_fn(struct request *req) | |||
| 1900 | struct scsi_device *sdev = req->q->queuedata; | 1898 | struct scsi_device *sdev = req->q->queuedata; |
| 1901 | struct Scsi_Host *shost = sdev->host; | 1899 | struct Scsi_Host *shost = sdev->host; |
| 1902 | struct scatterlist *sg; | 1900 | struct scatterlist *sg; |
| 1903 | int ret; | ||
| 1904 | 1901 | ||
| 1905 | scsi_init_command(sdev, cmd); | 1902 | scsi_init_command(sdev, cmd); |
| 1906 | 1903 | ||
| @@ -1934,10 +1931,7 @@ static int scsi_mq_prep_fn(struct request *req) | |||
| 1934 | 1931 | ||
| 1935 | blk_mq_start_request(req); | 1932 | blk_mq_start_request(req); |
| 1936 | 1933 | ||
| 1937 | ret = scsi_setup_cmnd(sdev, req); | 1934 | return scsi_setup_cmnd(sdev, req); |
| 1938 | if (ret != BLK_STS_OK) | ||
| 1939 | cmd->flags &= ~SCMD_INITIALIZED; | ||
| 1940 | return ret; | ||
| 1941 | } | 1935 | } |
| 1942 | 1936 | ||
| 1943 | static void scsi_mq_done(struct scsi_cmnd *cmd) | 1937 | static void scsi_mq_done(struct scsi_cmnd *cmd) |
diff --git a/drivers/scsi/scsi_lib_dma.c b/drivers/scsi/scsi_lib_dma.c index 2ac3f3975f78..5723915275ad 100644 --- a/drivers/scsi/scsi_lib_dma.c +++ b/drivers/scsi/scsi_lib_dma.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * SCSI library functions depending on DMA | 3 | * SCSI library functions depending on DMA |
| 3 | */ | 4 | */ |
diff --git a/drivers/scsi/scsi_logging.h b/drivers/scsi/scsi_logging.h index 7fe64a847143..6907c924df72 100644 --- a/drivers/scsi/scsi_logging.h +++ b/drivers/scsi/scsi_logging.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _SCSI_LOGGING_H | 2 | #ifndef _SCSI_LOGGING_H |
| 2 | #define _SCSI_LOGGING_H | 3 | #define _SCSI_LOGGING_H |
| 3 | 4 | ||
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h index 5c6d016a5ae9..d7669caa9893 100644 --- a/drivers/scsi/scsi_priv.h +++ b/drivers/scsi/scsi_priv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _SCSI_PRIV_H | 2 | #ifndef _SCSI_PRIV_H |
| 2 | #define _SCSI_PRIV_H | 3 | #define _SCSI_PRIV_H |
| 3 | 4 | ||
diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c index 480a597b3877..7f0ceb65c3f3 100644 --- a/drivers/scsi/scsi_proc.c +++ b/drivers/scsi/scsi_proc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * linux/drivers/scsi/scsi_proc.c | 3 | * linux/drivers/scsi/scsi_proc.c |
| 3 | * | 4 | * |
diff --git a/drivers/scsi/scsi_sas_internal.h b/drivers/scsi/scsi_sas_internal.h index e659912498bd..82fd548c5eee 100644 --- a/drivers/scsi/scsi_sas_internal.h +++ b/drivers/scsi/scsi_sas_internal.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _SCSI_SAS_INTERNAL_H | 2 | #ifndef _SCSI_SAS_INTERNAL_H |
| 2 | #define _SCSI_SAS_INTERNAL_H | 3 | #define _SCSI_SAS_INTERNAL_H |
| 3 | 4 | ||
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 15590a063ad9..40124648a07b 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * scsi_scan.c | 3 | * scsi_scan.c |
| 3 | * | 4 | * |
diff --git a/drivers/scsi/scsi_transport_api.h b/drivers/scsi/scsi_transport_api.h index 934f0e62bb5c..f917766537c0 100644 --- a/drivers/scsi/scsi_transport_api.h +++ b/drivers/scsi/scsi_transport_api.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _SCSI_TRANSPORT_API_H | 2 | #ifndef _SCSI_TRANSPORT_API_H |
| 2 | #define _SCSI_TRANSPORT_API_H | 3 | #define _SCSI_TRANSPORT_API_H |
| 3 | 4 | ||
diff --git a/drivers/scsi/scsicam.c b/drivers/scsi/scsicam.c index 31273468589c..e969138051c7 100644 --- a/drivers/scsi/scsicam.c +++ b/drivers/scsi/scsicam.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * scsicam.c - SCSI CAM support functions, use for HDIO_GETGEO, etc. | 3 | * scsicam.c - SCSI CAM support functions, use for HDIO_GETGEO, etc. |
| 3 | * | 4 | * |
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h index 99c4dde9b6bf..320de758323e 100644 --- a/drivers/scsi/sd.h +++ b/drivers/scsi/sd.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _SCSI_DISK_H | 2 | #ifndef _SCSI_DISK_H |
| 2 | #define _SCSI_DISK_H | 3 | #define _SCSI_DISK_H |
| 3 | 4 | ||
diff --git a/drivers/scsi/sense_codes.h b/drivers/scsi/sense_codes.h index e4e1dccd1f2f..201a536688de 100644 --- a/drivers/scsi/sense_codes.h +++ b/drivers/scsi/sense_codes.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * The canonical list of T10 Additional Sense Codes is available at: | 3 | * The canonical list of T10 Additional Sense Codes is available at: |
| 3 | * http://www.t10.org/lists/asc-num.txt [most recent: 20141221] | 4 | * http://www.t10.org/lists/asc-num.txt [most recent: 20141221] |
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 0419c2298eab..aa28874e8fb9 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
| @@ -837,7 +837,7 @@ sg_fill_request_table(Sg_fd *sfp, sg_req_info_t *rinfo) | |||
| 837 | 837 | ||
| 838 | val = 0; | 838 | val = 0; |
| 839 | list_for_each_entry(srp, &sfp->rq_list, entry) { | 839 | list_for_each_entry(srp, &sfp->rq_list, entry) { |
| 840 | if (val > SG_MAX_QUEUE) | 840 | if (val >= SG_MAX_QUEUE) |
| 841 | break; | 841 | break; |
| 842 | rinfo[val].req_state = srp->done + 1; | 842 | rinfo[val].req_state = srp->done + 1; |
| 843 | rinfo[val].problem = | 843 | rinfo[val].problem = |
diff --git a/drivers/scsi/snic/Makefile b/drivers/scsi/snic/Makefile index ef7c0dd47f40..41546e3cb701 100644 --- a/drivers/scsi/snic/Makefile +++ b/drivers/scsi/snic/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_SCSI_SNIC) += snic.o | 2 | obj-$(CONFIG_SCSI_SNIC) += snic.o |
| 2 | 3 | ||
| 3 | snic-y := \ | 4 | snic-y := \ |
diff --git a/drivers/scsi/sr.h b/drivers/scsi/sr.h index 1de33719ad8e..a2bb7b8bace5 100644 --- a/drivers/scsi/sr.h +++ b/drivers/scsi/sr.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * sr.h by David Giller | 3 | * sr.h by David Giller |
| 3 | * CD-ROM disk driver header file | 4 | * CD-ROM disk driver header file |
diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c index 4610c8c5693f..2a21f2d48592 100644 --- a/drivers/scsi/sr_ioctl.c +++ b/drivers/scsi/sr_ioctl.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/mm.h> | 3 | #include <linux/mm.h> |
| 3 | #include <linux/fs.h> | 4 | #include <linux/fs.h> |
diff --git a/drivers/scsi/sr_vendor.c b/drivers/scsi/sr_vendor.c index 11a238cb2222..e3b0ce25162b 100644 --- a/drivers/scsi/sr_vendor.c +++ b/drivers/scsi/sr_vendor.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* -*-linux-c-*- | 2 | /* -*-linux-c-*- |
| 2 | 3 | ||
| 3 | * vendor-specific code for SCSI CD-ROM's goes here. | 4 | * vendor-specific code for SCSI CD-ROM's goes here. |
diff --git a/drivers/scsi/st.h b/drivers/scsi/st.h index 8c732c8de015..95d2e7a7988d 100644 --- a/drivers/scsi/st.h +++ b/drivers/scsi/st.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #ifndef _ST_H | 3 | #ifndef _ST_H |
| 3 | #define _ST_H | 4 | #define _ST_H |
diff --git a/drivers/scsi/st_options.h b/drivers/scsi/st_options.h index d2f947935554..2b6cabd7b6aa 100644 --- a/drivers/scsi/st_options.h +++ b/drivers/scsi/st_options.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | The compile-time configurable defaults for the Linux SCSI tape driver. | 3 | The compile-time configurable defaults for the Linux SCSI tape driver. |
| 3 | 4 | ||
diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile index 6e77cb0bfee9..9310c6c83041 100644 --- a/drivers/scsi/ufs/Makefile +++ b/drivers/scsi/ufs/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # UFSHCD makefile | 2 | # UFSHCD makefile |
| 2 | obj-$(CONFIG_SCSI_UFS_DWC_TC_PCI) += tc-dwc-g210-pci.o ufshcd-dwc.o tc-dwc-g210.o | 3 | obj-$(CONFIG_SCSI_UFS_DWC_TC_PCI) += tc-dwc-g210-pci.o ufshcd-dwc.o tc-dwc-g210.o |
| 3 | obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-dwc-g210.o | 4 | obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-dwc-g210.o |
diff --git a/drivers/scsi/wd719x.h b/drivers/scsi/wd719x.h index 9c6dd45f95f5..0455b1633ca7 100644 --- a/drivers/scsi/wd719x.h +++ b/drivers/scsi/wd719x.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _WD719X_H_ | 2 | #ifndef _WD719X_H_ |
| 2 | #define _WD719X_H_ | 3 | #define _WD719X_H_ |
| 3 | 4 | ||
diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile index 114203f32843..c53262835e85 100644 --- a/drivers/sh/Makefile +++ b/drivers/sh/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the SuperH specific drivers. | 3 | # Makefile for the SuperH specific drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/sh/intc/internals.h b/drivers/sh/intc/internals.h index 6ce7f0d26dcf..fa73c173b56a 100644 --- a/drivers/sh/intc/internals.h +++ b/drivers/sh/intc/internals.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/sh_intc.h> | 2 | #include <linux/sh_intc.h> |
| 2 | #include <linux/irq.h> | 3 | #include <linux/irq.h> |
| 3 | #include <linux/irqdomain.h> | 4 | #include <linux/irqdomain.h> |
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 2fcaff864584..36dec140ea0d 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Linux Kernel SOC specific device drivers. | 3 | # Makefile for the Linux Kernel SOC specific device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/soc/dove/pmu.c b/drivers/soc/dove/pmu.c index 95d77ec5c5d7..5abb08ffb74d 100644 --- a/drivers/soc/dove/pmu.c +++ b/drivers/soc/dove/pmu.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Marvell Dove PMU support | 3 | * Marvell Dove PMU support |
| 3 | */ | 4 | */ |
diff --git a/drivers/soc/fsl/qbman/Makefile b/drivers/soc/fsl/qbman/Makefile index 7ae199f1664e..363982b83ab5 100644 --- a/drivers/soc/fsl/qbman/Makefile +++ b/drivers/soc/fsl/qbman/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_FSL_DPAA) += bman_ccsr.o qman_ccsr.o \ | 2 | obj-$(CONFIG_FSL_DPAA) += bman_ccsr.o qman_ccsr.o \ |
| 2 | bman_portal.o qman_portal.o \ | 3 | bman_portal.o qman_portal.o \ |
| 3 | bman.o qman.o | 4 | bman.o qman.o |
diff --git a/drivers/soc/fsl/qe/Makefile b/drivers/soc/fsl/qe/Makefile index 2031d385bc7e..55a555304f3a 100644 --- a/drivers/soc/fsl/qe/Makefile +++ b/drivers/soc/fsl/qe/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the linux ppc-specific parts of QE | 3 | # Makefile for the linux ppc-specific parts of QE |
| 3 | # | 4 | # |
diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile index f151de41eb93..fab44666b214 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_QCOM_GLINK_SSR) += glink_ssr.o | 2 | obj-$(CONFIG_QCOM_GLINK_SSR) += glink_ssr.o |
| 2 | obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o | 3 | obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o |
| 3 | obj-$(CONFIG_QCOM_MDT_LOADER) += mdt_loader.o | 4 | obj-$(CONFIG_QCOM_MDT_LOADER) += mdt_loader.o |
diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile index 6b6e7f16104c..763c03d80436 100644 --- a/drivers/soc/renesas/Makefile +++ b/drivers/soc/renesas/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Generic, must be first because of soc_device_register() | 2 | # Generic, must be first because of soc_device_register() |
| 2 | obj-$(CONFIG_SOC_RENESAS) += renesas-soc.o | 3 | obj-$(CONFIG_SOC_RENESAS) += renesas-soc.o |
| 3 | 4 | ||
diff --git a/drivers/soc/tegra/Makefile b/drivers/soc/tegra/Makefile index 0e52b45721ac..482e108d28aa 100644 --- a/drivers/soc/tegra/Makefile +++ b/drivers/soc/tegra/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-y += fuse/ | 2 | obj-y += fuse/ |
| 2 | 3 | ||
| 3 | obj-y += common.o | 4 | obj-y += common.o |
diff --git a/drivers/soc/tegra/fuse/Makefile b/drivers/soc/tegra/fuse/Makefile index 21bc27580178..ea8332cc3980 100644 --- a/drivers/soc/tegra/fuse/Makefile +++ b/drivers/soc/tegra/fuse/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-y += fuse-tegra.o | 2 | obj-y += fuse-tegra.o |
| 2 | obj-y += fuse-tegra30.o | 3 | obj-y += fuse-tegra30.o |
| 3 | obj-y += tegra-apbmisc.o | 4 | obj-y += tegra-apbmisc.o |
diff --git a/drivers/soc/ti/Makefile b/drivers/soc/ti/Makefile index 7d572736c86e..8e205287f120 100644 --- a/drivers/soc/ti/Makefile +++ b/drivers/soc/ti/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # TI Keystone SOC drivers | 3 | # TI Keystone SOC drivers |
| 3 | # | 4 | # |
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index a3ae2b70cdc3..8e0cda73b324 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for kernel SPI drivers. | 3 | # Makefile for kernel SPI drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/spi/spi-armada-3700.c b/drivers/spi/spi-armada-3700.c index 6c7d7a460689..568e1c65aa82 100644 --- a/drivers/spi/spi-armada-3700.c +++ b/drivers/spi/spi-armada-3700.c | |||
| @@ -99,11 +99,6 @@ | |||
| 99 | /* A3700_SPI_IF_TIME_REG */ | 99 | /* A3700_SPI_IF_TIME_REG */ |
| 100 | #define A3700_SPI_CLK_CAPT_EDGE BIT(7) | 100 | #define A3700_SPI_CLK_CAPT_EDGE BIT(7) |
| 101 | 101 | ||
| 102 | /* Flags and macros for struct a3700_spi */ | ||
| 103 | #define A3700_INSTR_CNT 1 | ||
| 104 | #define A3700_ADDR_CNT 3 | ||
| 105 | #define A3700_DUMMY_CNT 1 | ||
| 106 | |||
| 107 | struct a3700_spi { | 102 | struct a3700_spi { |
| 108 | struct spi_master *master; | 103 | struct spi_master *master; |
| 109 | void __iomem *base; | 104 | void __iomem *base; |
| @@ -117,9 +112,6 @@ struct a3700_spi { | |||
| 117 | u8 byte_len; | 112 | u8 byte_len; |
| 118 | u32 wait_mask; | 113 | u32 wait_mask; |
| 119 | struct completion done; | 114 | struct completion done; |
| 120 | u32 addr_cnt; | ||
| 121 | u32 instr_cnt; | ||
| 122 | size_t hdr_cnt; | ||
| 123 | }; | 115 | }; |
| 124 | 116 | ||
| 125 | static u32 spireg_read(struct a3700_spi *a3700_spi, u32 offset) | 117 | static u32 spireg_read(struct a3700_spi *a3700_spi, u32 offset) |
| @@ -161,7 +153,7 @@ static void a3700_spi_deactivate_cs(struct a3700_spi *a3700_spi, | |||
| 161 | } | 153 | } |
| 162 | 154 | ||
| 163 | static int a3700_spi_pin_mode_set(struct a3700_spi *a3700_spi, | 155 | static int a3700_spi_pin_mode_set(struct a3700_spi *a3700_spi, |
| 164 | unsigned int pin_mode) | 156 | unsigned int pin_mode, bool receiving) |
| 165 | { | 157 | { |
| 166 | u32 val; | 158 | u32 val; |
| 167 | 159 | ||
| @@ -177,6 +169,9 @@ static int a3700_spi_pin_mode_set(struct a3700_spi *a3700_spi, | |||
| 177 | break; | 169 | break; |
| 178 | case SPI_NBITS_QUAD: | 170 | case SPI_NBITS_QUAD: |
| 179 | val |= A3700_SPI_DATA_PIN1; | 171 | val |= A3700_SPI_DATA_PIN1; |
| 172 | /* RX during address reception uses 4-pin */ | ||
| 173 | if (receiving) | ||
| 174 | val |= A3700_SPI_ADDR_PIN; | ||
| 180 | break; | 175 | break; |
| 181 | default: | 176 | default: |
| 182 | dev_err(&a3700_spi->master->dev, "wrong pin mode %u", pin_mode); | 177 | dev_err(&a3700_spi->master->dev, "wrong pin mode %u", pin_mode); |
| @@ -392,7 +387,8 @@ static bool a3700_spi_wait_completion(struct spi_device *spi) | |||
| 392 | 387 | ||
| 393 | spireg_write(a3700_spi, A3700_SPI_INT_MASK_REG, 0); | 388 | spireg_write(a3700_spi, A3700_SPI_INT_MASK_REG, 0); |
| 394 | 389 | ||
| 395 | return true; | 390 | /* Timeout was reached */ |
| 391 | return false; | ||
| 396 | } | 392 | } |
| 397 | 393 | ||
| 398 | static bool a3700_spi_transfer_wait(struct spi_device *spi, | 394 | static bool a3700_spi_transfer_wait(struct spi_device *spi, |
| @@ -446,59 +442,43 @@ static void a3700_spi_set_cs(struct spi_device *spi, bool enable) | |||
| 446 | 442 | ||
| 447 | static void a3700_spi_header_set(struct a3700_spi *a3700_spi) | 443 | static void a3700_spi_header_set(struct a3700_spi *a3700_spi) |
| 448 | { | 444 | { |
| 449 | u32 instr_cnt = 0, addr_cnt = 0, dummy_cnt = 0; | 445 | unsigned int addr_cnt; |
| 450 | u32 val = 0; | 446 | u32 val = 0; |
| 451 | 447 | ||
| 452 | /* Clear the header registers */ | 448 | /* Clear the header registers */ |
| 453 | spireg_write(a3700_spi, A3700_SPI_IF_INST_REG, 0); | 449 | spireg_write(a3700_spi, A3700_SPI_IF_INST_REG, 0); |
| 454 | spireg_write(a3700_spi, A3700_SPI_IF_ADDR_REG, 0); | 450 | spireg_write(a3700_spi, A3700_SPI_IF_ADDR_REG, 0); |
| 455 | spireg_write(a3700_spi, A3700_SPI_IF_RMODE_REG, 0); | 451 | spireg_write(a3700_spi, A3700_SPI_IF_RMODE_REG, 0); |
| 452 | spireg_write(a3700_spi, A3700_SPI_IF_HDR_CNT_REG, 0); | ||
| 456 | 453 | ||
| 457 | /* Set header counters */ | 454 | /* Set header counters */ |
| 458 | if (a3700_spi->tx_buf) { | 455 | if (a3700_spi->tx_buf) { |
| 459 | if (a3700_spi->buf_len <= a3700_spi->instr_cnt) { | 456 | /* |
| 460 | instr_cnt = a3700_spi->buf_len; | 457 | * when tx data is not 4 bytes aligned, there will be unexpected |
| 461 | } else if (a3700_spi->buf_len <= (a3700_spi->instr_cnt + | 458 | * bytes out of SPI output register, since it always shifts out |
| 462 | a3700_spi->addr_cnt)) { | 459 | * as whole 4 bytes. This might cause incorrect transaction with |
| 463 | instr_cnt = a3700_spi->instr_cnt; | 460 | * some devices. To avoid that, use SPI header count feature to |
| 464 | addr_cnt = a3700_spi->buf_len - instr_cnt; | 461 | * transfer up to 3 bytes of data first, and then make the rest |
| 465 | } else if (a3700_spi->buf_len <= a3700_spi->hdr_cnt) { | 462 | * of data 4-byte aligned. |
| 466 | instr_cnt = a3700_spi->instr_cnt; | 463 | */ |
| 467 | addr_cnt = a3700_spi->addr_cnt; | 464 | addr_cnt = a3700_spi->buf_len % 4; |
| 468 | /* Need to handle the normal write case with 1 byte | 465 | if (addr_cnt) { |
| 469 | * data | 466 | val = (addr_cnt & A3700_SPI_ADDR_CNT_MASK) |
| 470 | */ | 467 | << A3700_SPI_ADDR_CNT_BIT; |
| 471 | if (!a3700_spi->tx_buf[instr_cnt + addr_cnt]) | 468 | spireg_write(a3700_spi, A3700_SPI_IF_HDR_CNT_REG, val); |
| 472 | dummy_cnt = a3700_spi->buf_len - instr_cnt - | 469 | |
| 473 | addr_cnt; | 470 | /* Update the buffer length to be transferred */ |
| 471 | a3700_spi->buf_len -= addr_cnt; | ||
| 472 | |||
| 473 | /* transfer 1~3 bytes through address count */ | ||
| 474 | val = 0; | ||
| 475 | while (addr_cnt--) { | ||
| 476 | val = (val << 8) | a3700_spi->tx_buf[0]; | ||
| 477 | a3700_spi->tx_buf++; | ||
| 478 | } | ||
| 479 | spireg_write(a3700_spi, A3700_SPI_IF_ADDR_REG, val); | ||
| 474 | } | 480 | } |
| 475 | val |= ((instr_cnt & A3700_SPI_INSTR_CNT_MASK) | ||
| 476 | << A3700_SPI_INSTR_CNT_BIT); | ||
| 477 | val |= ((addr_cnt & A3700_SPI_ADDR_CNT_MASK) | ||
| 478 | << A3700_SPI_ADDR_CNT_BIT); | ||
| 479 | val |= ((dummy_cnt & A3700_SPI_DUMMY_CNT_MASK) | ||
| 480 | << A3700_SPI_DUMMY_CNT_BIT); | ||
| 481 | } | 481 | } |
| 482 | spireg_write(a3700_spi, A3700_SPI_IF_HDR_CNT_REG, val); | ||
| 483 | |||
| 484 | /* Update the buffer length to be transferred */ | ||
| 485 | a3700_spi->buf_len -= (instr_cnt + addr_cnt + dummy_cnt); | ||
| 486 | |||
| 487 | /* Set Instruction */ | ||
| 488 | val = 0; | ||
| 489 | while (instr_cnt--) { | ||
| 490 | val = (val << 8) | a3700_spi->tx_buf[0]; | ||
| 491 | a3700_spi->tx_buf++; | ||
| 492 | } | ||
| 493 | spireg_write(a3700_spi, A3700_SPI_IF_INST_REG, val); | ||
| 494 | |||
| 495 | /* Set Address */ | ||
| 496 | val = 0; | ||
| 497 | while (addr_cnt--) { | ||
| 498 | val = (val << 8) | a3700_spi->tx_buf[0]; | ||
| 499 | a3700_spi->tx_buf++; | ||
| 500 | } | ||
| 501 | spireg_write(a3700_spi, A3700_SPI_IF_ADDR_REG, val); | ||
| 502 | } | 482 | } |
| 503 | 483 | ||
| 504 | static int a3700_is_wfifo_full(struct a3700_spi *a3700_spi) | 484 | static int a3700_is_wfifo_full(struct a3700_spi *a3700_spi) |
| @@ -512,35 +492,12 @@ static int a3700_is_wfifo_full(struct a3700_spi *a3700_spi) | |||
| 512 | static int a3700_spi_fifo_write(struct a3700_spi *a3700_spi) | 492 | static int a3700_spi_fifo_write(struct a3700_spi *a3700_spi) |
| 513 | { | 493 | { |
| 514 | u32 val; | 494 | u32 val; |
| 515 | int i = 0; | ||
| 516 | 495 | ||
| 517 | while (!a3700_is_wfifo_full(a3700_spi) && a3700_spi->buf_len) { | 496 | while (!a3700_is_wfifo_full(a3700_spi) && a3700_spi->buf_len) { |
| 518 | val = 0; | 497 | val = cpu_to_le32(*(u32 *)a3700_spi->tx_buf); |
| 519 | if (a3700_spi->buf_len >= 4) { | 498 | spireg_write(a3700_spi, A3700_SPI_DATA_OUT_REG, val); |
| 520 | val = cpu_to_le32(*(u32 *)a3700_spi->tx_buf); | 499 | a3700_spi->buf_len -= 4; |
| 521 | spireg_write(a3700_spi, A3700_SPI_DATA_OUT_REG, val); | 500 | a3700_spi->tx_buf += 4; |
| 522 | |||
| 523 | a3700_spi->buf_len -= 4; | ||
| 524 | a3700_spi->tx_buf += 4; | ||
| 525 | } else { | ||
| 526 | /* | ||
| 527 | * If the remained buffer length is less than 4-bytes, | ||
| 528 | * we should pad the write buffer with all ones. So that | ||
| 529 | * it avoids overwrite the unexpected bytes following | ||
| 530 | * the last one. | ||
| 531 | */ | ||
| 532 | val = GENMASK(31, 0); | ||
| 533 | while (a3700_spi->buf_len) { | ||
| 534 | val &= ~(0xff << (8 * i)); | ||
| 535 | val |= *a3700_spi->tx_buf++ << (8 * i); | ||
| 536 | i++; | ||
| 537 | a3700_spi->buf_len--; | ||
| 538 | |||
| 539 | spireg_write(a3700_spi, A3700_SPI_DATA_OUT_REG, | ||
| 540 | val); | ||
| 541 | } | ||
| 542 | break; | ||
| 543 | } | ||
| 544 | } | 501 | } |
| 545 | 502 | ||
| 546 | return 0; | 503 | return 0; |
| @@ -645,15 +602,18 @@ static int a3700_spi_transfer_one(struct spi_master *master, | |||
| 645 | a3700_spi->rx_buf = xfer->rx_buf; | 602 | a3700_spi->rx_buf = xfer->rx_buf; |
| 646 | a3700_spi->buf_len = xfer->len; | 603 | a3700_spi->buf_len = xfer->len; |
| 647 | 604 | ||
| 648 | /* SPI transfer headers */ | ||
| 649 | a3700_spi_header_set(a3700_spi); | ||
| 650 | |||
| 651 | if (xfer->tx_buf) | 605 | if (xfer->tx_buf) |
| 652 | nbits = xfer->tx_nbits; | 606 | nbits = xfer->tx_nbits; |
| 653 | else if (xfer->rx_buf) | 607 | else if (xfer->rx_buf) |
| 654 | nbits = xfer->rx_nbits; | 608 | nbits = xfer->rx_nbits; |
| 655 | 609 | ||
| 656 | a3700_spi_pin_mode_set(a3700_spi, nbits); | 610 | a3700_spi_pin_mode_set(a3700_spi, nbits, xfer->rx_buf ? true : false); |
| 611 | |||
| 612 | /* Flush the FIFOs */ | ||
| 613 | a3700_spi_fifo_flush(a3700_spi); | ||
| 614 | |||
| 615 | /* Transfer first bytes of data when buffer is not 4-byte aligned */ | ||
| 616 | a3700_spi_header_set(a3700_spi); | ||
| 657 | 617 | ||
| 658 | if (xfer->rx_buf) { | 618 | if (xfer->rx_buf) { |
| 659 | /* Set read data length */ | 619 | /* Set read data length */ |
| @@ -733,16 +693,11 @@ static int a3700_spi_transfer_one(struct spi_master *master, | |||
| 733 | dev_err(&spi->dev, "wait wfifo empty timed out\n"); | 693 | dev_err(&spi->dev, "wait wfifo empty timed out\n"); |
| 734 | return -ETIMEDOUT; | 694 | return -ETIMEDOUT; |
| 735 | } | 695 | } |
| 736 | } else { | 696 | } |
| 737 | /* | 697 | |
| 738 | * If the instruction in SPI_INSTR does not require data | 698 | if (!a3700_spi_transfer_wait(spi, A3700_SPI_XFER_RDY)) { |
| 739 | * to be written to the SPI device, wait until SPI_RDY | 699 | dev_err(&spi->dev, "wait xfer ready timed out\n"); |
| 740 | * is 1 for the SPI interface to be in idle. | 700 | return -ETIMEDOUT; |
| 741 | */ | ||
| 742 | if (!a3700_spi_transfer_wait(spi, A3700_SPI_XFER_RDY)) { | ||
| 743 | dev_err(&spi->dev, "wait xfer ready timed out\n"); | ||
| 744 | return -ETIMEDOUT; | ||
| 745 | } | ||
| 746 | } | 701 | } |
| 747 | 702 | ||
| 748 | val = spireg_read(a3700_spi, A3700_SPI_IF_CFG_REG); | 703 | val = spireg_read(a3700_spi, A3700_SPI_IF_CFG_REG); |
| @@ -834,10 +789,6 @@ static int a3700_spi_probe(struct platform_device *pdev) | |||
| 834 | memset(spi, 0, sizeof(struct a3700_spi)); | 789 | memset(spi, 0, sizeof(struct a3700_spi)); |
| 835 | 790 | ||
| 836 | spi->master = master; | 791 | spi->master = master; |
| 837 | spi->instr_cnt = A3700_INSTR_CNT; | ||
| 838 | spi->addr_cnt = A3700_ADDR_CNT; | ||
| 839 | spi->hdr_cnt = A3700_INSTR_CNT + A3700_ADDR_CNT + | ||
| 840 | A3700_DUMMY_CNT; | ||
| 841 | 792 | ||
| 842 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 793 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 843 | spi->base = devm_ioremap_resource(dev, res); | 794 | spi->base = devm_ioremap_resource(dev, res); |
diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c index 6ef6c44f39f5..a172ab299e80 100644 --- a/drivers/spi/spi-bcm-qspi.c +++ b/drivers/spi/spi-bcm-qspi.c | |||
| @@ -1250,7 +1250,7 @@ int bcm_qspi_probe(struct platform_device *pdev, | |||
| 1250 | goto qspi_probe_err; | 1250 | goto qspi_probe_err; |
| 1251 | } | 1251 | } |
| 1252 | } else { | 1252 | } else { |
| 1253 | goto qspi_probe_err; | 1253 | goto qspi_resource_err; |
| 1254 | } | 1254 | } |
| 1255 | 1255 | ||
| 1256 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "bspi"); | 1256 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "bspi"); |
| @@ -1272,7 +1272,7 @@ int bcm_qspi_probe(struct platform_device *pdev, | |||
| 1272 | qspi->base[CHIP_SELECT] = devm_ioremap_resource(dev, res); | 1272 | qspi->base[CHIP_SELECT] = devm_ioremap_resource(dev, res); |
| 1273 | if (IS_ERR(qspi->base[CHIP_SELECT])) { | 1273 | if (IS_ERR(qspi->base[CHIP_SELECT])) { |
| 1274 | ret = PTR_ERR(qspi->base[CHIP_SELECT]); | 1274 | ret = PTR_ERR(qspi->base[CHIP_SELECT]); |
| 1275 | goto qspi_probe_err; | 1275 | goto qspi_resource_err; |
| 1276 | } | 1276 | } |
| 1277 | } | 1277 | } |
| 1278 | 1278 | ||
| @@ -1280,7 +1280,7 @@ int bcm_qspi_probe(struct platform_device *pdev, | |||
| 1280 | GFP_KERNEL); | 1280 | GFP_KERNEL); |
| 1281 | if (!qspi->dev_ids) { | 1281 | if (!qspi->dev_ids) { |
| 1282 | ret = -ENOMEM; | 1282 | ret = -ENOMEM; |
| 1283 | goto qspi_probe_err; | 1283 | goto qspi_resource_err; |
| 1284 | } | 1284 | } |
| 1285 | 1285 | ||
| 1286 | for (val = 0; val < num_irqs; val++) { | 1286 | for (val = 0; val < num_irqs; val++) { |
| @@ -1369,8 +1369,9 @@ qspi_reg_err: | |||
| 1369 | bcm_qspi_hw_uninit(qspi); | 1369 | bcm_qspi_hw_uninit(qspi); |
| 1370 | clk_disable_unprepare(qspi->clk); | 1370 | clk_disable_unprepare(qspi->clk); |
| 1371 | qspi_probe_err: | 1371 | qspi_probe_err: |
| 1372 | spi_master_put(master); | ||
| 1373 | kfree(qspi->dev_ids); | 1372 | kfree(qspi->dev_ids); |
| 1373 | qspi_resource_err: | ||
| 1374 | spi_master_put(master); | ||
| 1374 | return ret; | 1375 | return ret; |
| 1375 | } | 1376 | } |
| 1376 | /* probe function to be called by SoC specific platform driver probe */ | 1377 | /* probe function to be called by SoC specific platform driver probe */ |
diff --git a/drivers/spi/spi-bcm53xx.h b/drivers/spi/spi-bcm53xx.h index 73575dfe6916..03e3442086ec 100644 --- a/drivers/spi/spi-bcm53xx.h +++ b/drivers/spi/spi-bcm53xx.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef SPI_BCM53XX_H | 2 | #ifndef SPI_BCM53XX_H |
| 2 | #define SPI_BCM53XX_H | 3 | #define SPI_BCM53XX_H |
| 3 | 4 | ||
diff --git a/drivers/spi/spi-bitbang-txrx.h b/drivers/spi/spi-bitbang-txrx.h index 47bb9b898dfd..ae61d72c7d28 100644 --- a/drivers/spi/spi-bitbang-txrx.h +++ b/drivers/spi/spi-bitbang-txrx.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Mix this utility code with some glue code to get one of several types of | 3 | * Mix this utility code with some glue code to get one of several types of |
| 3 | * simple SPI master driver. Two do polled word-at-a-time I/O: | 4 | * simple SPI master driver. Two do polled word-at-a-time I/O: |
diff --git a/drivers/spi/spi-cavium.h b/drivers/spi/spi-cavium.h index 1f91d61b745b..1f3ac463a20b 100644 --- a/drivers/spi/spi-cavium.h +++ b/drivers/spi/spi-cavium.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __SPI_CAVIUM_H | 2 | #ifndef __SPI_CAVIUM_H |
| 2 | #define __SPI_CAVIUM_H | 3 | #define __SPI_CAVIUM_H |
| 3 | 4 | ||
diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h index da5eab62df34..5c07cf8f19e0 100644 --- a/drivers/spi/spi-dw.h +++ b/drivers/spi/spi-dw.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DW_SPI_HEADER_H | 2 | #ifndef DW_SPI_HEADER_H |
| 2 | #define DW_SPI_HEADER_H | 3 | #define DW_SPI_HEADER_H |
| 3 | 4 | ||
diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c index 680cdf549506..ba9743fa2326 100644 --- a/drivers/spi/spi-stm32.c +++ b/drivers/spi/spi-stm32.c | |||
| @@ -263,8 +263,8 @@ static int stm32_spi_prepare_mbr(struct stm32_spi *spi, u32 speed_hz) | |||
| 263 | * no need to check it there. | 263 | * no need to check it there. |
| 264 | * However, we need to ensure the following calculations. | 264 | * However, we need to ensure the following calculations. |
| 265 | */ | 265 | */ |
| 266 | if ((div < SPI_MBR_DIV_MIN) && | 266 | if (div < SPI_MBR_DIV_MIN || |
| 267 | (div > SPI_MBR_DIV_MAX)) | 267 | div > SPI_MBR_DIV_MAX) |
| 268 | return -EINVAL; | 268 | return -EINVAL; |
| 269 | 269 | ||
| 270 | /* Determine the first power of 2 greater than or equal to div */ | 270 | /* Determine the first power of 2 greater than or equal to div */ |
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 6e65524cbfd9..e8b5a5e21b2e 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | 45 | ||
| 46 | #define CREATE_TRACE_POINTS | 46 | #define CREATE_TRACE_POINTS |
| 47 | #include <trace/events/spi.h> | 47 | #include <trace/events/spi.h> |
| 48 | #define SPI_DYN_FIRST_BUS_NUM 0 | ||
| 49 | 48 | ||
| 50 | static DEFINE_IDR(spi_master_idr); | 49 | static DEFINE_IDR(spi_master_idr); |
| 51 | 50 | ||
| @@ -2086,7 +2085,7 @@ int spi_register_controller(struct spi_controller *ctlr) | |||
| 2086 | struct device *dev = ctlr->dev.parent; | 2085 | struct device *dev = ctlr->dev.parent; |
| 2087 | struct boardinfo *bi; | 2086 | struct boardinfo *bi; |
| 2088 | int status = -ENODEV; | 2087 | int status = -ENODEV; |
| 2089 | int id; | 2088 | int id, first_dynamic; |
| 2090 | 2089 | ||
| 2091 | if (!dev) | 2090 | if (!dev) |
| 2092 | return -ENODEV; | 2091 | return -ENODEV; |
| @@ -2116,9 +2115,15 @@ int spi_register_controller(struct spi_controller *ctlr) | |||
| 2116 | } | 2115 | } |
| 2117 | } | 2116 | } |
| 2118 | if (ctlr->bus_num < 0) { | 2117 | if (ctlr->bus_num < 0) { |
| 2118 | first_dynamic = of_alias_get_highest_id("spi"); | ||
| 2119 | if (first_dynamic < 0) | ||
| 2120 | first_dynamic = 0; | ||
| 2121 | else | ||
| 2122 | first_dynamic++; | ||
| 2123 | |||
| 2119 | mutex_lock(&board_lock); | 2124 | mutex_lock(&board_lock); |
| 2120 | id = idr_alloc(&spi_master_idr, ctlr, SPI_DYN_FIRST_BUS_NUM, 0, | 2125 | id = idr_alloc(&spi_master_idr, ctlr, first_dynamic, |
| 2121 | GFP_KERNEL); | 2126 | 0, GFP_KERNEL); |
| 2122 | mutex_unlock(&board_lock); | 2127 | mutex_unlock(&board_lock); |
| 2123 | if (WARN(id < 0, "couldn't get idr")) | 2128 | if (WARN(id < 0, "couldn't get idr")) |
| 2124 | return id; | 2129 | return id; |
diff --git a/drivers/ssb/Makefile b/drivers/ssb/Makefile index 64a09681cee0..142d33df040f 100644 --- a/drivers/ssb/Makefile +++ b/drivers/ssb/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # core | 2 | # core |
| 2 | ssb-y += main.o scan.o | 3 | ssb-y += main.o scan.o |
| 3 | ssb-$(CONFIG_SSB_EMBEDDED) += embedded.o | 4 | ssb-$(CONFIG_SSB_EMBEDDED) += embedded.o |
diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h index c2f5d3969c8b..ef9ac8efcab4 100644 --- a/drivers/ssb/ssb_private.h +++ b/drivers/ssb/ssb_private.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef LINUX_SSB_PRIVATE_H_ | 2 | #ifndef LINUX_SSB_PRIVATE_H_ |
| 2 | #define LINUX_SSB_PRIVATE_H_ | 3 | #define LINUX_SSB_PRIVATE_H_ |
| 3 | 4 | ||
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 8951c37d8d80..6e536020029a 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for staging directory | 2 | # Makefile for staging directory |
| 2 | 3 | ||
| 3 | obj-y += media/ | 4 | obj-y += media/ |
diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile index eb7eeed6ae40..bb30bf8774a0 100644 --- a/drivers/staging/android/ion/Makefile +++ b/drivers/staging/android/ion/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_ION) += ion.o ion-ioctl.o ion_heap.o | 2 | obj-$(CONFIG_ION) += ion.o ion-ioctl.o ion_heap.o |
| 2 | obj-$(CONFIG_ION_SYSTEM_HEAP) += ion_system_heap.o ion_page_pool.o | 3 | obj-$(CONFIG_ION_SYSTEM_HEAP) += ion_system_heap.o ion_page_pool.o |
| 3 | obj-$(CONFIG_ION_CARVEOUT_HEAP) += ion_carveout_heap.o | 4 | obj-$(CONFIG_ION_CARVEOUT_HEAP) += ion_carveout_heap.o |
diff --git a/drivers/staging/board/board.h b/drivers/staging/board/board.h index 42ed12513220..5609daf4d869 100644 --- a/drivers/staging/board/board.h +++ b/drivers/staging/board/board.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __BOARD_H__ | 2 | #ifndef __BOARD_H__ |
| 2 | #define __BOARD_H__ | 3 | #define __BOARD_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/board/kzm9d.c b/drivers/staging/board/kzm9d.c index 05a6d434d307..d449a837414e 100644 --- a/drivers/staging/board/kzm9d.c +++ b/drivers/staging/board/kzm9d.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* Staging board support for KZM9D. Enable not-yet-DT-capable devices here. */ | 2 | /* Staging board support for KZM9D. Enable not-yet-DT-capable devices here. */ |
| 2 | 3 | ||
| 3 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
diff --git a/drivers/staging/comedi/Makefile b/drivers/staging/comedi/Makefile index 7f9dfb3923ab..6af5da3b4315 100644 --- a/drivers/staging/comedi/Makefile +++ b/drivers/staging/comedi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ccflags-$(CONFIG_COMEDI_DEBUG) := -DDEBUG | 2 | ccflags-$(CONFIG_COMEDI_DEBUG) := -DDEBUG |
| 2 | 3 | ||
| 3 | comedi-y := comedi_fops.o range.o drivers.o \ | 4 | comedi-y := comedi_fops.o range.o drivers.o \ |
diff --git a/drivers/staging/comedi/comedi_internal.h b/drivers/staging/comedi/comedi_internal.h index 6246f4a78ca6..515f293a5d26 100644 --- a/drivers/staging/comedi/comedi_internal.h +++ b/drivers/staging/comedi/comedi_internal.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _COMEDI_INTERNAL_H | 2 | #ifndef _COMEDI_INTERNAL_H |
| 2 | #define _COMEDI_INTERNAL_H | 3 | #define _COMEDI_INTERNAL_H |
| 3 | 4 | ||
diff --git a/drivers/staging/comedi/drivers/Makefile b/drivers/staging/comedi/drivers/Makefile index 0c8cfa738727..736e7e55219d 100644 --- a/drivers/staging/comedi/drivers/Makefile +++ b/drivers/staging/comedi/drivers/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for individual comedi drivers | 2 | # Makefile for individual comedi drivers |
| 2 | # | 3 | # |
| 3 | ccflags-$(CONFIG_COMEDI_DEBUG) := -DDEBUG | 4 | ccflags-$(CONFIG_COMEDI_DEBUG) := -DDEBUG |
diff --git a/drivers/staging/comedi/drivers/addi_tcw.h b/drivers/staging/comedi/drivers/addi_tcw.h index db6d5a4e8889..2b44d3a04484 100644 --- a/drivers/staging/comedi/drivers/addi_tcw.h +++ b/drivers/staging/comedi/drivers/addi_tcw.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _ADDI_TCW_H | 2 | #ifndef _ADDI_TCW_H |
| 2 | #define _ADDI_TCW_H | 3 | #define _ADDI_TCW_H |
| 3 | 4 | ||
diff --git a/drivers/staging/comedi/drivers/addi_watchdog.h b/drivers/staging/comedi/drivers/addi_watchdog.h index b049cfba9813..7523084a0742 100644 --- a/drivers/staging/comedi/drivers/addi_watchdog.h +++ b/drivers/staging/comedi/drivers/addi_watchdog.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _ADDI_WATCHDOG_H | 2 | #ifndef _ADDI_WATCHDOG_H |
| 2 | #define _ADDI_WATCHDOG_H | 3 | #define _ADDI_WATCHDOG_H |
| 3 | 4 | ||
diff --git a/drivers/staging/comedi/drivers/amcc_s5933.h b/drivers/staging/comedi/drivers/amcc_s5933.h index f03e4c8c2021..f738b91b2052 100644 --- a/drivers/staging/comedi/drivers/amcc_s5933.h +++ b/drivers/staging/comedi/drivers/amcc_s5933.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Stuff for AMCC S5933 PCI Controller | 3 | * Stuff for AMCC S5933 PCI Controller |
| 3 | * | 4 | * |
diff --git a/drivers/staging/comedi/drivers/jr3_pci.h b/drivers/staging/comedi/drivers/jr3_pci.h index 28ff0c2aa3b8..acd4e5456ceb 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.h +++ b/drivers/staging/comedi/drivers/jr3_pci.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Helper types to take care of the fact that the DSP card memory | 3 | * Helper types to take care of the fact that the DSP card memory |
| 3 | * is 16 bits, but aligned on a 32 bit PCI boundary | 4 | * is 16 bits, but aligned on a 32 bit PCI boundary |
diff --git a/drivers/staging/comedi/drivers/ni_labpc_isadma.h b/drivers/staging/comedi/drivers/ni_labpc_isadma.h index e93f79050e60..f06f9353cb6c 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_isadma.h +++ b/drivers/staging/comedi/drivers/ni_labpc_isadma.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * ni_labpc ISA DMA support. | 3 | * ni_labpc ISA DMA support. |
| 3 | */ | 4 | */ |
diff --git a/drivers/staging/comedi/drivers/ni_labpc_regs.h b/drivers/staging/comedi/drivers/ni_labpc_regs.h index 6003e9d5fe37..ace40065a25b 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_regs.h +++ b/drivers/staging/comedi/drivers/ni_labpc_regs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * ni_labpc register definitions. | 3 | * ni_labpc register definitions. |
| 3 | */ | 4 | */ |
diff --git a/drivers/staging/comedi/drivers/z8536.h b/drivers/staging/comedi/drivers/z8536.h index 47eadbf4dcc0..3ef5f9e79b89 100644 --- a/drivers/staging/comedi/drivers/z8536.h +++ b/drivers/staging/comedi/drivers/z8536.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Z8536 CIO Internal registers | 3 | * Z8536 CIO Internal registers |
| 3 | */ | 4 | */ |
diff --git a/drivers/staging/dgnc/dgnc_utils.c b/drivers/staging/dgnc/dgnc_utils.c index e07ff8d2f972..620f5741a1ed 100644 --- a/drivers/staging/dgnc/dgnc_utils.c +++ b/drivers/staging/dgnc/dgnc_utils.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/tty.h> | 2 | #include <linux/tty.h> |
| 2 | #include <linux/sched/signal.h> | 3 | #include <linux/sched/signal.h> |
| 3 | #include "dgnc_utils.h" | 4 | #include "dgnc_utils.h" |
diff --git a/drivers/staging/dgnc/dgnc_utils.h b/drivers/staging/dgnc/dgnc_utils.h index d1f07a5735c6..b30527f0889d 100644 --- a/drivers/staging/dgnc/dgnc_utils.h +++ b/drivers/staging/dgnc/dgnc_utils.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _DGNC_UTILS_H | 2 | #ifndef _DGNC_UTILS_H |
| 2 | #define _DGNC_UTILS_H | 3 | #define _DGNC_UTILS_H |
| 3 | 4 | ||
diff --git a/drivers/staging/fbtft/Makefile b/drivers/staging/fbtft/Makefile index 05ae9fbf906e..6bc03311c9c7 100644 --- a/drivers/staging/fbtft/Makefile +++ b/drivers/staging/fbtft/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Core module | 2 | # Core module |
| 2 | obj-$(CONFIG_FB_TFT) += fbtft.o | 3 | obj-$(CONFIG_FB_TFT) += fbtft.o |
| 3 | fbtft-y += fbtft-core.o fbtft-sysfs.o fbtft-bus.o fbtft-io.o | 4 | fbtft-y += fbtft-core.o fbtft-sysfs.o fbtft-bus.o fbtft-io.o |
diff --git a/drivers/staging/fbtft/fbtft-bus.c b/drivers/staging/fbtft/fbtft-bus.c index a80b5d115ff8..2a8eef15c439 100644 --- a/drivers/staging/fbtft/fbtft-bus.c +++ b/drivers/staging/fbtft/fbtft-bus.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/export.h> | 2 | #include <linux/export.h> |
| 2 | #include <linux/errno.h> | 3 | #include <linux/errno.h> |
| 3 | #include <linux/gpio.h> | 4 | #include <linux/gpio.h> |
diff --git a/drivers/staging/fbtft/fbtft-io.c b/drivers/staging/fbtft/fbtft-io.c index ffb9a3b4d454..f4a591919f62 100644 --- a/drivers/staging/fbtft/fbtft-io.c +++ b/drivers/staging/fbtft/fbtft-io.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/export.h> | 2 | #include <linux/export.h> |
| 2 | #include <linux/errno.h> | 3 | #include <linux/errno.h> |
| 3 | #include <linux/gpio.h> | 4 | #include <linux/gpio.h> |
diff --git a/drivers/staging/fbtft/fbtft-sysfs.c b/drivers/staging/fbtft/fbtft-sysfs.c index 5bfd67b526b5..712096659aa0 100644 --- a/drivers/staging/fbtft/fbtft-sysfs.c +++ b/drivers/staging/fbtft/fbtft-sysfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "fbtft.h" | 2 | #include "fbtft.h" |
| 2 | #include "internal.h" | 3 | #include "internal.h" |
| 3 | 4 | ||
diff --git a/drivers/staging/fwserial/fwserial.h b/drivers/staging/fwserial/fwserial.h index 30b2481fe32b..1d15f183e0fa 100644 --- a/drivers/staging/fwserial/fwserial.h +++ b/drivers/staging/fwserial/fwserial.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _FIREWIRE_FWSERIAL_H | 2 | #ifndef _FIREWIRE_FWSERIAL_H |
| 2 | #define _FIREWIRE_FWSERIAL_H | 3 | #define _FIREWIRE_FWSERIAL_H |
| 3 | 4 | ||
diff --git a/drivers/staging/gdm724x/Makefile b/drivers/staging/gdm724x/Makefile index ba7f11a6a097..e61b95788c9f 100644 --- a/drivers/staging/gdm724x/Makefile +++ b/drivers/staging/gdm724x/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_LTE_GDM724X) := gdmulte.o | 2 | obj-$(CONFIG_LTE_GDM724X) := gdmulte.o |
| 2 | gdmulte-y += gdm_lte.o netlink_k.o | 3 | gdmulte-y += gdm_lte.o netlink_k.o |
| 3 | gdmulte-y += gdm_usb.o gdm_endian.o | 4 | gdmulte-y += gdm_usb.o gdm_endian.o |
diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile index 23e1cb7bff8e..2551ed16b742 100644 --- a/drivers/staging/greybus/Makefile +++ b/drivers/staging/greybus/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Greybus core | 2 | # Greybus core |
| 2 | greybus-y := core.o \ | 3 | greybus-y := core.o \ |
| 3 | debugfs.o \ | 4 | debugfs.o \ |
diff --git a/drivers/staging/greybus/greybus_id.h b/drivers/staging/greybus/greybus_id.h index 4bb1fc1b811d..f4c8440093e4 100644 --- a/drivers/staging/greybus/greybus_id.h +++ b/drivers/staging/greybus/greybus_id.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* FIXME | 2 | /* FIXME |
| 2 | * move this to include/linux/mod_devicetable.h when merging | 3 | * move this to include/linux/mod_devicetable.h when merging |
| 3 | */ | 4 | */ |
diff --git a/drivers/staging/greybus/tools/Makefile b/drivers/staging/greybus/tools/Makefile index 852b12b71149..ad0ae8053b79 100644 --- a/drivers/staging/greybus/tools/Makefile +++ b/drivers/staging/greybus/tools/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ifeq ($(strip $(V)), 1) | 2 | ifeq ($(strip $(V)), 1) |
| 2 | Q = | 3 | Q = |
| 3 | else | 4 | else |
diff --git a/drivers/staging/iio/Makefile b/drivers/staging/iio/Makefile index 0cfd05d5bf49..455bffc29649 100644 --- a/drivers/staging/iio/Makefile +++ b/drivers/staging/iio/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the industrial I/O core. | 3 | # Makefile for the industrial I/O core. |
| 3 | # | 4 | # |
diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile index bf18bdd7c99d..ebe83c1ad362 100644 --- a/drivers/staging/iio/adc/Makefile +++ b/drivers/staging/iio/adc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for industrial I/O ADC drivers | 3 | # Makefile for industrial I/O ADC drivers |
| 3 | # | 4 | # |
diff --git a/drivers/staging/iio/meter/Makefile b/drivers/staging/iio/meter/Makefile index de3863d6b078..19e7982f5563 100644 --- a/drivers/staging/iio/meter/Makefile +++ b/drivers/staging/iio/meter/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for metering ic drivers | 3 | # Makefile for metering ic drivers |
| 3 | # | 4 | # |
diff --git a/drivers/staging/iio/meter/ade7854.h b/drivers/staging/iio/meter/ade7854.h index dbd97def9cd8..c27247a7891a 100644 --- a/drivers/staging/iio/meter/ade7854.h +++ b/drivers/staging/iio/meter/ade7854.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _ADE7854_H | 2 | #ifndef _ADE7854_H |
| 2 | #define _ADE7854_H | 3 | #define _ADE7854_H |
| 3 | 4 | ||
diff --git a/drivers/staging/iio/meter/meter.h b/drivers/staging/iio/meter/meter.h index 0e37f23853f1..edf26302fa57 100644 --- a/drivers/staging/iio/meter/meter.h +++ b/drivers/staging/iio/meter/meter.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _METER_H | 2 | #ifndef _METER_H |
| 2 | #define _METER_H | 3 | #define _METER_H |
| 3 | 4 | ||
diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.h b/drivers/staging/iio/trigger/iio-trig-bfin-timer.h index c07321f8d94c..fb05a2a8397c 100644 --- a/drivers/staging/iio/trigger/iio-trig-bfin-timer.h +++ b/drivers/staging/iio/trigger/iio-trig-bfin-timer.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __IIO_BFIN_TIMER_TRIGGER_H__ | 2 | #ifndef __IIO_BFIN_TIMER_TRIGGER_H__ |
| 2 | #define __IIO_BFIN_TIMER_TRIGGER_H__ | 3 | #define __IIO_BFIN_TIMER_TRIGGER_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/ks7010/eap_packet.h b/drivers/staging/ks7010/eap_packet.h index ae03f7477324..dca2a142e834 100644 --- a/drivers/staging/ks7010/eap_packet.h +++ b/drivers/staging/ks7010/eap_packet.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef EAP_PACKET_H | 2 | #ifndef EAP_PACKET_H |
| 2 | #define EAP_PACKET_H | 3 | #define EAP_PACKET_H |
| 3 | 4 | ||
diff --git a/drivers/staging/lustre/lnet/libcfs/Makefile b/drivers/staging/lustre/lnet/libcfs/Makefile index 215fa23827d1..1607570ef8de 100644 --- a/drivers/staging/lustre/lnet/libcfs/Makefile +++ b/drivers/staging/lustre/lnet/libcfs/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include | 2 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include |
| 2 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include | 3 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include |
| 3 | 4 | ||
diff --git a/drivers/staging/lustre/lnet/lnet/Makefile b/drivers/staging/lustre/lnet/lnet/Makefile index fd8585cd0ce2..0a9d70924fe0 100644 --- a/drivers/staging/lustre/lnet/lnet/Makefile +++ b/drivers/staging/lustre/lnet/lnet/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include | 2 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include |
| 2 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include | 3 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include |
| 3 | 4 | ||
diff --git a/drivers/staging/lustre/lustre/llite/Makefile b/drivers/staging/lustre/lustre/llite/Makefile index ef7adef4ccc5..519fd747e3ad 100644 --- a/drivers/staging/lustre/lustre/llite/Makefile +++ b/drivers/staging/lustre/lustre/llite/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include | 2 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include |
| 2 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include | 3 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include |
| 3 | 4 | ||
diff --git a/drivers/staging/lustre/lustre/llite/xattr_cache.c b/drivers/staging/lustre/lustre/llite/xattr_cache.c index 80ee3920481a..f9cf79761d51 100644 --- a/drivers/staging/lustre/lustre/llite/xattr_cache.c +++ b/drivers/staging/lustre/lustre/llite/xattr_cache.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright 2012 Xyratex Technology Limited | 3 | * Copyright 2012 Xyratex Technology Limited |
| 3 | * | 4 | * |
diff --git a/drivers/staging/lustre/lustre/lov/Makefile b/drivers/staging/lustre/lustre/lov/Makefile index 3abfb4eab3d3..1ebf0193f61a 100644 --- a/drivers/staging/lustre/lustre/lov/Makefile +++ b/drivers/staging/lustre/lustre/lov/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include | 2 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include |
| 2 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include | 3 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include |
| 3 | 4 | ||
diff --git a/drivers/staging/lustre/lustre/obdclass/Makefile b/drivers/staging/lustre/lustre/obdclass/Makefile index fa0ad6548ecd..e3fa9acff4c4 100644 --- a/drivers/staging/lustre/lustre/obdclass/Makefile +++ b/drivers/staging/lustre/lustre/obdclass/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include | 2 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include |
| 2 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include | 3 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include |
| 3 | 4 | ||
diff --git a/drivers/staging/lustre/lustre/ptlrpc/Makefile b/drivers/staging/lustre/lustre/ptlrpc/Makefile index a518001cdfe8..1deb1971b39e 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/Makefile +++ b/drivers/staging/lustre/lustre/ptlrpc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include | 2 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include |
| 2 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include | 3 | subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include |
| 3 | 4 | ||
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index ac090c5fce30..be732cf932fd 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_I2C_BCM2048) += bcm2048/ | 2 | obj-$(CONFIG_I2C_BCM2048) += bcm2048/ |
| 2 | obj-$(CONFIG_DVB_CXD2099) += cxd2099/ | 3 | obj-$(CONFIG_DVB_CXD2099) += cxd2099/ |
| 3 | obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx/ | 4 | obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx/ |
diff --git a/drivers/staging/media/atomisp/i2c/Makefile b/drivers/staging/media/atomisp/i2c/Makefile index be13fab92175..041a041718d2 100644 --- a/drivers/staging/media/atomisp/i2c/Makefile +++ b/drivers/staging/media/atomisp/i2c/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for sensor drivers | 3 | # Makefile for sensor drivers |
| 3 | # | 4 | # |
diff --git a/drivers/staging/media/atomisp/i2c/imx/Makefile b/drivers/staging/media/atomisp/i2c/imx/Makefile index b6578f09546e..c1a85e6e27a9 100644 --- a/drivers/staging/media/atomisp/i2c/imx/Makefile +++ b/drivers/staging/media/atomisp/i2c/imx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_VIDEO_IMX) += imx1x5.o | 2 | obj-$(CONFIG_VIDEO_IMX) += imx1x5.o |
| 2 | 3 | ||
| 3 | imx1x5-objs := imx.o drv201.o ad5816g.o dw9714.o dw9719.o dw9718.o vcm.o otp.o otp_imx.o otp_brcc064_e2prom.o otp_e2prom.o | 4 | imx1x5-objs := imx.o drv201.o ad5816g.o dw9714.o dw9719.o dw9718.o vcm.o otp.o otp_imx.o otp_brcc064_e2prom.o otp_e2prom.o |
diff --git a/drivers/staging/media/atomisp/i2c/imx/ad5816g.c b/drivers/staging/media/atomisp/i2c/imx/ad5816g.c index 558dcdf135d9..fb74f14cbe5a 100644 --- a/drivers/staging/media/atomisp/i2c/imx/ad5816g.c +++ b/drivers/staging/media/atomisp/i2c/imx/ad5816g.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/bitops.h> | 2 | #include <linux/bitops.h> |
| 2 | #include <linux/device.h> | 3 | #include <linux/device.h> |
| 3 | #include <linux/delay.h> | 4 | #include <linux/delay.h> |
diff --git a/drivers/staging/media/atomisp/i2c/imx/ad5816g.h b/drivers/staging/media/atomisp/i2c/imx/ad5816g.h index f995c2eeada4..e1396b00a0e1 100644 --- a/drivers/staging/media/atomisp/i2c/imx/ad5816g.h +++ b/drivers/staging/media/atomisp/i2c/imx/ad5816g.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __AD5816G_H__ | 2 | #ifndef __AD5816G_H__ |
| 2 | #define __AD5816G_H__ | 3 | #define __AD5816G_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/media/atomisp/i2c/imx/common.h b/drivers/staging/media/atomisp/i2c/imx/common.h index 7e525cef56ef..af2e3160df95 100644 --- a/drivers/staging/media/atomisp/i2c/imx/common.h +++ b/drivers/staging/media/atomisp/i2c/imx/common.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __COMMON_H__ | 2 | #ifndef __COMMON_H__ |
| 2 | #define __COMMON_H__ | 3 | #define __COMMON_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/media/atomisp/i2c/imx/drv201.c b/drivers/staging/media/atomisp/i2c/imx/drv201.c index 6d9d4c968722..221e4875ac49 100644 --- a/drivers/staging/media/atomisp/i2c/imx/drv201.c +++ b/drivers/staging/media/atomisp/i2c/imx/drv201.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/bitops.h> | 2 | #include <linux/bitops.h> |
| 2 | #include <linux/device.h> | 3 | #include <linux/device.h> |
| 3 | #include <linux/delay.h> | 4 | #include <linux/delay.h> |
diff --git a/drivers/staging/media/atomisp/i2c/imx/drv201.h b/drivers/staging/media/atomisp/i2c/imx/drv201.h index 8fc0ad116630..2ef8aafdf675 100644 --- a/drivers/staging/media/atomisp/i2c/imx/drv201.h +++ b/drivers/staging/media/atomisp/i2c/imx/drv201.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __DRV201_H__ | 2 | #ifndef __DRV201_H__ |
| 2 | #define __DRV201_H__ | 3 | #define __DRV201_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/media/atomisp/i2c/imx/dw9714.c b/drivers/staging/media/atomisp/i2c/imx/dw9714.c index 6397a7ee0af6..f96855454313 100644 --- a/drivers/staging/media/atomisp/i2c/imx/dw9714.c +++ b/drivers/staging/media/atomisp/i2c/imx/dw9714.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/bitops.h> | 2 | #include <linux/bitops.h> |
| 2 | #include <linux/device.h> | 3 | #include <linux/device.h> |
| 3 | #include <linux/delay.h> | 4 | #include <linux/delay.h> |
diff --git a/drivers/staging/media/atomisp/i2c/imx/dw9714.h b/drivers/staging/media/atomisp/i2c/imx/dw9714.h index 5a98a9c97182..aee560026b56 100644 --- a/drivers/staging/media/atomisp/i2c/imx/dw9714.h +++ b/drivers/staging/media/atomisp/i2c/imx/dw9714.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __DW9714_H__ | 2 | #ifndef __DW9714_H__ |
| 2 | #define __DW9714_H__ | 3 | #define __DW9714_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/media/atomisp/i2c/imx/imx134.h b/drivers/staging/media/atomisp/i2c/imx/imx134.h index cf35197ed77f..9026e8ba5679 100644 --- a/drivers/staging/media/atomisp/i2c/imx/imx134.h +++ b/drivers/staging/media/atomisp/i2c/imx/imx134.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __IMX134_H__ | 2 | #ifndef __IMX134_H__ |
| 2 | #define __IMX134_H__ | 3 | #define __IMX134_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/media/atomisp/i2c/imx/imx175.h b/drivers/staging/media/atomisp/i2c/imx/imx175.h index 5f409ccedc85..5e082088cb37 100644 --- a/drivers/staging/media/atomisp/i2c/imx/imx175.h +++ b/drivers/staging/media/atomisp/i2c/imx/imx175.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __IMX175_H__ | 2 | #ifndef __IMX175_H__ |
| 2 | #define __IMX175_H__ | 3 | #define __IMX175_H__ |
| 3 | #include "common.h" | 4 | #include "common.h" |
diff --git a/drivers/staging/media/atomisp/i2c/imx/imx219.h b/drivers/staging/media/atomisp/i2c/imx/imx219.h index 52df582c56d8..bbd515bf7279 100644 --- a/drivers/staging/media/atomisp/i2c/imx/imx219.h +++ b/drivers/staging/media/atomisp/i2c/imx/imx219.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __IMX219_H__ | 2 | #ifndef __IMX219_H__ |
| 2 | #define __IMX219_H__ | 3 | #define __IMX219_H__ |
| 3 | #include "common.h" | 4 | #include "common.h" |
diff --git a/drivers/staging/media/atomisp/i2c/imx/imx227.h b/drivers/staging/media/atomisp/i2c/imx/imx227.h index 10e5b86f6687..795fe017d01b 100644 --- a/drivers/staging/media/atomisp/i2c/imx/imx227.h +++ b/drivers/staging/media/atomisp/i2c/imx/imx227.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __IMX227_H__ | 2 | #ifndef __IMX227_H__ |
| 2 | #define __IMX227_H__ | 3 | #define __IMX227_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/media/atomisp/i2c/ov5693/Makefile b/drivers/staging/media/atomisp/i2c/ov5693/Makefile index 4e3833aaec05..facb70e6a93e 100644 --- a/drivers/staging/media/atomisp/i2c/ov5693/Makefile +++ b/drivers/staging/media/atomisp/i2c/ov5693/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_VIDEO_OV5693) += ov5693.o | 2 | obj-$(CONFIG_VIDEO_OV5693) += ov5693.o |
| 2 | 3 | ||
| 3 | # HACK! While this driver is in bad shape, don't enable several warnings | 4 | # HACK! While this driver is in bad shape, don't enable several warnings |
diff --git a/drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h b/drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h index c5e22bba455a..dc7104470f5c 100644 --- a/drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h +++ b/drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Access to message bus through three registers | 3 | * Access to message bus through three registers |
| 3 | * in CUNIT(0:0:0) PCI configuration space. | 4 | * in CUNIT(0:0:0) PCI configuration space. |
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/Makefile b/drivers/staging/media/atomisp/pci/atomisp2/Makefile index 2bd98f0667ec..ac3805345f20 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/Makefile +++ b/drivers/staging/media/atomisp/pci/atomisp2/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | atomisp-objs += \ | 2 | atomisp-objs += \ |
| 2 | atomisp_drvfs.o \ | 3 | atomisp_drvfs.o \ |
| 3 | atomisp_file.o \ | 4 | atomisp_file.o \ |
diff --git a/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c b/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c index cd452cc20fea..4631b1d39bb4 100644 --- a/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c +++ b/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/export.h> | 2 | #include <linux/export.h> |
| 2 | #include <linux/pci.h> | 3 | #include <linux/pci.h> |
| 3 | #include <linux/pm_qos.h> | 4 | #include <linux/pm_qos.h> |
diff --git a/drivers/staging/media/imx/Makefile b/drivers/staging/media/imx/Makefile index 3569625b6305..698a4210316e 100644 --- a/drivers/staging/media/imx/Makefile +++ b/drivers/staging/media/imx/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | imx-media-objs := imx-media-dev.o imx-media-internal-sd.o imx-media-of.o | 2 | imx-media-objs := imx-media-dev.o imx-media-internal-sd.o imx-media-of.o |
| 2 | imx-media-common-objs := imx-media-utils.o imx-media-fim.o | 3 | imx-media-common-objs := imx-media-utils.o imx-media-fim.o |
| 3 | imx-media-ic-objs := imx-ic-common.o imx-ic-prp.o imx-ic-prpencvf.o | 4 | imx-media-ic-objs := imx-ic-common.o imx-ic-prp.o imx-ic-prpencvf.o |
diff --git a/drivers/staging/most/Makefile b/drivers/staging/most/Makefile index 9ee981c7786b..f5bbb9deaab5 100644 --- a/drivers/staging/most/Makefile +++ b/drivers/staging/most/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_MOSTCORE) += mostcore/ | 2 | obj-$(CONFIG_MOSTCORE) += mostcore/ |
| 2 | obj-$(CONFIG_AIM_CDEV) += aim-cdev/ | 3 | obj-$(CONFIG_AIM_CDEV) += aim-cdev/ |
| 3 | obj-$(CONFIG_AIM_NETWORK) += aim-network/ | 4 | obj-$(CONFIG_AIM_NETWORK) += aim-network/ |
diff --git a/drivers/staging/nvec/Makefile b/drivers/staging/nvec/Makefile index 0db0e1f43337..f0cff8f9fdf6 100644 --- a/drivers/staging/nvec/Makefile +++ b/drivers/staging/nvec/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_SERIO_NVEC_PS2) += nvec_ps2.o | 2 | obj-$(CONFIG_SERIO_NVEC_PS2) += nvec_ps2.o |
| 2 | obj-$(CONFIG_MFD_NVEC) += nvec.o | 3 | obj-$(CONFIG_MFD_NVEC) += nvec.o |
| 3 | obj-$(CONFIG_NVEC_POWER) += nvec_power.o | 4 | obj-$(CONFIG_NVEC_POWER) += nvec_power.o |
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.h b/drivers/staging/olpc_dcon/olpc_dcon.h index 215e7ec4dea2..8fbde5d3b4a6 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon.h +++ b/drivers/staging/olpc_dcon/olpc_dcon.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef OLPC_DCON_H_ | 2 | #ifndef OLPC_DCON_H_ |
| 2 | #define OLPC_DCON_H_ | 3 | #define OLPC_DCON_H_ |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8188eu/Makefile b/drivers/staging/rtl8188eu/Makefile index 27af86e05098..033fb2e6950d 100644 --- a/drivers/staging/rtl8188eu/Makefile +++ b/drivers/staging/rtl8188eu/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | r8188eu-y := \ | 2 | r8188eu-y := \ |
| 2 | core/rtw_ap.o \ | 3 | core/rtw_ap.o \ |
| 3 | core/rtw_cmd.o \ | 4 | core/rtw_cmd.o \ |
diff --git a/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c b/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c index 81bf4944ef44..bbb981c6bcec 100644 --- a/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c +++ b/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /*++ | 2 | /*++ |
| 2 | Copyright (c) Realtek Semiconductor Corp. All rights reserved. | 3 | Copyright (c) Realtek Semiconductor Corp. All rights reserved. |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8188eu/include/Hal8188ERateAdaptive.h b/drivers/staging/rtl8188eu/include/Hal8188ERateAdaptive.h index 21996a1173ef..6722010ba1ec 100644 --- a/drivers/staging/rtl8188eu/include/Hal8188ERateAdaptive.h +++ b/drivers/staging/rtl8188eu/include/Hal8188ERateAdaptive.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __INC_RA_H | 2 | #ifndef __INC_RA_H |
| 2 | #define __INC_RA_H | 3 | #define __INC_RA_H |
| 3 | /*++ | 4 | /*++ |
diff --git a/drivers/staging/rtl8188eu/include/phy.h b/drivers/staging/rtl8188eu/include/phy.h index cd387e998574..e99ac3910787 100644 --- a/drivers/staging/rtl8188eu/include/phy.h +++ b/drivers/staging/rtl8188eu/include/phy.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <odm.h> | 2 | #include <odm.h> |
| 2 | 3 | ||
| 3 | #define IQK_DELAY_TIME_88E 10 | 4 | #define IQK_DELAY_TIME_88E 10 |
diff --git a/drivers/staging/rtl8188eu/include/rf.h b/drivers/staging/rtl8188eu/include/rf.h index 98a5551f5ae7..ed3241c020ad 100644 --- a/drivers/staging/rtl8188eu/include/rf.h +++ b/drivers/staging/rtl8188eu/include/rf.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #define RF6052_MAX_TX_PWR 0x3F | 2 | #define RF6052_MAX_TX_PWR 0x3F |
| 2 | #define RF6052_MAX_REG 0x3F | 3 | #define RF6052_MAX_REG 0x3F |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8192e/Makefile b/drivers/staging/rtl8192e/Makefile index 7101fcc8871b..6af519938868 100644 --- a/drivers/staging/rtl8192e/Makefile +++ b/drivers/staging/rtl8192e/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | rtllib-objs := \ | 2 | rtllib-objs := \ |
| 2 | dot11d.o \ | 3 | dot11d.o \ |
| 3 | rtllib_module.o \ | 4 | rtllib_module.o \ |
diff --git a/drivers/staging/rtl8192e/rtl8192e/Makefile b/drivers/staging/rtl8192e/rtl8192e/Makefile index 176a4a2b8b20..75e6ec510555 100644 --- a/drivers/staging/rtl8192e/rtl8192e/Makefile +++ b/drivers/staging/rtl8192e/rtl8192e/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | r8192e_pci-objs := \ | 2 | r8192e_pci-objs := \ |
| 2 | r8192E_dev.o \ | 3 | r8192E_dev.o \ |
| 3 | r8192E_phy.o \ | 4 | r8192E_phy.o \ |
diff --git a/drivers/staging/rtl8192u/Makefile b/drivers/staging/rtl8192u/Makefile index 703c1505ea5f..3022728a364c 100644 --- a/drivers/staging/rtl8192u/Makefile +++ b/drivers/staging/rtl8192u/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | NIC_SELECT = RTL8192U | 2 | NIC_SELECT = RTL8192U |
| 2 | 3 | ||
| 3 | ccflags-y := -std=gnu89 | 4 | ccflags-y := -std=gnu89 |
diff --git a/drivers/staging/rtl8192u/ieee80211/Makefile b/drivers/staging/rtl8192u/ieee80211/Makefile index 9e3f432e5355..0d4d6489f767 100644 --- a/drivers/staging/rtl8192u/ieee80211/Makefile +++ b/drivers/staging/rtl8192u/ieee80211/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | NIC_SELECT = RTL8192U | 2 | NIC_SELECT = RTL8192U |
| 2 | 3 | ||
| 3 | ccflags-y := -O2 | 4 | ccflags-y := -O2 |
diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.c b/drivers/staging/rtl8192u/ieee80211/dot11d.c index 00b6052fbbac..64b13a5da3cb 100644 --- a/drivers/staging/rtl8192u/ieee80211/dot11d.c +++ b/drivers/staging/rtl8192u/ieee80211/dot11d.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* Implement 802.11d. */ | 2 | /* Implement 802.11d. */ |
| 2 | 3 | ||
| 3 | #include "dot11d.h" | 4 | #include "dot11d.h" |
diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.h b/drivers/staging/rtl8192u/ieee80211/dot11d.h index 8ae673b217d8..88bc298305bd 100644 --- a/drivers/staging/rtl8192u/ieee80211/dot11d.h +++ b/drivers/staging/rtl8192u/ieee80211/dot11d.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __INC_DOT11D_H | 2 | #ifndef __INC_DOT11D_H |
| 2 | #define __INC_DOT11D_H | 3 | #define __INC_DOT11D_H |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h index 7abedc27d7c1..b6a76aae4832 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _BATYPE_H_ | 2 | #ifndef _BATYPE_H_ |
| 2 | #define _BATYPE_H_ | 3 | #define _BATYPE_H_ |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c index 8aa38dcf0dfd..4b92bb51c3e6 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /******************************************************************************************************************************** | 2 | /******************************************************************************************************************************** |
| 2 | * This file is created to process BA Action Frame. According to 802.11 spec, there are 3 BA action types at all. And as BA is | 3 | * This file is created to process BA Action Frame. According to 802.11 spec, there are 3 BA action types at all. And as BA is |
| 3 | * related to TS, this part need some structure defined in QOS side code. Also TX RX is going to be resturctured, so how to send | 4 | * related to TS, this part need some structure defined in QOS side code. Also TX RX is going to be resturctured, so how to send |
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h index 5f54d93dfb66..a85036022aa8 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _RTL819XU_HTTYPE_H_ | 2 | #ifndef _RTL819XU_HTTYPE_H_ |
| 2 | #define _RTL819XU_HTTYPE_H_ | 3 | #define _RTL819XU_HTTYPE_H_ |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c index 9248dbcf3370..bf7b7122d042 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | //As this function is mainly ported from Windows driver, so leave the name little changed. If any confusion caused, tell me. Created by WB. 2008.05.08 | 3 | //As this function is mainly ported from Windows driver, so leave the name little changed. If any confusion caused, tell me. Created by WB. 2008.05.08 |
| 3 | #include "ieee80211.h" | 4 | #include "ieee80211.h" |
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h index 49c23c720f78..71df9d9e2e99 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __INC_QOS_TYPE_H | 2 | #ifndef __INC_QOS_TYPE_H |
| 2 | #define __INC_QOS_TYPE_H | 3 | #define __INC_QOS_TYPE_H |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h index e25b69777ee7..3a0ff08c687a 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _TSTYPE_H_ | 2 | #ifndef _TSTYPE_H_ |
| 2 | #define _TSTYPE_H_ | 3 | #define _TSTYPE_H_ |
| 3 | #include "rtl819x_Qos.h" | 4 | #include "rtl819x_Qos.h" |
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c index f98bb03aa293..f4921abf7300 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "ieee80211.h" | 2 | #include "ieee80211.h" |
| 2 | #include <linux/etherdevice.h> | 3 | #include <linux/etherdevice.h> |
| 3 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c index e6f8d1da65d9..4c241a07ae75 100644 --- a/drivers/staging/rtl8192u/r8192U_dm.c +++ b/drivers/staging/rtl8192u/r8192U_dm.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /*++ | 2 | /*++ |
| 2 | Copyright-c Realtek Semiconductor Corp. All rights reserved. | 3 | Copyright-c Realtek Semiconductor Corp. All rights reserved. |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8192u/r8192U_dm.h b/drivers/staging/rtl8192u/r8192U_dm.h index 2d0232fb3f9b..98137f65d1b2 100644 --- a/drivers/staging/rtl8192u/r8192U_dm.h +++ b/drivers/staging/rtl8192u/r8192U_dm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /***************************************************************************** | 2 | /***************************************************************************** |
| 2 | * Copyright(c) 2007, RealTEK Technology Inc. All Right Reserved. | 3 | * Copyright(c) 2007, RealTEK Technology Inc. All Right Reserved. |
| 3 | * | 4 | * |
diff --git a/drivers/staging/rtl8192u/r819xU_cmdpkt.c b/drivers/staging/rtl8192u/r819xU_cmdpkt.c index ae9a4f1ac8fd..80672100ea26 100644 --- a/drivers/staging/rtl8192u/r819xU_cmdpkt.c +++ b/drivers/staging/rtl8192u/r819xU_cmdpkt.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /****************************************************************************** | 2 | /****************************************************************************** |
| 2 | * | 3 | * |
| 3 | * (c) Copyright 2008, RealTEK Technologies Inc. All Rights Reserved. | 4 | * (c) Copyright 2008, RealTEK Technologies Inc. All Rights Reserved. |
diff --git a/drivers/staging/rtl8192u/r819xU_cmdpkt.h b/drivers/staging/rtl8192u/r819xU_cmdpkt.h index ad0f6003570d..85fb49ca7bc8 100644 --- a/drivers/staging/rtl8192u/r819xU_cmdpkt.h +++ b/drivers/staging/rtl8192u/r819xU_cmdpkt.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef R819XUSB_CMDPKT_H | 2 | #ifndef R819XUSB_CMDPKT_H |
| 2 | #define R819XUSB_CMDPKT_H | 3 | #define R819XUSB_CMDPKT_H |
| 3 | /* Different command packet have dedicated message length and definition. */ | 4 | /* Different command packet have dedicated message length and definition. */ |
diff --git a/drivers/staging/rtl8192u/r819xU_firmware.c b/drivers/staging/rtl8192u/r819xU_firmware.c index 35d1786703a7..9c7e19aedff1 100644 --- a/drivers/staging/rtl8192u/r819xU_firmware.c +++ b/drivers/staging/rtl8192u/r819xU_firmware.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /************************************************************************************************** | 2 | /************************************************************************************************** |
| 2 | * Procedure: Init boot code/firmware code/data session | 3 | * Procedure: Init boot code/firmware code/data session |
| 3 | * | 4 | * |
diff --git a/drivers/staging/rtl8192u/r819xU_firmware.h b/drivers/staging/rtl8192u/r819xU_firmware.h index 24b63f2ec509..cccd1c82ffe0 100644 --- a/drivers/staging/rtl8192u/r819xU_firmware.h +++ b/drivers/staging/rtl8192u/r819xU_firmware.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __INC_FIRMWARE_H | 2 | #ifndef __INC_FIRMWARE_H |
| 2 | #define __INC_FIRMWARE_H | 3 | #define __INC_FIRMWARE_H |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8192u/r819xU_firmware_img.c b/drivers/staging/rtl8192u/r819xU_firmware_img.c index 4eb43cfe5690..0af062036688 100644 --- a/drivers/staging/rtl8192u/r819xU_firmware_img.c +++ b/drivers/staging/rtl8192u/r819xU_firmware_img.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /*Created on 2008/ 7/16, 5:31*/ | 2 | /*Created on 2008/ 7/16, 5:31*/ |
| 2 | #include <linux/types.h> | 3 | #include <linux/types.h> |
| 3 | #include "r819xU_firmware_img.h" | 4 | #include "r819xU_firmware_img.h" |
diff --git a/drivers/staging/rtl8192u/r819xU_firmware_img.h b/drivers/staging/rtl8192u/r819xU_firmware_img.h index 18d0a6b5cbae..355da9157be1 100644 --- a/drivers/staging/rtl8192u/r819xU_firmware_img.h +++ b/drivers/staging/rtl8192u/r819xU_firmware_img.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef IMG_H | 2 | #ifndef IMG_H |
| 2 | #define IMG_H | 3 | #define IMG_H |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c index 3874f8307117..12750671c860 100644 --- a/drivers/staging/rtl8192u/r819xU_phy.c +++ b/drivers/staging/rtl8192u/r819xU_phy.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "r8192U.h" | 2 | #include "r8192U.h" |
| 2 | #include "r8192U_hw.h" | 3 | #include "r8192U_hw.h" |
| 3 | #include "r819xU_phy.h" | 4 | #include "r819xU_phy.h" |
diff --git a/drivers/staging/rtl8192u/r819xU_phy.h b/drivers/staging/rtl8192u/r819xU_phy.h index e672126330f3..0a42a6092ea9 100644 --- a/drivers/staging/rtl8192u/r819xU_phy.h +++ b/drivers/staging/rtl8192u/r819xU_phy.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _R819XU_PHY_H | 2 | #ifndef _R819XU_PHY_H |
| 2 | #define _R819XU_PHY_H | 3 | #define _R819XU_PHY_H |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8192u/r819xU_phyreg.h b/drivers/staging/rtl8192u/r819xU_phyreg.h index b855627e9816..c058a9537526 100644 --- a/drivers/staging/rtl8192u/r819xU_phyreg.h +++ b/drivers/staging/rtl8192u/r819xU_phyreg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _R819XU_PHYREG_H | 2 | #ifndef _R819XU_PHYREG_H |
| 2 | #define _R819XU_PHYREG_H | 3 | #define _R819XU_PHYREG_H |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8712/Makefile b/drivers/staging/rtl8712/Makefile index 6f8500c2d922..3ae216b6621b 100644 --- a/drivers/staging/rtl8712/Makefile +++ b/drivers/staging/rtl8712/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | r8712u-y := \ | 2 | r8712u-y := \ |
| 2 | rtl871x_cmd.o \ | 3 | rtl871x_cmd.o \ |
| 3 | rtl8712_cmd.o \ | 4 | rtl8712_cmd.o \ |
diff --git a/drivers/staging/rtl8712/rtl8712_efuse.h b/drivers/staging/rtl8712/rtl8712_efuse.h index 6a64f91ad75f..dbba51cd40fb 100644 --- a/drivers/staging/rtl8712/rtl8712_efuse.h +++ b/drivers/staging/rtl8712/rtl8712_efuse.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __RTL8712_EFUSE_H__ | 2 | #ifndef __RTL8712_EFUSE_H__ |
| 2 | #define __RTL8712_EFUSE_H__ | 3 | #define __RTL8712_EFUSE_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl.h b/drivers/staging/rtl8712/rtl871x_ioctl.h index 08bcb3b41bbd..634e67461712 100644 --- a/drivers/staging/rtl8712/rtl871x_ioctl.h +++ b/drivers/staging/rtl8712/rtl871x_ioctl.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __IOCTL_H | 2 | #ifndef __IOCTL_H |
| 2 | #define __IOCTL_H | 3 | #define __IOCTL_H |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h b/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h index 11bcfb7bf77c..d479f739ff08 100644 --- a/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h +++ b/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /***************************************************************************** | 2 | /***************************************************************************** |
| 2 | * Copyright(c) 2008, RealTEK Technology Inc. All Right Reserved. | 3 | * Copyright(c) 2008, RealTEK Technology Inc. All Right Reserved. |
| 3 | * | 4 | * |
diff --git a/drivers/staging/rtl8712/rtl871x_recv.h b/drivers/staging/rtl8712/rtl871x_recv.h index 9de06c5fe620..f87b2ff5de1c 100644 --- a/drivers/staging/rtl8712/rtl871x_recv.h +++ b/drivers/staging/rtl8712/rtl871x_recv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _RTL871X_RECV_H_ | 2 | #ifndef _RTL871X_RECV_H_ |
| 2 | #define _RTL871X_RECV_H_ | 3 | #define _RTL871X_RECV_H_ |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8723bs/Makefile b/drivers/staging/rtl8723bs/Makefile index 4e7b460a9c73..f236acfd3afa 100644 --- a/drivers/staging/rtl8723bs/Makefile +++ b/drivers/staging/rtl8723bs/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | r8723bs-y = \ | 2 | r8723bs-y = \ |
| 2 | core/rtw_ap.o \ | 3 | core/rtw_ap.o \ |
| 3 | core/rtw_btcoex.o \ | 4 | core/rtw_btcoex.o \ |
diff --git a/drivers/staging/rtl8723bs/hal/Hal8723BReg.h b/drivers/staging/rtl8723bs/hal/Hal8723BReg.h index 152a198c8f17..ce02457922b7 100644 --- a/drivers/staging/rtl8723bs/hal/Hal8723BReg.h +++ b/drivers/staging/rtl8723bs/hal/Hal8723BReg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /***************************************************************************** | 2 | /***************************************************************************** |
| 2 | *Copyright(c) 2009, RealTEK Technology Inc. All Right Reserved. | 3 | *Copyright(c) 2009, RealTEK Technology Inc. All Right Reserved. |
| 3 | * | 4 | * |
diff --git a/drivers/staging/rtl8723bs/include/Hal8723BPwrSeq.h b/drivers/staging/rtl8723bs/include/Hal8723BPwrSeq.h index 796449c3f430..130a94879805 100644 --- a/drivers/staging/rtl8723bs/include/Hal8723BPwrSeq.h +++ b/drivers/staging/rtl8723bs/include/Hal8723BPwrSeq.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef REALTEK_POWER_SEQUENCE_8723B | 2 | #ifndef REALTEK_POWER_SEQUENCE_8723B |
| 2 | #define REALTEK_POWER_SEQUENCE_8723B | 3 | #define REALTEK_POWER_SEQUENCE_8723B |
| 3 | 4 | ||
diff --git a/drivers/staging/rtl8723bs/include/rtw_wifi_regd.h b/drivers/staging/rtl8723bs/include/rtw_wifi_regd.h index d97ca1630bd4..ab5a8627d371 100644 --- a/drivers/staging/rtl8723bs/include/rtw_wifi_regd.h +++ b/drivers/staging/rtl8723bs/include/rtw_wifi_regd.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /****************************************************************************** | 2 | /****************************************************************************** |
| 2 | * | 3 | * |
| 3 | * Copyright(c) 2009-2010 Realtek Corporation. | 4 | * Copyright(c) 2009-2010 Realtek Corporation. |
diff --git a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c index 305e88a6b2ca..aa2f62acc994 100644 --- a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c +++ b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /****************************************************************************** | 2 | /****************************************************************************** |
| 2 | * | 3 | * |
| 3 | * Copyright(c) 2009-2010 Realtek Corporation. | 4 | * Copyright(c) 2009-2010 Realtek Corporation. |
diff --git a/drivers/staging/rts5208/trace.c b/drivers/staging/rts5208/trace.c index 1bddbdf3454b..c878e75293f7 100644 --- a/drivers/staging/rts5208/trace.c +++ b/drivers/staging/rts5208/trace.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/string.h> | 3 | #include <linux/string.h> |
| 3 | 4 | ||
diff --git a/drivers/staging/skein/Makefile b/drivers/staging/skein/Makefile index b7f947fb98f0..86b7966d694e 100644 --- a/drivers/staging/skein/Makefile +++ b/drivers/staging/skein/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the skein secure hash algorithm | 3 | # Makefile for the skein secure hash algorithm |
| 3 | # | 4 | # |
diff --git a/drivers/staging/skein/skein_iv.h b/drivers/staging/skein/skein_iv.h index 509d464c65a3..916f029da726 100644 --- a/drivers/staging/skein/skein_iv.h +++ b/drivers/staging/skein/skein_iv.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _SKEIN_IV_H_ | 2 | #ifndef _SKEIN_IV_H_ |
| 2 | #define _SKEIN_IV_H_ | 3 | #define _SKEIN_IV_H_ |
| 3 | 4 | ||
diff --git a/drivers/staging/skein/threefish_api.c b/drivers/staging/skein/threefish_api.c index 2b649abb78c7..e69cefa6b16a 100644 --- a/drivers/staging/skein/threefish_api.c +++ b/drivers/staging/skein/threefish_api.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/string.h> | 2 | #include <linux/string.h> |
| 2 | #include "threefish_api.h" | 3 | #include "threefish_api.h" |
| 3 | 4 | ||
diff --git a/drivers/staging/skein/threefish_api.h b/drivers/staging/skein/threefish_api.h index 615e467579ee..21539c3cc7a0 100644 --- a/drivers/staging/skein/threefish_api.h +++ b/drivers/staging/skein/threefish_api.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #ifndef THREEFISHAPI_H | 3 | #ifndef THREEFISHAPI_H |
| 3 | #define THREEFISHAPI_H | 4 | #define THREEFISHAPI_H |
diff --git a/drivers/staging/skein/threefish_block.c b/drivers/staging/skein/threefish_block.c index 50640656c10d..87f055890544 100644 --- a/drivers/staging/skein/threefish_block.c +++ b/drivers/staging/skein/threefish_block.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/bitops.h> | 2 | #include <linux/bitops.h> |
| 2 | #include "threefish_api.h" | 3 | #include "threefish_api.h" |
| 3 | 4 | ||
diff --git a/drivers/staging/sm750fb/ddk750_chip.c b/drivers/staging/sm750fb/ddk750_chip.c index 4754f7a20684..313b99104398 100644 --- a/drivers/staging/sm750fb/ddk750_chip.c +++ b/drivers/staging/sm750fb/ddk750_chip.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/sizes.h> | 3 | #include <linux/sizes.h> |
| 3 | 4 | ||
diff --git a/drivers/staging/sm750fb/ddk750_chip.h b/drivers/staging/sm750fb/ddk750_chip.h index 2c7a9b9a7c8a..09c223f815de 100644 --- a/drivers/staging/sm750fb/ddk750_chip.h +++ b/drivers/staging/sm750fb/ddk750_chip.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DDK750_CHIP_H__ | 2 | #ifndef DDK750_CHIP_H__ |
| 2 | #define DDK750_CHIP_H__ | 3 | #define DDK750_CHIP_H__ |
| 3 | #define DEFAULT_INPUT_CLOCK 14318181 /* Default reference clock */ | 4 | #define DEFAULT_INPUT_CLOCK 14318181 /* Default reference clock */ |
diff --git a/drivers/staging/sm750fb/ddk750_display.c b/drivers/staging/sm750fb/ddk750_display.c index 9b116ed6ecc7..c6fd90191530 100644 --- a/drivers/staging/sm750fb/ddk750_display.c +++ b/drivers/staging/sm750fb/ddk750_display.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "ddk750_reg.h" | 2 | #include "ddk750_reg.h" |
| 2 | #include "ddk750_chip.h" | 3 | #include "ddk750_chip.h" |
| 3 | #include "ddk750_display.h" | 4 | #include "ddk750_display.h" |
diff --git a/drivers/staging/sm750fb/ddk750_display.h b/drivers/staging/sm750fb/ddk750_display.h index 609bf742efff..523bbf33521c 100644 --- a/drivers/staging/sm750fb/ddk750_display.h +++ b/drivers/staging/sm750fb/ddk750_display.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DDK750_DISPLAY_H__ | 2 | #ifndef DDK750_DISPLAY_H__ |
| 2 | #define DDK750_DISPLAY_H__ | 3 | #define DDK750_DISPLAY_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/sm750fb/ddk750_dvi.c b/drivers/staging/sm750fb/ddk750_dvi.c index 87a199d6cdaf..f41bd9181757 100644 --- a/drivers/staging/sm750fb/ddk750_dvi.c +++ b/drivers/staging/sm750fb/ddk750_dvi.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #define USE_DVICHIP | 2 | #define USE_DVICHIP |
| 2 | #ifdef USE_DVICHIP | 3 | #ifdef USE_DVICHIP |
| 3 | #include "ddk750_chip.h" | 4 | #include "ddk750_chip.h" |
diff --git a/drivers/staging/sm750fb/ddk750_dvi.h b/drivers/staging/sm750fb/ddk750_dvi.h index 4a8394561f76..9529cb9cfd69 100644 --- a/drivers/staging/sm750fb/ddk750_dvi.h +++ b/drivers/staging/sm750fb/ddk750_dvi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DDK750_DVI_H__ | 2 | #ifndef DDK750_DVI_H__ |
| 2 | #define DDK750_DVI_H__ | 3 | #define DDK750_DVI_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/sm750fb/ddk750_hwi2c.c b/drivers/staging/sm750fb/ddk750_hwi2c.c index ec556a978a98..8482689b665b 100644 --- a/drivers/staging/sm750fb/ddk750_hwi2c.c +++ b/drivers/staging/sm750fb/ddk750_hwi2c.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #define USE_HW_I2C | 2 | #define USE_HW_I2C |
| 2 | #ifdef USE_HW_I2C | 3 | #ifdef USE_HW_I2C |
| 3 | #include "ddk750_chip.h" | 4 | #include "ddk750_chip.h" |
diff --git a/drivers/staging/sm750fb/ddk750_hwi2c.h b/drivers/staging/sm750fb/ddk750_hwi2c.h index 46e22dce2570..337c6493ca61 100644 --- a/drivers/staging/sm750fb/ddk750_hwi2c.h +++ b/drivers/staging/sm750fb/ddk750_hwi2c.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DDK750_HWI2C_H__ | 2 | #ifndef DDK750_HWI2C_H__ |
| 2 | #define DDK750_HWI2C_H__ | 3 | #define DDK750_HWI2C_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/sm750fb/ddk750_mode.c b/drivers/staging/sm750fb/ddk750_mode.c index bb673e18999b..2cdd87b78e58 100644 --- a/drivers/staging/sm750fb/ddk750_mode.c +++ b/drivers/staging/sm750fb/ddk750_mode.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | #include "ddk750_reg.h" | 3 | #include "ddk750_reg.h" |
| 3 | #include "ddk750_mode.h" | 4 | #include "ddk750_mode.h" |
diff --git a/drivers/staging/sm750fb/ddk750_mode.h b/drivers/staging/sm750fb/ddk750_mode.h index d5eae36d85cb..259a9d6a4eb2 100644 --- a/drivers/staging/sm750fb/ddk750_mode.h +++ b/drivers/staging/sm750fb/ddk750_mode.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DDK750_MODE_H__ | 2 | #ifndef DDK750_MODE_H__ |
| 2 | #define DDK750_MODE_H__ | 3 | #define DDK750_MODE_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/sm750fb/ddk750_power.c b/drivers/staging/sm750fb/ddk750_power.c index 222ae1a06feb..73aeaeb89a64 100644 --- a/drivers/staging/sm750fb/ddk750_power.c +++ b/drivers/staging/sm750fb/ddk750_power.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "ddk750_chip.h" | 2 | #include "ddk750_chip.h" |
| 2 | #include "ddk750_reg.h" | 3 | #include "ddk750_reg.h" |
| 3 | #include "ddk750_power.h" | 4 | #include "ddk750_power.h" |
diff --git a/drivers/staging/sm750fb/ddk750_power.h b/drivers/staging/sm750fb/ddk750_power.h index 44c4fc587e96..651d05247edf 100644 --- a/drivers/staging/sm750fb/ddk750_power.h +++ b/drivers/staging/sm750fb/ddk750_power.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DDK750_POWER_H__ | 2 | #ifndef DDK750_POWER_H__ |
| 2 | #define DDK750_POWER_H__ | 3 | #define DDK750_POWER_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/sm750fb/ddk750_reg.h b/drivers/staging/sm750fb/ddk750_reg.h index f9b989b7a152..fe412ead72e5 100644 --- a/drivers/staging/sm750fb/ddk750_reg.h +++ b/drivers/staging/sm750fb/ddk750_reg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DDK750_REG_H__ | 2 | #ifndef DDK750_REG_H__ |
| 2 | #define DDK750_REG_H__ | 3 | #define DDK750_REG_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/sm750fb/ddk750_sii164.c b/drivers/staging/sm750fb/ddk750_sii164.c index 0431833de781..1eeaf087e891 100644 --- a/drivers/staging/sm750fb/ddk750_sii164.c +++ b/drivers/staging/sm750fb/ddk750_sii164.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #define USE_DVICHIP | 2 | #define USE_DVICHIP |
| 2 | #ifdef USE_DVICHIP | 3 | #ifdef USE_DVICHIP |
| 3 | 4 | ||
diff --git a/drivers/staging/sm750fb/ddk750_sii164.h b/drivers/staging/sm750fb/ddk750_sii164.h index 6968cf532f16..af52a3121067 100644 --- a/drivers/staging/sm750fb/ddk750_sii164.h +++ b/drivers/staging/sm750fb/ddk750_sii164.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef DDK750_SII164_H__ | 2 | #ifndef DDK750_SII164_H__ |
| 2 | #define DDK750_SII164_H__ | 3 | #define DDK750_SII164_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h index 4386122799b2..ce90adcb449d 100644 --- a/drivers/staging/sm750fb/sm750.h +++ b/drivers/staging/sm750fb/sm750.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef LYNXDRV_H_ | 2 | #ifndef LYNXDRV_H_ |
| 2 | #define LYNXDRV_H_ | 3 | #define LYNXDRV_H_ |
| 3 | 4 | ||
diff --git a/drivers/staging/sm750fb/sm750_accel.c b/drivers/staging/sm750fb/sm750_accel.c index 4b720cfa05de..1035e91e7cd3 100644 --- a/drivers/staging/sm750fb/sm750_accel.c +++ b/drivers/staging/sm750fb/sm750_accel.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/module.h> | 2 | #include <linux/module.h> |
| 2 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 3 | #include <linux/errno.h> | 4 | #include <linux/errno.h> |
diff --git a/drivers/staging/sm750fb/sm750_accel.h b/drivers/staging/sm750fb/sm750_accel.h index 4b0ff8feb9a0..c4f42002a50f 100644 --- a/drivers/staging/sm750fb/sm750_accel.h +++ b/drivers/staging/sm750fb/sm750_accel.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ACCEL_H__ | 2 | #ifndef ACCEL_H__ |
| 2 | #define ACCEL_H__ | 3 | #define ACCEL_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/sm750fb/sm750_cursor.c b/drivers/staging/sm750fb/sm750_cursor.c index aa47a16ac75c..9d24159226d1 100644 --- a/drivers/staging/sm750fb/sm750_cursor.c +++ b/drivers/staging/sm750fb/sm750_cursor.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/module.h> | 2 | #include <linux/module.h> |
| 2 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 3 | #include <linux/errno.h> | 4 | #include <linux/errno.h> |
diff --git a/drivers/staging/sm750fb/sm750_cursor.h b/drivers/staging/sm750fb/sm750_cursor.h index c7b86ae235b4..16ac07eb58d6 100644 --- a/drivers/staging/sm750fb/sm750_cursor.h +++ b/drivers/staging/sm750fb/sm750_cursor.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef LYNX_CURSOR_H__ | 2 | #ifndef LYNX_CURSOR_H__ |
| 2 | #define LYNX_CURSOR_H__ | 3 | #define LYNX_CURSOR_H__ |
| 3 | 4 | ||
diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c index baf1bbdc92ff..ffd114a6d09b 100644 --- a/drivers/staging/sm750fb/sm750_hw.c +++ b/drivers/staging/sm750fb/sm750_hw.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/module.h> | 2 | #include <linux/module.h> |
| 2 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 3 | #include <linux/errno.h> | 4 | #include <linux/errno.h> |
diff --git a/drivers/staging/speakup/Makefile b/drivers/staging/speakup/Makefile index c864ea69c40d..5befb4933b85 100644 --- a/drivers/staging/speakup/Makefile +++ b/drivers/staging/speakup/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_SPEAKUP_SYNTH_ACNTSA) += speakup_acntsa.o | 2 | obj-$(CONFIG_SPEAKUP_SYNTH_ACNTSA) += speakup_acntsa.o |
| 2 | obj-$(CONFIG_SPEAKUP_SYNTH_ACNTPC) += speakup_acntpc.o | 3 | obj-$(CONFIG_SPEAKUP_SYNTH_ACNTPC) += speakup_acntpc.o |
| 3 | obj-$(CONFIG_SPEAKUP_SYNTH_APOLLO) += speakup_apollo.o | 4 | obj-$(CONFIG_SPEAKUP_SYNTH_APOLLO) += speakup_apollo.o |
diff --git a/drivers/staging/speakup/devsynth.c b/drivers/staging/speakup/devsynth.c index 58abd1d85105..d920256328c3 100644 --- a/drivers/staging/speakup/devsynth.c +++ b/drivers/staging/speakup/devsynth.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/errno.h> | 2 | #include <linux/errno.h> |
| 2 | #include <linux/miscdevice.h> /* for misc_register, and SYNTH_MINOR */ | 3 | #include <linux/miscdevice.h> /* for misc_register, and SYNTH_MINOR */ |
| 3 | #include <linux/types.h> | 4 | #include <linux/types.h> |
diff --git a/drivers/staging/speakup/i18n.c b/drivers/staging/speakup/i18n.c index 7809867f5d28..cea8707653f5 100644 --- a/drivers/staging/speakup/i18n.c +++ b/drivers/staging/speakup/i18n.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* Internationalization implementation. Includes definitions of English | 2 | /* Internationalization implementation. Includes definitions of English |
| 2 | * string arrays, and the i18n pointer. | 3 | * string arrays, and the i18n pointer. |
| 3 | */ | 4 | */ |
diff --git a/drivers/staging/speakup/i18n.h b/drivers/staging/speakup/i18n.h index 8fcce566653f..2ec6e659d02b 100644 --- a/drivers/staging/speakup/i18n.h +++ b/drivers/staging/speakup/i18n.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef I18N_H | 2 | #ifndef I18N_H |
| 2 | #define I18N_H | 3 | #define I18N_H |
| 3 | /* Internationalization declarations */ | 4 | /* Internationalization declarations */ |
diff --git a/drivers/staging/speakup/selection.c b/drivers/staging/speakup/selection.c index 08f68fc2864e..66061b5c3427 100644 --- a/drivers/staging/speakup/selection.c +++ b/drivers/staging/speakup/selection.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/slab.h> /* for kmalloc */ | 2 | #include <linux/slab.h> /* for kmalloc */ |
| 2 | #include <linux/consolemap.h> | 3 | #include <linux/consolemap.h> |
| 3 | #include <linux/interrupt.h> | 4 | #include <linux/interrupt.h> |
diff --git a/drivers/staging/speakup/serialio.h b/drivers/staging/speakup/serialio.h index 89de6fff9cb2..aa691e4a6916 100644 --- a/drivers/staging/speakup/serialio.h +++ b/drivers/staging/speakup/serialio.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _SPEAKUP_SERIAL_H | 2 | #ifndef _SPEAKUP_SERIAL_H |
| 2 | #define _SPEAKUP_SERIAL_H | 3 | #define _SPEAKUP_SERIAL_H |
| 3 | 4 | ||
diff --git a/drivers/staging/speakup/speakup.h b/drivers/staging/speakup/speakup.h index a654334c98b9..3d8bda8b9620 100644 --- a/drivers/staging/speakup/speakup.h +++ b/drivers/staging/speakup/speakup.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _SPEAKUP_H | 2 | #ifndef _SPEAKUP_H |
| 2 | #define _SPEAKUP_H | 3 | #define _SPEAKUP_H |
| 3 | 4 | ||
diff --git a/drivers/staging/speakup/speakup_acnt.h b/drivers/staging/speakup/speakup_acnt.h index 107ec1155f51..cffa938ae580 100644 --- a/drivers/staging/speakup/speakup_acnt.h +++ b/drivers/staging/speakup/speakup_acnt.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* speakup_acntpc.h - header file for speakups Accent-PC driver. */ | 2 | /* speakup_acntpc.h - header file for speakups Accent-PC driver. */ |
| 2 | 3 | ||
| 3 | #define SYNTH_IO_EXTENT 0x02 | 4 | #define SYNTH_IO_EXTENT 0x02 |
diff --git a/drivers/staging/speakup/speakup_dtlk.h b/drivers/staging/speakup/speakup_dtlk.h index 51ac0f2fcded..9c378b58066e 100644 --- a/drivers/staging/speakup/speakup_dtlk.h +++ b/drivers/staging/speakup/speakup_dtlk.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* speakup_dtlk.h - header file for speakups DoubleTalk driver. */ | 2 | /* speakup_dtlk.h - header file for speakups DoubleTalk driver. */ |
| 2 | 3 | ||
| 3 | #define SYNTH_IO_EXTENT 0x02 | 4 | #define SYNTH_IO_EXTENT 0x02 |
diff --git a/drivers/staging/speakup/speakupmap.h b/drivers/staging/speakup/speakupmap.h index f1c0dd3b2c3a..c60d7339b89a 100644 --- a/drivers/staging/speakup/speakupmap.h +++ b/drivers/staging/speakup/speakupmap.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 119, 62, 6, | 2 | 119, 62, 6, |
| 2 | 0, 16, 20, 17, 32, 48, 0, | 3 | 0, 16, 20, 17, 32, 48, 0, |
| 3 | 2, 0, 78, 0, 0, 0, 0, | 4 | 2, 0, 78, 0, 0, 0, 0, |
diff --git a/drivers/staging/speakup/spk_types.h b/drivers/staging/speakup/spk_types.h index 22f657d45e46..c50de6035a9a 100644 --- a/drivers/staging/speakup/spk_types.h +++ b/drivers/staging/speakup/spk_types.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef SPEAKUP_TYPES_H | 2 | #ifndef SPEAKUP_TYPES_H |
| 2 | #define SPEAKUP_TYPES_H | 3 | #define SPEAKUP_TYPES_H |
| 3 | 4 | ||
diff --git a/drivers/staging/unisys/visorbus/Makefile b/drivers/staging/unisys/visorbus/Makefile index f3730d8c953e..784cdc1f9d6a 100644 --- a/drivers/staging/unisys/visorbus/Makefile +++ b/drivers/staging/unisys/visorbus/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for Unisys visorbus | 3 | # Makefile for Unisys visorbus |
| 3 | # | 4 | # |
diff --git a/drivers/staging/vboxvideo/Makefile b/drivers/staging/vboxvideo/Makefile index 2d0b3bc7ad73..3f6094aa9cdf 100644 --- a/drivers/staging/vboxvideo/Makefile +++ b/drivers/staging/vboxvideo/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ccflags-y := -Iinclude/drm | 2 | ccflags-y := -Iinclude/drm |
| 2 | 3 | ||
| 3 | vboxvideo-y := hgsmi_base.o modesetting.o vbva_base.o \ | 4 | vboxvideo-y := hgsmi_base.o modesetting.o vbva_base.o \ |
diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile index e9a8e1343cbb..1ecb261e04ae 100644 --- a/drivers/staging/vc04_services/Makefile +++ b/drivers/staging/vc04_services/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_BCM2835_VCHIQ) += vchiq.o | 2 | obj-$(CONFIG_BCM2835_VCHIQ) += vchiq.o |
| 2 | 3 | ||
| 3 | vchiq-objs := \ | 4 | vchiq-objs := \ |
diff --git a/drivers/staging/vc04_services/bcm2835-camera/Makefile b/drivers/staging/vc04_services/bcm2835-camera/Makefile index 8307f30517d5..2a4565e682d8 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/Makefile +++ b/drivers/staging/vc04_services/bcm2835-camera/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | bcm2835-v4l2-$(CONFIG_VIDEO_BCM2835) := \ | 2 | bcm2835-v4l2-$(CONFIG_VIDEO_BCM2835) := \ |
| 2 | bcm2835-camera.o \ | 3 | bcm2835-camera.o \ |
| 3 | controls.o \ | 4 | controls.o \ |
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_genversion b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_genversion index 9f5b6344b9b7..dd1f324a8654 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_genversion +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_genversion | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #!/usr/bin/perl -w | 1 | #!/usr/bin/perl -w |
| 2 | # SPDX-License-Identifier: GPL-2.0 | ||
| 2 | 3 | ||
| 3 | use strict; | 4 | use strict; |
| 4 | 5 | ||
diff --git a/drivers/staging/vme/devices/vme_pio2.h b/drivers/staging/vme/devices/vme_pio2.h index ac4a4bad4091..65f834cdeab2 100644 --- a/drivers/staging/vme/devices/vme_pio2.h +++ b/drivers/staging/vme/devices/vme_pio2.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _VME_PIO2_H_ | 2 | #ifndef _VME_PIO2_H_ |
| 2 | #define _VME_PIO2_H_ | 3 | #define _VME_PIO2_H_ |
| 3 | 4 | ||
diff --git a/drivers/staging/vme/devices/vme_user.h b/drivers/staging/vme/devices/vme_user.h index a6cb75686fa4..19ecb05781cc 100644 --- a/drivers/staging/vme/devices/vme_user.h +++ b/drivers/staging/vme/devices/vme_user.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _VME_USER_H_ | 2 | #ifndef _VME_USER_H_ |
| 2 | #define _VME_USER_H_ | 3 | #define _VME_USER_H_ |
| 3 | 4 | ||
diff --git a/drivers/staging/vt6655/Makefile b/drivers/staging/vt6655/Makefile index d55c3baade53..a151f30fc46f 100644 --- a/drivers/staging/vt6655/Makefile +++ b/drivers/staging/vt6655/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # TODO: all of these should be removed | 2 | # TODO: all of these should be removed |
| 2 | ccflags-y := -DLINUX -D__KERNEL__ -D__NO_VERSION__ | 3 | ccflags-y := -DLINUX -D__KERNEL__ -D__NO_VERSION__ |
| 3 | ccflags-y += -DHOSTAP | 4 | ccflags-y += -DHOSTAP |
diff --git a/drivers/staging/vt6656/Makefile b/drivers/staging/vt6656/Makefile index 3dbe1f89dd25..b64c0d87f612 100644 --- a/drivers/staging/vt6656/Makefile +++ b/drivers/staging/vt6656/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # TODO: all of these should be removed | 2 | # TODO: all of these should be removed |
| 2 | ccflags-y := -DLINUX -D__KERNEL__ -DEXPORT_SYMTAB -D__NO_VERSION__ | 3 | ccflags-y := -DLINUX -D__KERNEL__ -DEXPORT_SYMTAB -D__NO_VERSION__ |
| 3 | ccflags-y += -DHOSTAP | 4 | ccflags-y += -DHOSTAP |
diff --git a/drivers/staging/wilc1000/Makefile b/drivers/staging/wilc1000/Makefile index d22628314305..ee7e26b886a5 100644 --- a/drivers/staging/wilc1000/Makefile +++ b/drivers/staging/wilc1000/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_WILC1000) += wilc1000.o | 2 | obj-$(CONFIG_WILC1000) += wilc1000.o |
| 2 | 3 | ||
| 3 | ccflags-y += -DFIRMWARE_1002=\"atmel/wilc1002_firmware.bin\" \ | 4 | ccflags-y += -DFIRMWARE_1002=\"atmel/wilc1002_firmware.bin\" \ |
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index 622994795222..8cf886d32afb 100644 --- a/drivers/staging/wilc1000/coreconfigurator.c +++ b/drivers/staging/wilc1000/coreconfigurator.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "coreconfigurator.h" | 2 | #include "coreconfigurator.h" |
| 2 | #include "wilc_wlan_if.h" | 3 | #include "wilc_wlan_if.h" |
| 3 | #include "wilc_wlan.h" | 4 | #include "wilc_wlan.h" |
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h index 5256f40524bf..3f5da8c58815 100644 --- a/drivers/staging/wilc1000/coreconfigurator.h +++ b/drivers/staging/wilc1000/coreconfigurator.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | /*! | 3 | /*! |
| 3 | * @file coreconfigurator.h | 4 | * @file coreconfigurator.h |
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 7b620658ec38..421168b9a9ca 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/slab.h> | 2 | #include <linux/slab.h> |
| 2 | #include <linux/time.h> | 3 | #include <linux/time.h> |
| 3 | #include <linux/kthread.h> | 4 | #include <linux/kthread.h> |
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 1ce5ead318c7..44a2f4b595c5 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef HOST_INT_H | 2 | #ifndef HOST_INT_H |
| 2 | #define HOST_INT_H | 3 | #define HOST_INT_H |
| 3 | #include <linux/ieee80211.h> | 4 | #include <linux/ieee80211.h> |
diff --git a/drivers/staging/wilc1000/linux_mon.c b/drivers/staging/wilc1000/linux_mon.c index 01efa80b4f88..91d49c4738dc 100644 --- a/drivers/staging/wilc1000/linux_mon.c +++ b/drivers/staging/wilc1000/linux_mon.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /*! | 2 | /*! |
| 2 | * @file linux_mon.c | 3 | * @file linux_mon.c |
| 3 | * @brief File Operations OS wrapper functionality | 4 | * @brief File Operations OS wrapper functionality |
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index ac5aaafa461c..af12925a9d2b 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "wilc_wfi_cfgoperations.h" | 2 | #include "wilc_wfi_cfgoperations.h" |
| 2 | #include "host_interface.h" | 3 | #include "host_interface.h" |
| 3 | #include <linux/errno.h> | 4 | #include <linux/errno.h> |
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h index 85a3810d7bb5..dfb7ec272935 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /*! | 2 | /*! |
| 2 | * @file wilc_wfi_cfgoperations.h | 3 | * @file wilc_wfi_cfgoperations.h |
| 3 | * @brief Definitions for the network module | 4 | * @brief Definitions for the network module |
diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h index 7a36561a599e..e6f4d84971c3 100644 --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /*! | 2 | /*! |
| 2 | * @file wilc_wfi_netdevice.h | 3 | * @file wilc_wfi_netdevice.h |
| 3 | * @brief Definitions for the network module | 4 | * @brief Definitions for the network module |
diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h index 7a5eba9b5f47..da7173105497 100644 --- a/drivers/staging/wilc1000/wilc_wlan.h +++ b/drivers/staging/wilc1000/wilc_wlan.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef WILC_WLAN_H | 2 | #ifndef WILC_WLAN_H |
| 2 | #define WILC_WLAN_H | 3 | #define WILC_WLAN_H |
| 3 | 4 | ||
diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c b/drivers/staging/wilc1000/wilc_wlan_cfg.c index d3e5b1b302f4..19e4f85fdd27 100644 --- a/drivers/staging/wilc1000/wilc_wlan_cfg.c +++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* ////////////////////////////////////////////////////////////////////////// */ | 2 | /* ////////////////////////////////////////////////////////////////////////// */ |
| 2 | /* */ | 3 | /* */ |
| 3 | /* Copyright (c) Atmel Corporation. All rights reserved. */ | 4 | /* Copyright (c) Atmel Corporation. All rights reserved. */ |
diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.h b/drivers/staging/wilc1000/wilc_wlan_cfg.h index b8641a273547..08092a551840 100644 --- a/drivers/staging/wilc1000/wilc_wlan_cfg.h +++ b/drivers/staging/wilc1000/wilc_wlan_cfg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* ////////////////////////////////////////////////////////////////////////// */ | 2 | /* ////////////////////////////////////////////////////////////////////////// */ |
| 2 | /* */ | 3 | /* */ |
| 3 | /* Copyright (c) Atmel Corporation. All rights reserved. */ | 4 | /* Copyright (c) Atmel Corporation. All rights reserved. */ |
diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h index f4d60057a06e..c1693cfc076d 100644 --- a/drivers/staging/wilc1000/wilc_wlan_if.h +++ b/drivers/staging/wilc1000/wilc_wlan_if.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* ///////////////////////////////////////////////////////////////////////// */ | 2 | /* ///////////////////////////////////////////////////////////////////////// */ |
| 2 | /* */ | 3 | /* */ |
| 3 | /* Copyright (c) Atmel Corporation. All rights reserved. */ | 4 | /* Copyright (c) Atmel Corporation. All rights reserved. */ |
diff --git a/drivers/staging/wlan-ng/Makefile b/drivers/staging/wlan-ng/Makefile index 32b69f238c69..1d24b0f86eee 100644 --- a/drivers/staging/wlan-ng/Makefile +++ b/drivers/staging/wlan-ng/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_PRISM2_USB) += prism2_usb.o | 2 | obj-$(CONFIG_PRISM2_USB) += prism2_usb.o |
| 2 | 3 | ||
| 3 | prism2_usb-y := prism2usb.o \ | 4 | prism2_usb-y := prism2usb.o \ |
diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c index 178f6f5d4613..42912257e2b9 100644 --- a/drivers/staging/wlan-ng/cfg80211.c +++ b/drivers/staging/wlan-ng/cfg80211.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* cfg80211 Interface for prism2_usb module */ | 2 | /* cfg80211 Interface for prism2_usb module */ |
| 2 | #include "hfa384x.h" | 3 | #include "hfa384x.h" |
| 3 | #include "prism2mgmt.h" | 4 | #include "prism2mgmt.h" |
diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c index bfb6b0a6528d..b5ba176004c1 100644 --- a/drivers/staging/wlan-ng/prism2usb.c +++ b/drivers/staging/wlan-ng/prism2usb.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "hfa384x_usb.c" | 2 | #include "hfa384x_usb.c" |
| 2 | #include "prism2mgmt.c" | 3 | #include "prism2mgmt.c" |
| 3 | #include "prism2mib.c" | 4 | #include "prism2mib.c" |
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index 7a80a90f229f..a3af1cbbf8ee 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _XGIFB_MAIN | 2 | #ifndef _XGIFB_MAIN |
| 2 | #define _XGIFB_MAIN | 3 | #define _XGIFB_MAIN |
| 3 | /* ------------------- Constant Definitions ------------------------- */ | 4 | /* ------------------- Constant Definitions ------------------------- */ |
diff --git a/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h index af50362395d5..982c676c16c6 100644 --- a/drivers/staging/xgifb/XGIfb.h +++ b/drivers/staging/xgifb/XGIfb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _LINUX_XGIFB | 2 | #ifndef _LINUX_XGIFB |
| 2 | #define _LINUX_XGIFB | 3 | #define _LINUX_XGIFB |
| 3 | #include "vgatypes.h" | 4 | #include "vgatypes.h" |
diff --git a/drivers/staging/xgifb/vb_def.h b/drivers/staging/xgifb/vb_def.h index 94e2e3c7c264..0311e2682d27 100644 --- a/drivers/staging/xgifb/vb_def.h +++ b/drivers/staging/xgifb/vb_def.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _VB_DEF_ | 2 | #ifndef _VB_DEF_ |
| 2 | #define _VB_DEF_ | 3 | #define _VB_DEF_ |
| 3 | #include "../../video/fbdev/sis/initdef.h" | 4 | #include "../../video/fbdev/sis/initdef.h" |
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index 591a3c9babf5..ac1c815a3c5e 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/delay.h> | 2 | #include <linux/delay.h> |
| 2 | #include <linux/vmalloc.h> | 3 | #include <linux/vmalloc.h> |
| 3 | 4 | ||
diff --git a/drivers/staging/xgifb/vb_init.h b/drivers/staging/xgifb/vb_init.h index e835054b87bf..2f8a70133ebd 100644 --- a/drivers/staging/xgifb/vb_init.h +++ b/drivers/staging/xgifb/vb_init.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _VBINIT_ | 2 | #ifndef _VBINIT_ |
| 2 | #define _VBINIT_ | 3 | #define _VBINIT_ |
| 3 | unsigned char XGIInitNew(struct pci_dev *pdev); | 4 | unsigned char XGIInitNew(struct pci_dev *pdev); |
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index cea128bede52..da07ca57bb40 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/delay.h> | 2 | #include <linux/delay.h> |
| 2 | #include "XGIfb.h" | 3 | #include "XGIfb.h" |
| 3 | 4 | ||
diff --git a/drivers/staging/xgifb/vb_setmode.h b/drivers/staging/xgifb/vb_setmode.h index c6317ab00474..5904ed1f2686 100644 --- a/drivers/staging/xgifb/vb_setmode.h +++ b/drivers/staging/xgifb/vb_setmode.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _VBSETMODE_ | 2 | #ifndef _VBSETMODE_ |
| 2 | #define _VBSETMODE_ | 3 | #define _VBSETMODE_ |
| 3 | 4 | ||
diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h index 2fd1a5935e1d..e256f72f6d8a 100644 --- a/drivers/staging/xgifb/vb_struct.h +++ b/drivers/staging/xgifb/vb_struct.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _VB_STRUCT_ | 2 | #ifndef _VB_STRUCT_ |
| 2 | #define _VB_STRUCT_ | 3 | #define _VB_STRUCT_ |
| 3 | #include "../../video/fbdev/sis/vstruct.h" | 4 | #include "../../video/fbdev/sis/vstruct.h" |
diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h index 31dd52c513df..0da63e1da32f 100644 --- a/drivers/staging/xgifb/vb_table.h +++ b/drivers/staging/xgifb/vb_table.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _VB_TABLE_ | 2 | #ifndef _VB_TABLE_ |
| 2 | #define _VB_TABLE_ | 3 | #define _VB_TABLE_ |
| 3 | static const struct SiS_MCLKData XGI340New_MCLKData[] = { | 4 | static const struct SiS_MCLKData XGI340New_MCLKData[] = { |
diff --git a/drivers/staging/xgifb/vb_util.h b/drivers/staging/xgifb/vb_util.h index 052694e75053..0f6d5aac04f6 100644 --- a/drivers/staging/xgifb/vb_util.h +++ b/drivers/staging/xgifb/vb_util.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _VBUTIL_ | 2 | #ifndef _VBUTIL_ |
| 2 | #define _VBUTIL_ | 3 | #define _VBUTIL_ |
| 3 | static inline void xgifb_reg_set(unsigned long port, u8 index, u8 data) | 4 | static inline void xgifb_reg_set(unsigned long port, u8 index, u8 data) |
diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h index de80e5c108dc..22919f2368d5 100644 --- a/drivers/staging/xgifb/vgatypes.h +++ b/drivers/staging/xgifb/vgatypes.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _VGATYPES_ | 2 | #ifndef _VGATYPES_ |
| 2 | #define _VGATYPES_ | 3 | #define _VGATYPES_ |
| 3 | 4 | ||
diff --git a/drivers/target/Makefile b/drivers/target/Makefile index e619c0266a79..45634747377e 100644 --- a/drivers/target/Makefile +++ b/drivers/target/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | target_core_mod-y := target_core_configfs.o \ | 3 | target_core_mod-y := target_core_configfs.o \ |
| 3 | target_core_device.o \ | 4 | target_core_device.o \ |
diff --git a/drivers/target/iscsi/Makefile b/drivers/target/iscsi/Makefile index 0f18295e05bc..8c9ae96b760d 100644 --- a/drivers/target/iscsi/Makefile +++ b/drivers/target/iscsi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | iscsi_target_mod-y += iscsi_target_parameters.o \ | 2 | iscsi_target_mod-y += iscsi_target_parameters.o \ |
| 2 | iscsi_target_seq_pdu_list.o \ | 3 | iscsi_target_seq_pdu_list.o \ |
| 3 | iscsi_target_auth.o \ | 4 | iscsi_target_auth.o \ |
diff --git a/drivers/target/iscsi/cxgbit/Makefile b/drivers/target/iscsi/cxgbit/Makefile index 4893ec29b6b3..d16aaae7ba2a 100644 --- a/drivers/target/iscsi/cxgbit/Makefile +++ b/drivers/target/iscsi/cxgbit/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4 | 2 | ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4 |
| 2 | ccflags-y += -Idrivers/net/ethernet/chelsio/libcxgb | 3 | ccflags-y += -Idrivers/net/ethernet/chelsio/libcxgb |
| 3 | ccflags-y += -Idrivers/target/iscsi | 4 | ccflags-y += -Idrivers/target/iscsi |
diff --git a/drivers/target/iscsi/iscsi_target.h b/drivers/target/iscsi/iscsi_target.h index e0db2ceb0f87..42de1843aa40 100644 --- a/drivers/target/iscsi/iscsi_target.h +++ b/drivers/target/iscsi/iscsi_target.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ISCSI_TARGET_H | 2 | #ifndef ISCSI_TARGET_H |
| 2 | #define ISCSI_TARGET_H | 3 | #define ISCSI_TARGET_H |
| 3 | 4 | ||
diff --git a/drivers/target/iscsi/iscsi_target_auth.h b/drivers/target/iscsi/iscsi_target_auth.h index 1b91c13cc965..d5600ac30b53 100644 --- a/drivers/target/iscsi/iscsi_target_auth.h +++ b/drivers/target/iscsi/iscsi_target_auth.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _ISCSI_CHAP_H_ | 2 | #ifndef _ISCSI_CHAP_H_ |
| 2 | #define _ISCSI_CHAP_H_ | 3 | #define _ISCSI_CHAP_H_ |
| 3 | 4 | ||
diff --git a/drivers/target/iscsi/iscsi_target_datain_values.h b/drivers/target/iscsi/iscsi_target_datain_values.h index 16edeeeb7777..a420fbd37969 100644 --- a/drivers/target/iscsi/iscsi_target_datain_values.h +++ b/drivers/target/iscsi/iscsi_target_datain_values.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ISCSI_TARGET_DATAIN_VALUES_H | 2 | #ifndef ISCSI_TARGET_DATAIN_VALUES_H |
| 2 | #define ISCSI_TARGET_DATAIN_VALUES_H | 3 | #define ISCSI_TARGET_DATAIN_VALUES_H |
| 3 | 4 | ||
diff --git a/drivers/target/iscsi/iscsi_target_device.h b/drivers/target/iscsi/iscsi_target_device.h index 06dbff5cd520..ab2166f17785 100644 --- a/drivers/target/iscsi/iscsi_target_device.h +++ b/drivers/target/iscsi/iscsi_target_device.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ISCSI_TARGET_DEVICE_H | 2 | #ifndef ISCSI_TARGET_DEVICE_H |
| 2 | #define ISCSI_TARGET_DEVICE_H | 3 | #define ISCSI_TARGET_DEVICE_H |
| 3 | 4 | ||
diff --git a/drivers/target/iscsi/iscsi_target_erl0.h b/drivers/target/iscsi/iscsi_target_erl0.h index 3822d9cd1230..3393407bc4e4 100644 --- a/drivers/target/iscsi/iscsi_target_erl0.h +++ b/drivers/target/iscsi/iscsi_target_erl0.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ISCSI_TARGET_ERL0_H | 2 | #ifndef ISCSI_TARGET_ERL0_H |
| 2 | #define ISCSI_TARGET_ERL0_H | 3 | #define ISCSI_TARGET_ERL0_H |
| 3 | 4 | ||
diff --git a/drivers/target/iscsi/iscsi_target_erl1.h b/drivers/target/iscsi/iscsi_target_erl1.h index 54d36bd25bea..5f66b265b25b 100644 --- a/drivers/target/iscsi/iscsi_target_erl1.h +++ b/drivers/target/iscsi/iscsi_target_erl1.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ISCSI_TARGET_ERL1_H | 2 | #ifndef ISCSI_TARGET_ERL1_H |
| 2 | #define ISCSI_TARGET_ERL1_H | 3 | #define ISCSI_TARGET_ERL1_H |
| 3 | 4 | ||
diff --git a/drivers/target/iscsi/iscsi_target_erl2.h b/drivers/target/iscsi/iscsi_target_erl2.h index 634d01e13652..93e180d68d07 100644 --- a/drivers/target/iscsi/iscsi_target_erl2.h +++ b/drivers/target/iscsi/iscsi_target_erl2.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ISCSI_TARGET_ERL2_H | 2 | #ifndef ISCSI_TARGET_ERL2_H |
| 2 | #define ISCSI_TARGET_ERL2_H | 3 | #define ISCSI_TARGET_ERL2_H |
| 3 | 4 | ||
diff --git a/drivers/target/iscsi/iscsi_target_login.h b/drivers/target/iscsi/iscsi_target_login.h index 0e1fd6cedd54..c2495e03625c 100644 --- a/drivers/target/iscsi/iscsi_target_login.h +++ b/drivers/target/iscsi/iscsi_target_login.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ISCSI_TARGET_LOGIN_H | 2 | #ifndef ISCSI_TARGET_LOGIN_H |
| 2 | #define ISCSI_TARGET_LOGIN_H | 3 | #define ISCSI_TARGET_LOGIN_H |
| 3 | 4 | ||
diff --git a/drivers/target/iscsi/iscsi_target_nego.h b/drivers/target/iscsi/iscsi_target_nego.h index 53438bfca4c6..835e1b769b3f 100644 --- a/drivers/target/iscsi/iscsi_target_nego.h +++ b/drivers/target/iscsi/iscsi_target_nego.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ISCSI_TARGET_NEGO_H | 2 | #ifndef ISCSI_TARGET_NEGO_H |
| 2 | #define ISCSI_TARGET_NEGO_H | 3 | #define ISCSI_TARGET_NEGO_H |
| 3 | 4 | ||
diff --git a/drivers/target/iscsi/iscsi_target_nodeattrib.h b/drivers/target/iscsi/iscsi_target_nodeattrib.h index 79cdf06ade48..ce074cb54579 100644 --- a/drivers/target/iscsi/iscsi_target_nodeattrib.h +++ b/drivers/target/iscsi/iscsi_target_nodeattrib.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ISCSI_TARGET_NODEATTRIB_H | 2 | #ifndef ISCSI_TARGET_NODEATTRIB_H |
| 2 | #define ISCSI_TARGET_NODEATTRIB_H | 3 | #define ISCSI_TARGET_NODEATTRIB_H |
| 3 | 4 | ||
diff --git a/drivers/target/iscsi/iscsi_target_parameters.h b/drivers/target/iscsi/iscsi_target_parameters.h index c47b73f57528..daf47f38e081 100644 --- a/drivers/target/iscsi/iscsi_target_parameters.h +++ b/drivers/target/iscsi/iscsi_target_parameters.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ISCSI_PARAMETERS_H | 2 | #ifndef ISCSI_PARAMETERS_H |
| 2 | #define ISCSI_PARAMETERS_H | 3 | #define ISCSI_PARAMETERS_H |
| 3 | 4 | ||
diff --git a/drivers/target/iscsi/iscsi_target_seq_pdu_list.h b/drivers/target/iscsi/iscsi_target_seq_pdu_list.h index be1234362271..5a0907027973 100644 --- a/drivers/target/iscsi/iscsi_target_seq_pdu_list.h +++ b/drivers/target/iscsi/iscsi_target_seq_pdu_list.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ISCSI_SEQ_AND_PDU_LIST_H | 2 | #ifndef ISCSI_SEQ_AND_PDU_LIST_H |
| 2 | #define ISCSI_SEQ_AND_PDU_LIST_H | 3 | #define ISCSI_SEQ_AND_PDU_LIST_H |
| 3 | 4 | ||
diff --git a/drivers/target/iscsi/iscsi_target_tmr.h b/drivers/target/iscsi/iscsi_target_tmr.h index 64cc5c07e47c..301f0936bd8e 100644 --- a/drivers/target/iscsi/iscsi_target_tmr.h +++ b/drivers/target/iscsi/iscsi_target_tmr.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ISCSI_TARGET_TMR_H | 2 | #ifndef ISCSI_TARGET_TMR_H |
| 2 | #define ISCSI_TARGET_TMR_H | 3 | #define ISCSI_TARGET_TMR_H |
| 3 | 4 | ||
diff --git a/drivers/target/iscsi/iscsi_target_tpg.h b/drivers/target/iscsi/iscsi_target_tpg.h index 59fd3cabe89d..88576f5d0ca4 100644 --- a/drivers/target/iscsi/iscsi_target_tpg.h +++ b/drivers/target/iscsi/iscsi_target_tpg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ISCSI_TARGET_TPG_H | 2 | #ifndef ISCSI_TARGET_TPG_H |
| 2 | #define ISCSI_TARGET_TPG_H | 3 | #define ISCSI_TARGET_TPG_H |
| 3 | 4 | ||
diff --git a/drivers/target/iscsi/iscsi_target_transport.c b/drivers/target/iscsi/iscsi_target_transport.c index c4eb141c6435..036940518bfe 100644 --- a/drivers/target/iscsi/iscsi_target_transport.c +++ b/drivers/target/iscsi/iscsi_target_transport.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/spinlock.h> | 2 | #include <linux/spinlock.h> |
| 2 | #include <linux/list.h> | 3 | #include <linux/list.h> |
| 3 | #include <linux/module.h> | 4 | #include <linux/module.h> |
diff --git a/drivers/target/iscsi/iscsi_target_util.h b/drivers/target/iscsi/iscsi_target_util.h index 425160565d0c..5e053d61c0c5 100644 --- a/drivers/target/iscsi/iscsi_target_util.h +++ b/drivers/target/iscsi/iscsi_target_util.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef ISCSI_TARGET_UTIL_H | 2 | #ifndef ISCSI_TARGET_UTIL_H |
| 2 | #define ISCSI_TARGET_UTIL_H | 3 | #define ISCSI_TARGET_UTIL_H |
| 3 | 4 | ||
diff --git a/drivers/target/loopback/tcm_loop.h b/drivers/target/loopback/tcm_loop.h index 3acc43c05117..d3110909a213 100644 --- a/drivers/target/loopback/tcm_loop.h +++ b/drivers/target/loopback/tcm_loop.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/types.h> | 2 | #include <linux/types.h> |
| 2 | #include <linux/device.h> | 3 | #include <linux/device.h> |
| 3 | #include <target/target_core_base.h> /* struct se_cmd */ | 4 | #include <target/target_core_base.h> /* struct se_cmd */ |
diff --git a/drivers/target/sbp/sbp_target.h b/drivers/target/sbp/sbp_target.h index 73bcb1208832..1d101ac86527 100644 --- a/drivers/target/sbp/sbp_target.h +++ b/drivers/target/sbp/sbp_target.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _SBP_BASE_H | 2 | #ifndef _SBP_BASE_H |
| 2 | #define _SBP_BASE_H | 3 | #define _SBP_BASE_H |
| 3 | 4 | ||
diff --git a/drivers/target/target_core_alua.h b/drivers/target/target_core_alua.h index c69c11baf07f..1902cb5c3b52 100644 --- a/drivers/target/target_core_alua.h +++ b/drivers/target/target_core_alua.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef TARGET_CORE_ALUA_H | 2 | #ifndef TARGET_CORE_ALUA_H |
| 2 | #define TARGET_CORE_ALUA_H | 3 | #define TARGET_CORE_ALUA_H |
| 3 | 4 | ||
diff --git a/drivers/target/target_core_file.h b/drivers/target/target_core_file.h index 526595a072de..53be5ffd3261 100644 --- a/drivers/target/target_core_file.h +++ b/drivers/target/target_core_file.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef TARGET_CORE_FILE_H | 2 | #ifndef TARGET_CORE_FILE_H |
| 2 | #define TARGET_CORE_FILE_H | 3 | #define TARGET_CORE_FILE_H |
| 3 | 4 | ||
diff --git a/drivers/target/target_core_iblock.h b/drivers/target/target_core_iblock.h index f2a5797217d4..b4aeb2584ad4 100644 --- a/drivers/target/target_core_iblock.h +++ b/drivers/target/target_core_iblock.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef TARGET_CORE_IBLOCK_H | 2 | #ifndef TARGET_CORE_IBLOCK_H |
| 2 | #define TARGET_CORE_IBLOCK_H | 3 | #define TARGET_CORE_IBLOCK_H |
| 3 | 4 | ||
diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h index f30e8ac13386..18e3eb16e756 100644 --- a/drivers/target/target_core_internal.h +++ b/drivers/target/target_core_internal.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef TARGET_CORE_INTERNAL_H | 2 | #ifndef TARGET_CORE_INTERNAL_H |
| 2 | #define TARGET_CORE_INTERNAL_H | 3 | #define TARGET_CORE_INTERNAL_H |
| 3 | 4 | ||
diff --git a/drivers/target/target_core_pr.h b/drivers/target/target_core_pr.h index 772f9148e75c..198fad5c89dc 100644 --- a/drivers/target/target_core_pr.h +++ b/drivers/target/target_core_pr.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef TARGET_CORE_PR_H | 2 | #ifndef TARGET_CORE_PR_H |
| 2 | #define TARGET_CORE_PR_H | 3 | #define TARGET_CORE_PR_H |
| 3 | 4 | ||
diff --git a/drivers/target/target_core_pscsi.h b/drivers/target/target_core_pscsi.h index b86fb0e1b783..e8458b5e85c9 100644 --- a/drivers/target/target_core_pscsi.h +++ b/drivers/target/target_core_pscsi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef TARGET_CORE_PSCSI_H | 2 | #ifndef TARGET_CORE_PSCSI_H |
| 2 | #define TARGET_CORE_PSCSI_H | 3 | #define TARGET_CORE_PSCSI_H |
| 3 | 4 | ||
diff --git a/drivers/target/target_core_rd.h b/drivers/target/target_core_rd.h index 91fc1a34791d..8b88f9b14c3f 100644 --- a/drivers/target/target_core_rd.h +++ b/drivers/target/target_core_rd.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef TARGET_CORE_RD_H | 2 | #ifndef TARGET_CORE_RD_H |
| 2 | #define TARGET_CORE_RD_H | 3 | #define TARGET_CORE_RD_H |
| 3 | 4 | ||
diff --git a/drivers/target/target_core_ua.h b/drivers/target/target_core_ua.h index 97402856a8f0..b0f4205a96cd 100644 --- a/drivers/target/target_core_ua.h +++ b/drivers/target/target_core_ua.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef TARGET_CORE_UA_H | 2 | #ifndef TARGET_CORE_UA_H |
| 2 | #define TARGET_CORE_UA_H | 3 | #define TARGET_CORE_UA_H |
| 3 | 4 | ||
diff --git a/drivers/target/target_core_xcopy.h b/drivers/target/target_core_xcopy.h index 7c0b105cbe1b..26ba4c3c9cff 100644 --- a/drivers/target/target_core_xcopy.h +++ b/drivers/target/target_core_xcopy.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <target/target_core_base.h> | 2 | #include <target/target_core_base.h> |
| 2 | 3 | ||
| 3 | #define XCOPY_HDR_LEN 16 | 4 | #define XCOPY_HDR_LEN 16 |
diff --git a/drivers/target/tcm_fc/Makefile b/drivers/target/tcm_fc/Makefile index 20b14bb087c9..a7d1593ab5af 100644 --- a/drivers/target/tcm_fc/Makefile +++ b/drivers/target/tcm_fc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | tcm_fc-y += tfc_cmd.o \ | 2 | tcm_fc-y += tfc_cmd.o \ |
| 2 | tfc_conf.o \ | 3 | tfc_conf.o \ |
| 3 | tfc_io.o \ | 4 | tfc_io.o \ |
diff --git a/drivers/tee/Makefile b/drivers/tee/Makefile index 7a4e4a1ac39c..21f51fd88b07 100644 --- a/drivers/tee/Makefile +++ b/drivers/tee/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_TEE) += tee.o | 2 | obj-$(CONFIG_TEE) += tee.o |
| 2 | tee-objs += tee_core.o | 3 | tee-objs += tee_core.o |
| 3 | tee-objs += tee_shm.o | 4 | tee-objs += tee_shm.o |
diff --git a/drivers/tee/optee/Makefile b/drivers/tee/optee/Makefile index 92fe5789bcce..d526fb88d9c5 100644 --- a/drivers/tee/optee/Makefile +++ b/drivers/tee/optee/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_OPTEE) += optee.o | 2 | obj-$(CONFIG_OPTEE) += optee.o |
| 2 | optee-objs += core.o | 3 | optee-objs += core.o |
| 3 | optee-objs += call.o | 4 | optee-objs += call.o |
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 8b79bca23536..195cd08fbc30 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for sensor chip drivers. | 3 | # Makefile for sensor chip drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/thermal/int340x_thermal/Makefile b/drivers/thermal/int340x_thermal/Makefile index df0df055e7ff..287eb0a1476d 100644 --- a/drivers/thermal/int340x_thermal/Makefile +++ b/drivers/thermal/int340x_thermal/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_INT340X_THERMAL) += int3400_thermal.o | 2 | obj-$(CONFIG_INT340X_THERMAL) += int3400_thermal.o |
| 2 | obj-$(CONFIG_INT340X_THERMAL) += int340x_thermal_zone.o | 3 | obj-$(CONFIG_INT340X_THERMAL) += int340x_thermal_zone.o |
| 3 | obj-$(CONFIG_INT340X_THERMAL) += int3402_thermal.o | 4 | obj-$(CONFIG_INT340X_THERMAL) += int3402_thermal.o |
diff --git a/drivers/thermal/int340x_thermal/acpi_thermal_rel.h b/drivers/thermal/int340x_thermal/acpi_thermal_rel.h index 65075b174329..58822575fd54 100644 --- a/drivers/thermal/int340x_thermal/acpi_thermal_rel.h +++ b/drivers/thermal/int340x_thermal/acpi_thermal_rel.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __ACPI_ACPI_THERMAL_H | 2 | #ifndef __ACPI_ACPI_THERMAL_H |
| 2 | #define __ACPI_ACPI_THERMAL_H | 3 | #define __ACPI_ACPI_THERMAL_H |
| 3 | 4 | ||
diff --git a/drivers/thermal/tegra/Makefile b/drivers/thermal/tegra/Makefile index 1ce1af2cf0f5..8a3f221f17c1 100644 --- a/drivers/thermal/tegra/Makefile +++ b/drivers/thermal/tegra/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_TEGRA_SOCTHERM) += tegra-soctherm.o | 2 | obj-$(CONFIG_TEGRA_SOCTHERM) += tegra-soctherm.o |
| 2 | 3 | ||
| 3 | tegra-soctherm-y := soctherm.o soctherm-fuse.o | 4 | tegra-soctherm-y := soctherm.o soctherm-fuse.o |
diff --git a/drivers/thermal/ti-soc-thermal/Makefile b/drivers/thermal/ti-soc-thermal/Makefile index 0f89bdf03790..f180ebead858 100644 --- a/drivers/thermal/ti-soc-thermal/Makefile +++ b/drivers/thermal/ti-soc-thermal/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal.o | 2 | obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal.o |
| 2 | ti-soc-thermal-y := ti-bandgap.o | 3 | ti-soc-thermal-y := ti-bandgap.o |
| 3 | ti-soc-thermal-$(CONFIG_TI_THERMAL) += ti-thermal-common.o | 4 | ti-soc-thermal-$(CONFIG_TI_THERMAL) += ti-thermal-common.o |
diff --git a/drivers/thunderbolt/cap.c b/drivers/thunderbolt/cap.c index 38bc27a5ce4f..c2277b8ee88d 100644 --- a/drivers/thunderbolt/cap.c +++ b/drivers/thunderbolt/cap.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Thunderbolt Cactus Ridge driver - capabilities lookup | 3 | * Thunderbolt Cactus Ridge driver - capabilities lookup |
| 3 | * | 4 | * |
diff --git a/drivers/thunderbolt/ctl.c b/drivers/thunderbolt/ctl.c index fb40dd0588b9..423ae231fc6c 100644 --- a/drivers/thunderbolt/ctl.c +++ b/drivers/thunderbolt/ctl.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Thunderbolt Cactus Ridge driver - control channel and configuration commands | 3 | * Thunderbolt Cactus Ridge driver - control channel and configuration commands |
| 3 | * | 4 | * |
diff --git a/drivers/thunderbolt/ctl.h b/drivers/thunderbolt/ctl.h index 36fd28b1c1c5..dd34f627ce49 100644 --- a/drivers/thunderbolt/ctl.h +++ b/drivers/thunderbolt/ctl.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Thunderbolt Cactus Ridge driver - control channel and configuration commands | 3 | * Thunderbolt Cactus Ridge driver - control channel and configuration commands |
| 3 | * | 4 | * |
diff --git a/drivers/thunderbolt/eeprom.c b/drivers/thunderbolt/eeprom.c index fe2f00ceafc5..3e8caf22c294 100644 --- a/drivers/thunderbolt/eeprom.c +++ b/drivers/thunderbolt/eeprom.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Thunderbolt Cactus Ridge driver - eeprom access | 3 | * Thunderbolt Cactus Ridge driver - eeprom access |
| 3 | * | 4 | * |
diff --git a/drivers/thunderbolt/nhi.h b/drivers/thunderbolt/nhi.h index 5b5bb2c436be..1c7e6b92e235 100644 --- a/drivers/thunderbolt/nhi.h +++ b/drivers/thunderbolt/nhi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Thunderbolt Cactus Ridge driver - NHI driver | 3 | * Thunderbolt Cactus Ridge driver - NHI driver |
| 3 | * | 4 | * |
diff --git a/drivers/thunderbolt/nhi_regs.h b/drivers/thunderbolt/nhi_regs.h index 09ed574e92ff..752ec04305f3 100644 --- a/drivers/thunderbolt/nhi_regs.h +++ b/drivers/thunderbolt/nhi_regs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Thunderbolt driver - NHI registers | 3 | * Thunderbolt driver - NHI registers |
| 3 | * | 4 | * |
diff --git a/drivers/thunderbolt/path.c b/drivers/thunderbolt/path.c index 9562cd026dc0..ff49ad880bfd 100644 --- a/drivers/thunderbolt/path.c +++ b/drivers/thunderbolt/path.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Thunderbolt Cactus Ridge driver - path/tunnel functionality | 3 | * Thunderbolt Cactus Ridge driver - path/tunnel functionality |
| 3 | * | 4 | * |
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c index 53f40c57df59..3953d17202a8 100644 --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Thunderbolt Cactus Ridge driver - switch/port utility functions | 3 | * Thunderbolt Cactus Ridge driver - switch/port utility functions |
| 3 | * | 4 | * |
diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c index 0b22ad9d68b4..d674e06767a5 100644 --- a/drivers/thunderbolt/tb.c +++ b/drivers/thunderbolt/tb.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Thunderbolt Cactus Ridge driver - bus logic (NHI independent) | 3 | * Thunderbolt Cactus Ridge driver - bus logic (NHI independent) |
| 3 | * | 4 | * |
diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h index e0deee4f1eb0..d7ffc159bcf7 100644 --- a/drivers/thunderbolt/tb.h +++ b/drivers/thunderbolt/tb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Thunderbolt Cactus Ridge driver - bus logic (NHI independent) | 3 | * Thunderbolt Cactus Ridge driver - bus logic (NHI independent) |
| 3 | * | 4 | * |
diff --git a/drivers/thunderbolt/tb_regs.h b/drivers/thunderbolt/tb_regs.h index 582bd1f156dc..5d94142afda6 100644 --- a/drivers/thunderbolt/tb_regs.h +++ b/drivers/thunderbolt/tb_regs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Thunderbolt Cactus Ridge driver - Port/Switch config area registers | 3 | * Thunderbolt Cactus Ridge driver - Port/Switch config area registers |
| 3 | * | 4 | * |
diff --git a/drivers/thunderbolt/tunnel_pci.c b/drivers/thunderbolt/tunnel_pci.c index ca4475907d7a..0637537ea53f 100644 --- a/drivers/thunderbolt/tunnel_pci.c +++ b/drivers/thunderbolt/tunnel_pci.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Thunderbolt Cactus Ridge driver - PCIe tunnel | 3 | * Thunderbolt Cactus Ridge driver - PCIe tunnel |
| 3 | * | 4 | * |
diff --git a/drivers/thunderbolt/tunnel_pci.h b/drivers/thunderbolt/tunnel_pci.h index a67f93c140fa..f9b65fa1fd4d 100644 --- a/drivers/thunderbolt/tunnel_pci.h +++ b/drivers/thunderbolt/tunnel_pci.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Thunderbolt Cactus Ridge driver - PCIe tunnel | 3 | * Thunderbolt Cactus Ridge driver - PCIe tunnel |
| 3 | * | 4 | * |
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile index 16330a819685..8ce3a8661b31 100644 --- a/drivers/tty/Makefile +++ b/drivers/tty/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_TTY) += tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o \ | 2 | obj-$(CONFIG_TTY) += tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o \ |
| 2 | tty_buffer.o tty_port.o tty_mutex.o \ | 3 | tty_buffer.o tty_port.o tty_mutex.o \ |
| 3 | tty_ldsem.o tty_baudrate.o tty_jobctrl.o \ | 4 | tty_ldsem.o tty_baudrate.o tty_jobctrl.o \ |
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile index 6a2702be76d1..0b02ec7f1dfd 100644 --- a/drivers/tty/hvc/Makefile +++ b/drivers/tty/hvc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi_lib.o | 2 | obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi_lib.o |
| 2 | obj-$(CONFIG_HVC_OPAL) += hvc_opal.o hvsi_lib.o | 3 | obj-$(CONFIG_HVC_OPAL) += hvc_opal.o hvsi_lib.o |
| 3 | obj-$(CONFIG_HVC_OLD_HVSI) += hvsi.o | 4 | obj-$(CONFIG_HVC_OLD_HVSI) += hvsi.o |
diff --git a/drivers/tty/hvc/hvc_irq.c b/drivers/tty/hvc/hvc_irq.c index bc7a96874637..4b255dfef2cc 100644 --- a/drivers/tty/hvc/hvc_irq.c +++ b/drivers/tty/hvc/hvc_irq.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright IBM Corp. 2001,2008 | 3 | * Copyright IBM Corp. 2001,2008 |
| 3 | * | 4 | * |
diff --git a/drivers/tty/hvc/hvc_iucv.c b/drivers/tty/hvc/hvc_iucv.c index 8b70a1627356..a74680729825 100644 --- a/drivers/tty/hvc/hvc_iucv.c +++ b/drivers/tty/hvc/hvc_iucv.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * z/VM IUCV hypervisor console (HVC) device driver | 3 | * z/VM IUCV hypervisor console (HVC) device driver |
| 3 | * | 4 | * |
diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c index a270f04588d7..09289c8154ae 100644 --- a/drivers/tty/hvc/hvsi_lib.c +++ b/drivers/tty/hvc/hvsi_lib.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/types.h> | 2 | #include <linux/types.h> |
| 2 | #include <linux/delay.h> | 3 | #include <linux/delay.h> |
| 3 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
diff --git a/drivers/tty/ipwireless/hardware.c b/drivers/tty/ipwireless/hardware.c index df0204b6148f..a6b8240af6cd 100644 --- a/drivers/tty/ipwireless/hardware.c +++ b/drivers/tty/ipwireless/hardware.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * IPWireless 3G PCMCIA Network Driver | 3 | * IPWireless 3G PCMCIA Network Driver |
| 3 | * | 4 | * |
diff --git a/drivers/tty/ipwireless/hardware.h b/drivers/tty/ipwireless/hardware.h index 90a8590e43b0..e524a8fcc2ad 100644 --- a/drivers/tty/ipwireless/hardware.h +++ b/drivers/tty/ipwireless/hardware.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * IPWireless 3G PCMCIA Network Driver | 3 | * IPWireless 3G PCMCIA Network Driver |
| 3 | * | 4 | * |
diff --git a/drivers/tty/ipwireless/main.h b/drivers/tty/ipwireless/main.h index f2cbb116bccb..73818bb64416 100644 --- a/drivers/tty/ipwireless/main.h +++ b/drivers/tty/ipwireless/main.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * IPWireless 3G PCMCIA Network Driver | 3 | * IPWireless 3G PCMCIA Network Driver |
| 3 | * | 4 | * |
diff --git a/drivers/tty/ipwireless/network.c b/drivers/tty/ipwireless/network.c index c2f9a3263b37..695439c03147 100644 --- a/drivers/tty/ipwireless/network.c +++ b/drivers/tty/ipwireless/network.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * IPWireless 3G PCMCIA Network Driver | 3 | * IPWireless 3G PCMCIA Network Driver |
| 3 | * | 4 | * |
diff --git a/drivers/tty/ipwireless/network.h b/drivers/tty/ipwireless/network.h index 561f765b3334..784932a59a73 100644 --- a/drivers/tty/ipwireless/network.h +++ b/drivers/tty/ipwireless/network.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * IPWireless 3G PCMCIA Network Driver | 3 | * IPWireless 3G PCMCIA Network Driver |
| 3 | * | 4 | * |
diff --git a/drivers/tty/ipwireless/setup_protocol.h b/drivers/tty/ipwireless/setup_protocol.h index 002c34e72521..d4a7ae257ca5 100644 --- a/drivers/tty/ipwireless/setup_protocol.h +++ b/drivers/tty/ipwireless/setup_protocol.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * IPWireless 3G PCMCIA Network Driver | 3 | * IPWireless 3G PCMCIA Network Driver |
| 3 | * | 4 | * |
diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c index 2685d59d2724..1ef751c27ac6 100644 --- a/drivers/tty/ipwireless/tty.c +++ b/drivers/tty/ipwireless/tty.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * IPWireless 3G PCMCIA Network Driver | 3 | * IPWireless 3G PCMCIA Network Driver |
| 3 | * | 4 | * |
diff --git a/drivers/tty/ipwireless/tty.h b/drivers/tty/ipwireless/tty.h index 747b2d637860..ec698d9f338b 100644 --- a/drivers/tty/ipwireless/tty.h +++ b/drivers/tty/ipwireless/tty.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * IPWireless 3G PCMCIA Network Driver | 3 | * IPWireless 3G PCMCIA Network Driver |
| 3 | * | 4 | * |
diff --git a/drivers/tty/moxa.h b/drivers/tty/moxa.h index 87d16ce57be7..8ce89fd36c7b 100644 --- a/drivers/tty/moxa.h +++ b/drivers/tty/moxa.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef MOXA_H_FILE | 2 | #ifndef MOXA_H_FILE |
| 2 | #define MOXA_H_FILE | 3 | #define MOXA_H_FILE |
| 3 | 4 | ||
diff --git a/drivers/tty/mxser.h b/drivers/tty/mxser.h index 0bf794313ffd..e6cb15626567 100644 --- a/drivers/tty/mxser.h +++ b/drivers/tty/mxser.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _MXSER_H | 2 | #ifndef _MXSER_H |
| 2 | #define _MXSER_H | 3 | #define _MXSER_H |
| 3 | 4 | ||
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c index 26dcb3b60fb9..64338442050e 100644 --- a/drivers/tty/pty.c +++ b/drivers/tty/pty.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 1991, 1992 Linus Torvalds | 3 | * Copyright (C) 1991, 1992 Linus Torvalds |
| 3 | * | 4 | * |
diff --git a/drivers/tty/rocket.h b/drivers/tty/rocket.h index c11a9392f219..d0560203f215 100644 --- a/drivers/tty/rocket.h +++ b/drivers/tty/rocket.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * rocket.h --- the exported interface of the rocket driver to its configuration program. | 3 | * rocket.h --- the exported interface of the rocket driver to its configuration program. |
| 3 | * | 4 | * |
diff --git a/drivers/tty/rocket_int.h b/drivers/tty/rocket_int.h index ef1e1be6b26d..727e50dbb92f 100644 --- a/drivers/tty/rocket_int.h +++ b/drivers/tty/rocket_int.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * rocket_int.h --- internal header file for rocket.c | 3 | * rocket_int.h --- internal header file for rocket.c |
| 3 | * | 4 | * |
diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile index 6a18d2d768fe..18751bc63a84 100644 --- a/drivers/tty/serial/8250/Makefile +++ b/drivers/tty/serial/8250/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the 8250 serial device drivers. | 3 | # Makefile for the 8250 serial device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile index fe88a75d9a59..842d185d697e 100644 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel serial device drivers. | 3 | # Makefile for the kernel serial device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/tty/serial/amba-pl011.h b/drivers/tty/serial/amba-pl011.h index 411c60e1f9a4..077eb12a3472 100644 --- a/drivers/tty/serial/amba-pl011.h +++ b/drivers/tty/serial/amba-pl011.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef AMBA_PL011_H | 2 | #ifndef AMBA_PL011_H |
| 2 | #define AMBA_PL011_H | 3 | #define AMBA_PL011_H |
| 3 | 4 | ||
diff --git a/drivers/tty/serial/apbuart.h b/drivers/tty/serial/apbuart.h index 5faf87c8d2bc..81baf007694f 100644 --- a/drivers/tty/serial/apbuart.h +++ b/drivers/tty/serial/apbuart.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __GRLIB_APBUART_H__ | 2 | #ifndef __GRLIB_APBUART_H__ |
| 2 | #define __GRLIB_APBUART_H__ | 3 | #define __GRLIB_APBUART_H__ |
| 3 | 4 | ||
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h index 60c7e94cde1e..18ec0849918a 100644 --- a/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h +++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Driver for CPM (SCC/SMC) serial ports | 3 | * Driver for CPM (SCC/SMC) serial ports |
| 3 | * | 4 | * |
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h index 51e651a69938..051a8509c3e5 100644 --- a/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h +++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Driver for CPM (SCC/SMC) serial ports | 3 | * Driver for CPM (SCC/SMC) serial ports |
| 3 | * | 4 | * |
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c index 59a2a7e18b5a..1421804975e0 100644 --- a/drivers/tty/serial/crisv10.c +++ b/drivers/tty/serial/crisv10.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Serial port driver for the ETRAX 100LX chip | 3 | * Serial port driver for the ETRAX 100LX chip |
| 3 | * | 4 | * |
diff --git a/drivers/tty/serial/crisv10.h b/drivers/tty/serial/crisv10.h index 15a52ee58251..79ba2bc95d3d 100644 --- a/drivers/tty/serial/crisv10.h +++ b/drivers/tty/serial/crisv10.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * serial.h: Arch-dep definitions for the Etrax100 serial driver. | 3 | * serial.h: Arch-dep definitions for the Etrax100 serial driver. |
| 3 | * | 4 | * |
diff --git a/drivers/tty/serial/dz.h b/drivers/tty/serial/dz.h index faf169ed27b3..3b3e31954f24 100644 --- a/drivers/tty/serial/dz.h +++ b/drivers/tty/serial/dz.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * dz.h: Serial port driver for DECstations equipped | 3 | * dz.h: Serial port driver for DECstations equipped |
| 3 | * with the DZ chipset. | 4 | * with the DZ chipset. |
diff --git a/drivers/tty/serial/etraxfs-uart.c b/drivers/tty/serial/etraxfs-uart.c index 2f80bc7e44fb..24bf6bfb29b4 100644 --- a/drivers/tty/serial/etraxfs-uart.c +++ b/drivers/tty/serial/etraxfs-uart.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/module.h> | 2 | #include <linux/module.h> |
| 2 | #include <linux/init.h> | 3 | #include <linux/init.h> |
| 3 | #include <linux/console.h> | 4 | #include <linux/console.h> |
diff --git a/drivers/tty/serial/ip22zilog.h b/drivers/tty/serial/ip22zilog.h index a59a9a8341d2..b52801fe2d0d 100644 --- a/drivers/tty/serial/ip22zilog.h +++ b/drivers/tty/serial/ip22zilog.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _IP22_ZILOG_H | 2 | #ifndef _IP22_ZILOG_H |
| 2 | #define _IP22_ZILOG_H | 3 | #define _IP22_ZILOG_H |
| 3 | 4 | ||
diff --git a/drivers/tty/serial/pmac_zilog.h b/drivers/tty/serial/pmac_zilog.h index 3483242ee3e0..bb874e76810e 100644 --- a/drivers/tty/serial/pmac_zilog.h +++ b/drivers/tty/serial/pmac_zilog.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __PMAC_ZILOG_H__ | 2 | #ifndef __PMAC_ZILOG_H__ |
| 2 | #define __PMAC_ZILOG_H__ | 3 | #define __PMAC_ZILOG_H__ |
| 3 | 4 | ||
diff --git a/drivers/tty/serial/sh-sci.h b/drivers/tty/serial/sh-sci.h index 971b2ab088d8..938e23a2d166 100644 --- a/drivers/tty/serial/sh-sci.h +++ b/drivers/tty/serial/sh-sci.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/bitops.h> | 2 | #include <linux/bitops.h> |
| 2 | #include <linux/serial_core.h> | 3 | #include <linux/serial_core.h> |
| 3 | #include <linux/io.h> | 4 | #include <linux/io.h> |
diff --git a/drivers/tty/serial/sunsab.h b/drivers/tty/serial/sunsab.h index b78e1f7b8050..1644031aacda 100644 --- a/drivers/tty/serial/sunsab.h +++ b/drivers/tty/serial/sunsab.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* sunsab.h: Register Definitions for the Siemens SAB82532 DUSCC | 2 | /* sunsab.h: Register Definitions for the Siemens SAB82532 DUSCC |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
diff --git a/drivers/tty/serial/sunzilog.h b/drivers/tty/serial/sunzilog.h index 5dec7b47cc38..6d6764f0ac98 100644 --- a/drivers/tty/serial/sunzilog.h +++ b/drivers/tty/serial/sunzilog.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _SUNZILOG_H | 2 | #ifndef _SUNZILOG_H |
| 2 | #define _SUNZILOG_H | 3 | #define _SUNZILOG_H |
| 3 | 4 | ||
diff --git a/drivers/tty/serial/zs.h b/drivers/tty/serial/zs.h index aa921b57d827..26ef8eafa1c1 100644 --- a/drivers/tty/serial/zs.h +++ b/drivers/tty/serial/zs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * zs.h: Definitions for the DECstation Z85C30 serial driver. | 3 | * zs.h: Definitions for the DECstation Z85C30 serial driver. |
| 3 | * | 4 | * |
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index 3ffc1ce29023..d008f5a75197 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Linux Magic System Request Key Hacks | 3 | * Linux Magic System Request Key Hacks |
| 3 | * | 4 | * |
diff --git a/drivers/tty/tty_mutex.c b/drivers/tty/tty_mutex.c index d8bae67a6174..2640635ee177 100644 --- a/drivers/tty/tty_mutex.c +++ b/drivers/tty/tty_mutex.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/tty.h> | 2 | #include <linux/tty.h> |
| 2 | #include <linux/module.h> | 3 | #include <linux/module.h> |
| 3 | #include <linux/kallsyms.h> | 4 | #include <linux/kallsyms.h> |
diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile index 17ae94cb29f8..edbbe0ccdb83 100644 --- a/drivers/tty/vt/Makefile +++ b/drivers/tty/vt/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # This file contains the font map for the default (hardware) font | 3 | # This file contains the font map for the default (hardware) font |
| 3 | # | 4 | # |
diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c index accbd1257bc4..7a4c8022c023 100644 --- a/drivers/tty/vt/selection.c +++ b/drivers/tty/vt/selection.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * This module exports the functions: | 3 | * This module exports the functions: |
| 3 | * | 4 | * |
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c index 56dcff6059d3..85b6634f518a 100644 --- a/drivers/tty/vt/vc_screen.c +++ b/drivers/tty/vt/vc_screen.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Provide access to virtual console memory. | 3 | * Provide access to virtual console memory. |
| 3 | * /dev/vcs0: the screen as it is being viewed right now (possibly scrolled) | 4 | * /dev/vcs0: the screen as it is being viewed right now (possibly scrolled) |
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c index 96d389cb506c..2d2b420598b2 100644 --- a/drivers/tty/vt/vt_ioctl.c +++ b/drivers/tty/vt/vt_ioctl.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 1992 obz under the linux copyright | 3 | * Copyright (C) 1992 obz under the linux copyright |
| 3 | * | 4 | * |
diff --git a/drivers/uio/Makefile b/drivers/uio/Makefile index e9663bb8a4c7..c285dd2a4539 100644 --- a/drivers/uio/Makefile +++ b/drivers/uio/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_UIO) += uio.o | 2 | obj-$(CONFIG_UIO) += uio.o |
| 2 | obj-$(CONFIG_UIO_CIF) += uio_cif.o | 3 | obj-$(CONFIG_UIO_CIF) += uio_cif.o |
| 3 | obj-$(CONFIG_UIO_PDRV_GENIRQ) += uio_pdrv_genirq.o | 4 | obj-$(CONFIG_UIO_PDRV_GENIRQ) += uio_pdrv_genirq.o |
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 9650b351c26c..060643a1b5c8 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the kernel USB device drivers. | 3 | # Makefile for the kernel USB device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/usb/atm/Makefile b/drivers/usb/atm/Makefile index ac278946b06c..7ac65ce1aa8a 100644 --- a/drivers/usb/atm/Makefile +++ b/drivers/usb/atm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for USB ATM/xDSL drivers | 3 | # Makefile for USB ATM/xDSL drivers |
| 3 | # | 4 | # |
diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile index ddcbddf8361a..e3d5e728fa53 100644 --- a/drivers/usb/chipidea/Makefile +++ b/drivers/usb/chipidea/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc.o | 2 | obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc.o |
| 2 | 3 | ||
| 3 | ci_hdrc-y := core.o otg.o debug.o | 4 | ci_hdrc-y := core.o otg.o debug.o |
diff --git a/drivers/usb/chipidea/debug.c b/drivers/usb/chipidea/debug.c index 1c31e8a08810..c9e1a165ed82 100644 --- a/drivers/usb/chipidea/debug.c +++ b/drivers/usb/chipidea/debug.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/device.h> | 3 | #include <linux/device.h> |
| 3 | #include <linux/types.h> | 4 | #include <linux/types.h> |
diff --git a/drivers/usb/chipidea/host.h b/drivers/usb/chipidea/host.h index 0f12f131bdd3..70112cf0f195 100644 --- a/drivers/usb/chipidea/host.h +++ b/drivers/usb/chipidea/host.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __DRIVERS_USB_CHIPIDEA_HOST_H | 2 | #ifndef __DRIVERS_USB_CHIPIDEA_HOST_H |
| 2 | #define __DRIVERS_USB_CHIPIDEA_HOST_H | 3 | #define __DRIVERS_USB_CHIPIDEA_HOST_H |
| 3 | 4 | ||
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h index 7a2b3deafc90..eacc116e83da 100644 --- a/drivers/usb/class/cdc-acm.h +++ b/drivers/usb/class/cdc-acm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * | 3 | * |
| 3 | * Includes for cdc-acm.c | 4 | * Includes for cdc-acm.c |
diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile index 6bbb3ec17018..0a7c45e85481 100644 --- a/drivers/usb/common/Makefile +++ b/drivers/usb/common/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the usb common parts. | 3 | # Makefile for the usb common parts. |
| 3 | # | 4 | # |
diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile index 250ec1d662d9..92c9cefb4317 100644 --- a/drivers/usb/core/Makefile +++ b/drivers/usb/core/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for USB Core files and filesystem | 3 | # Makefile for USB Core files and filesystem |
| 3 | # | 4 | # |
diff --git a/drivers/usb/dwc2/Makefile b/drivers/usb/dwc2/Makefile index b9237e1e45d0..440320cc20a4 100644 --- a/drivers/usb/dwc2/Makefile +++ b/drivers/usb/dwc2/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ccflags-$(CONFIG_USB_DWC2_DEBUG) += -DDEBUG | 2 | ccflags-$(CONFIG_USB_DWC2_DEBUG) += -DDEBUG |
| 2 | ccflags-$(CONFIG_USB_DWC2_VERBOSE) += -DVERBOSE_DEBUG | 3 | ccflags-$(CONFIG_USB_DWC2_VERBOSE) += -DVERBOSE_DEBUG |
| 3 | 4 | ||
diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile index f15fabbd1e59..7ac725038f8d 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # define_trace.h needs to know how to find our header | 2 | # define_trace.h needs to know how to find our header |
| 2 | CFLAGS_trace.o := -I$(src) | 3 | CFLAGS_trace.o := -I$(src) |
| 3 | 4 | ||
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 598a67d6ba05..130dad7130b6 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # USB peripheral controller drivers | 3 | # USB peripheral controller drivers |
| 3 | # | 4 | # |
diff --git a/drivers/usb/gadget/configfs.h b/drivers/usb/gadget/configfs.h index 540d5e92ed22..3b6f5298b2e8 100644 --- a/drivers/usb/gadget/configfs.h +++ b/drivers/usb/gadget/configfs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef USB__GADGET__CONFIGFS__H | 2 | #ifndef USB__GADGET__CONFIGFS__H |
| 2 | #define USB__GADGET__CONFIGFS__H | 3 | #define USB__GADGET__CONFIGFS__H |
| 3 | 4 | ||
diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile index 86e825269947..5d3a6cf02218 100644 --- a/drivers/usb/gadget/function/Makefile +++ b/drivers/usb/gadget/function/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # USB peripheral controller drivers | 3 | # USB peripheral controller drivers |
| 3 | # | 4 | # |
diff --git a/drivers/usb/gadget/function/f_mass_storage.h b/drivers/usb/gadget/function/f_mass_storage.h index dc05ca0c4359..58857fcf199f 100644 --- a/drivers/usb/gadget/function/f_mass_storage.h +++ b/drivers/usb/gadget/function/f_mass_storage.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef USB_F_MASS_STORAGE_H | 2 | #ifndef USB_F_MASS_STORAGE_H |
| 2 | #define USB_F_MASS_STORAGE_H | 3 | #define USB_F_MASS_STORAGE_H |
| 3 | 4 | ||
diff --git a/drivers/usb/gadget/function/g_zero.h b/drivers/usb/gadget/function/g_zero.h index 492924d0d599..98b8462ad538 100644 --- a/drivers/usb/gadget/function/g_zero.h +++ b/drivers/usb/gadget/function/g_zero.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * This header declares the utility functions used by "Gadget Zero", plus | 3 | * This header declares the utility functions used by "Gadget Zero", plus |
| 3 | * interfaces to its two single-configuration function drivers. | 4 | * interfaces to its two single-configuration function drivers. |
diff --git a/drivers/usb/gadget/function/storage_common.h b/drivers/usb/gadget/function/storage_common.h index e0814a960132..e5e3a2553aaa 100644 --- a/drivers/usb/gadget/function/storage_common.h +++ b/drivers/usb/gadget/function/storage_common.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef USB_STORAGE_COMMON_H | 2 | #ifndef USB_STORAGE_COMMON_H |
| 2 | #define USB_STORAGE_COMMON_H | 3 | #define USB_STORAGE_COMMON_H |
| 3 | 4 | ||
diff --git a/drivers/usb/gadget/function/tcm.h b/drivers/usb/gadget/function/tcm.h index a27e6e34db0b..3cd565794ad7 100644 --- a/drivers/usb/gadget/function/tcm.h +++ b/drivers/usb/gadget/function/tcm.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __TARGET_USB_GADGET_H__ | 2 | #ifndef __TARGET_USB_GADGET_H__ |
| 2 | #define __TARGET_USB_GADGET_H__ | 3 | #define __TARGET_USB_GADGET_H__ |
| 3 | 4 | ||
diff --git a/drivers/usb/gadget/function/uvc_queue.h b/drivers/usb/gadget/function/uvc_queue.h index ac461a9a1a70..51ee94e5cf2b 100644 --- a/drivers/usb/gadget/function/uvc_queue.h +++ b/drivers/usb/gadget/function/uvc_queue.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _UVC_QUEUE_H_ | 2 | #ifndef _UVC_QUEUE_H_ |
| 2 | #define _UVC_QUEUE_H_ | 3 | #define _UVC_QUEUE_H_ |
| 3 | 4 | ||
diff --git a/drivers/usb/gadget/legacy/Makefile b/drivers/usb/gadget/legacy/Makefile index 7f485f25705e..abd0c3e66a05 100644 --- a/drivers/usb/gadget/legacy/Makefile +++ b/drivers/usb/gadget/legacy/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # USB gadget drivers | 3 | # USB gadget drivers |
| 3 | # | 4 | # |
diff --git a/drivers/usb/gadget/udc/Makefile b/drivers/usb/gadget/udc/Makefile index ea9e1c7f1923..ce865b129fd6 100644 --- a/drivers/usb/gadget/udc/Makefile +++ b/drivers/usb/gadget/udc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # define_trace.h needs to know how to find our header | 2 | # define_trace.h needs to know how to find our header |
| 2 | CFLAGS_trace.o := -I$(src) | 3 | CFLAGS_trace.o := -I$(src) |
| 3 | 4 | ||
diff --git a/drivers/usb/gadget/udc/bdc/Makefile b/drivers/usb/gadget/udc/bdc/Makefile index 5cf6a3bcdf0f..52cb5ea48bbe 100644 --- a/drivers/usb/gadget/udc/bdc/Makefile +++ b/drivers/usb/gadget/udc/bdc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_USB_BDC_UDC) += bdc.o | 2 | obj-$(CONFIG_USB_BDC_UDC) += bdc.o |
| 2 | bdc-y := bdc_core.o bdc_cmd.o bdc_ep.o bdc_udc.o | 3 | bdc-y := bdc_core.o bdc_cmd.o bdc_ep.o bdc_udc.o |
| 3 | 4 | ||
diff --git a/drivers/usb/gadget/udc/omap_udc.h b/drivers/usb/gadget/udc/omap_udc.h index 26974196cf44..00f9e608e755 100644 --- a/drivers/usb/gadget/udc/omap_udc.h +++ b/drivers/usb/gadget/udc/omap_udc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * omap_udc.h -- for omap 3.2 udc, with OTG support | 3 | * omap_udc.h -- for omap 3.2 udc, with OTG support |
| 3 | * | 4 | * |
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index cf2691fffcc0..4ab2689c8952 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for USB Host Controller Drivers | 3 | # Makefile for USB Host Controller Drivers |
| 3 | # | 4 | # |
diff --git a/drivers/usb/host/fotg210.h b/drivers/usb/host/fotg210.h index b5cfa7aeb277..7fcd785c7bc8 100644 --- a/drivers/usb/host/fotg210.h +++ b/drivers/usb/host/fotg210.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __LINUX_FOTG210_H | 2 | #ifndef __LINUX_FOTG210_H |
| 2 | #define __LINUX_FOTG210_H | 3 | #define __LINUX_FOTG210_H |
| 3 | 4 | ||
diff --git a/drivers/usb/host/isp116x.h b/drivers/usb/host/isp116x.h index dd34b7a33965..a5e929c10d53 100644 --- a/drivers/usb/host/isp116x.h +++ b/drivers/usb/host/isp116x.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * ISP116x register declarations and HCD data structures | 3 | * ISP116x register declarations and HCD data structures |
| 3 | * | 4 | * |
diff --git a/drivers/usb/host/isp1362.h b/drivers/usb/host/isp1362.h index 3b0b4847c3a9..da79e36ced89 100644 --- a/drivers/usb/host/isp1362.h +++ b/drivers/usb/host/isp1362.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * ISP1362 HCD (Host Controller Driver) for USB. | 3 | * ISP1362 HCD (Host Controller Driver) for USB. |
| 3 | * | 4 | * |
diff --git a/drivers/usb/host/oxu210hp.h b/drivers/usb/host/oxu210hp.h index 1c216ad9aad2..437044147862 100644 --- a/drivers/usb/host/oxu210hp.h +++ b/drivers/usb/host/oxu210hp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Host interface registers | 3 | * Host interface registers |
| 3 | */ | 4 | */ |
diff --git a/drivers/usb/host/pci-quirks.h b/drivers/usb/host/pci-quirks.h index 5582cbafecd4..b68dcb5dd0fd 100644 --- a/drivers/usb/host/pci-quirks.h +++ b/drivers/usb/host/pci-quirks.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __LINUX_USB_PCI_QUIRKS_H | 2 | #ifndef __LINUX_USB_PCI_QUIRKS_H |
| 2 | #define __LINUX_USB_PCI_QUIRKS_H | 3 | #define __LINUX_USB_PCI_QUIRKS_H |
| 3 | 4 | ||
diff --git a/drivers/usb/host/sl811.h b/drivers/usb/host/sl811.h index 1e23ef49bec1..2abe51a5db44 100644 --- a/drivers/usb/host/sl811.h +++ b/drivers/usb/host/sl811.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * SL811HS register declarations and HCD data structures | 3 | * SL811HS register declarations and HCD data structures |
| 3 | * | 4 | * |
diff --git a/drivers/usb/host/uhci-debug.c b/drivers/usb/host/uhci-debug.c index 9c6635d43db0..c4e67c4b51f6 100644 --- a/drivers/usb/host/uhci-debug.c +++ b/drivers/usb/host/uhci-debug.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * UHCI-specific debugging code. Invaluable when something | 3 | * UHCI-specific debugging code. Invaluable when something |
| 3 | * goes wrong, but don't get in my face. | 4 | * goes wrong, but don't get in my face. |
diff --git a/drivers/usb/host/uhci-grlib.c b/drivers/usb/host/uhci-grlib.c index 0342991c9507..2103b1ed0f8f 100644 --- a/drivers/usb/host/uhci-grlib.c +++ b/drivers/usb/host/uhci-grlib.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * UHCI HCD (Host Controller Driver) for GRLIB GRUSBHC | 3 | * UHCI HCD (Host Controller Driver) for GRLIB GRUSBHC |
| 3 | * | 4 | * |
diff --git a/drivers/usb/host/uhci-hcd.h b/drivers/usb/host/uhci-hcd.h index 09a2a259941b..f1cc47292a59 100644 --- a/drivers/usb/host/uhci-hcd.h +++ b/drivers/usb/host/uhci-hcd.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __LINUX_UHCI_HCD_H | 2 | #ifndef __LINUX_UHCI_HCD_H |
| 2 | #define __LINUX_UHCI_HCD_H | 3 | #define __LINUX_UHCI_HCD_H |
| 3 | 4 | ||
diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c index ece9e37e89fe..47106dd8ca7c 100644 --- a/drivers/usb/host/uhci-hub.c +++ b/drivers/usb/host/uhci-hub.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Universal Host Controller Interface driver for USB. | 3 | * Universal Host Controller Interface driver for USB. |
| 3 | * | 4 | * |
diff --git a/drivers/usb/host/uhci-pci.c b/drivers/usb/host/uhci-pci.c index 49effdc0d857..0dd944277c99 100644 --- a/drivers/usb/host/uhci-pci.c +++ b/drivers/usb/host/uhci-pci.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * UHCI HCD (Host Controller Driver) PCI Bus Glue. | 3 | * UHCI HCD (Host Controller Driver) PCI Bus Glue. |
| 3 | * | 4 | * |
diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c index 1b4e086c33a0..6cb16d4b2257 100644 --- a/drivers/usb/host/uhci-platform.c +++ b/drivers/usb/host/uhci-platform.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Generic UHCI HCD (Host Controller Driver) for Platform Devices | 3 | * Generic UHCI HCD (Host Controller Driver) for Platform Devices |
| 3 | * | 4 | * |
diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c index c17ea1589b83..49d4edc03cc2 100644 --- a/drivers/usb/host/uhci-q.c +++ b/drivers/usb/host/uhci-q.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Universal Host Controller Interface driver for USB. | 3 | * Universal Host Controller Interface driver for USB. |
| 3 | * | 4 | * |
diff --git a/drivers/usb/image/microtek.h b/drivers/usb/image/microtek.h index 7e32ae787136..66685e59241a 100644 --- a/drivers/usb/image/microtek.h +++ b/drivers/usb/image/microtek.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Driver for Microtek Scanmaker X6 USB scanner and possibly others. | 3 | * Driver for Microtek Scanmaker X6 USB scanner and possibly others. |
| 3 | * | 4 | * |
diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c index 8e59e0c02b8a..bb4d6d959871 100644 --- a/drivers/usb/isp1760/isp1760-hcd.c +++ b/drivers/usb/isp1760/isp1760-hcd.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Driver for the NXP ISP1760 chip | 3 | * Driver for the NXP ISP1760 chip |
| 3 | * | 4 | * |
diff --git a/drivers/usb/isp1760/isp1760-hcd.h b/drivers/usb/isp1760/isp1760-hcd.h index 0c1c98d6ea08..f1bb2deb1ccf 100644 --- a/drivers/usb/isp1760/isp1760-hcd.h +++ b/drivers/usb/isp1760/isp1760-hcd.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _ISP1760_HCD_H_ | 2 | #ifndef _ISP1760_HCD_H_ |
| 2 | #define _ISP1760_HCD_H_ | 3 | #define _ISP1760_HCD_H_ |
| 3 | 4 | ||
diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c index bc68bbab7fa1..241a00d75027 100644 --- a/drivers/usb/isp1760/isp1760-if.c +++ b/drivers/usb/isp1760/isp1760-if.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Glue code for the ISP1760 driver and bus | 3 | * Glue code for the ISP1760 driver and bus |
| 3 | * Currently there is support for | 4 | * Currently there is support for |
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile index 7fdb45fc976f..109f54f5b9aa 100644 --- a/drivers/usb/misc/Makefile +++ b/drivers/usb/misc/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the rest of the USB drivers | 3 | # Makefile for the rest of the USB drivers |
| 3 | # (the ones that don't fit into any other categories) | 4 | # (the ones that don't fit into any other categories) |
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c index b6d8bf475c92..f6ae753ab99b 100644 --- a/drivers/usb/mon/mon_bin.c +++ b/drivers/usb/mon/mon_bin.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * The USB Monitor, inspired by Dave Harding's USBMon. | 3 | * The USB Monitor, inspired by Dave Harding's USBMon. |
| 3 | * | 4 | * |
diff --git a/drivers/usb/mon/mon_stat.c b/drivers/usb/mon/mon_stat.c index 5bdf73a57498..98ab0cc473d6 100644 --- a/drivers/usb/mon/mon_stat.c +++ b/drivers/usb/mon/mon_stat.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * The USB Monitor, inspired by Dave Harding's USBMon. | 3 | * The USB Monitor, inspired by Dave Harding's USBMon. |
| 3 | * | 4 | * |
diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c index 19c416d69eb9..f5e1bb5e5217 100644 --- a/drivers/usb/mon/mon_text.c +++ b/drivers/usb/mon/mon_text.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * The USB Monitor, inspired by Dave Harding's USBMon. | 3 | * The USB Monitor, inspired by Dave Harding's USBMon. |
| 3 | * | 4 | * |
diff --git a/drivers/usb/mon/usb_mon.h b/drivers/usb/mon/usb_mon.h index df9a4df342c7..aa64efaba366 100644 --- a/drivers/usb/mon/usb_mon.h +++ b/drivers/usb/mon/usb_mon.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * The USB Monitor, inspired by Dave Harding's USBMon. | 3 | * The USB Monitor, inspired by Dave Harding's USBMon. |
| 3 | * | 4 | * |
diff --git a/drivers/usb/mtu3/Makefile b/drivers/usb/mtu3/Makefile index 60e0fff7a847..4a9715812bf9 100644 --- a/drivers/usb/mtu3/Makefile +++ b/drivers/usb/mtu3/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | ccflags-$(CONFIG_USB_MTU3_DEBUG) += -DDEBUG | 3 | ccflags-$(CONFIG_USB_MTU3_DEBUG) += -DDEBUG |
| 3 | 4 | ||
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile index 689d42aba8a9..79d4d5439164 100644 --- a/drivers/usb/musb/Makefile +++ b/drivers/usb/musb/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # for USB OTG silicon based on Mentor Graphics INVENTRA designs | 3 | # for USB OTG silicon based on Mentor Graphics INVENTRA designs |
| 3 | # | 4 | # |
diff --git a/drivers/usb/musb/cppi_dma.h b/drivers/usb/musb/cppi_dma.h index 9bb7c5e45c85..16dd1ed44bb5 100644 --- a/drivers/usb/musb/cppi_dma.h +++ b/drivers/usb/musb/cppi_dma.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* Copyright (C) 2005-2006 by Texas Instruments */ | 2 | /* Copyright (C) 2005-2006 by Texas Instruments */ |
| 2 | 3 | ||
| 3 | #ifndef _CPPI_DMA_H_ | 4 | #ifndef _CPPI_DMA_H_ |
diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile index e7c9ca8cafb0..0c40ccc90631 100644 --- a/drivers/usb/phy/Makefile +++ b/drivers/usb/phy/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for physical layer USB drivers | 3 | # Makefile for physical layer USB drivers |
| 3 | # | 4 | # |
diff --git a/drivers/usb/phy/phy-am335x-control.h b/drivers/usb/phy/phy-am335x-control.h index e86b3165d69d..cd4acfc6e360 100644 --- a/drivers/usb/phy/phy-am335x-control.h +++ b/drivers/usb/phy/phy-am335x-control.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _AM335x_PHY_CONTROL_H_ | 2 | #ifndef _AM335x_PHY_CONTROL_H_ |
| 2 | #define _AM335x_PHY_CONTROL_H_ | 3 | #define _AM335x_PHY_CONTROL_H_ |
| 3 | 4 | ||
diff --git a/drivers/usb/phy/phy-generic.h b/drivers/usb/phy/phy-generic.h index 0d0eadd54ed9..97289627561d 100644 --- a/drivers/usb/phy/phy-generic.h +++ b/drivers/usb/phy/phy-generic.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _PHY_GENERIC_H_ | 2 | #ifndef _PHY_GENERIC_H_ |
| 2 | #define _PHY_GENERIC_H_ | 3 | #define _PHY_GENERIC_H_ |
| 3 | 4 | ||
diff --git a/drivers/usb/renesas_usbhs/Makefile b/drivers/usb/renesas_usbhs/Makefile index d787d05f6546..fac147a3ad23 100644 --- a/drivers/usb/renesas_usbhs/Makefile +++ b/drivers/usb/renesas_usbhs/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # for Renesas USB | 3 | # for Renesas USB |
| 3 | # | 4 | # |
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile index 5a21a82390e1..2d491e434f11 100644 --- a/drivers/usb/serial/Makefile +++ b/drivers/usb/serial/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the USB serial device drivers. | 3 | # Makefile for the USB serial device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/usb/serial/cypress_m8.h b/drivers/usb/serial/cypress_m8.h index 119d2e17077b..35e223751c0e 100644 --- a/drivers/usb/serial/cypress_m8.h +++ b/drivers/usb/serial/cypress_m8.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef CYPRESS_M8_H | 2 | #ifndef CYPRESS_M8_H |
| 2 | #define CYPRESS_M8_H | 3 | #define CYPRESS_M8_H |
| 3 | 4 | ||
diff --git a/drivers/usb/serial/ezusb_convert.pl b/drivers/usb/serial/ezusb_convert.pl index 13f11469116e..40d23f21ec74 100644 --- a/drivers/usb/serial/ezusb_convert.pl +++ b/drivers/usb/serial/ezusb_convert.pl | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #! /usr/bin/perl -w | 1 | #! /usr/bin/perl -w |
| 2 | # SPDX-License-Identifier: GPL-2.0 | ||
| 2 | 3 | ||
| 3 | 4 | ||
| 4 | # convert an Intel HEX file into a set of C records usable by the firmware | 5 | # convert an Intel HEX file into a set of C records usable by the firmware |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index bbcc13df11ac..dcd0b6e05baf 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Driver definitions for the FTDI USB Single Port Serial Converter - | 3 | * Driver definitions for the FTDI USB Single Port Serial Converter - |
| 3 | * known as FTDI_SIO (Serial Input/Output application of the chipset) | 4 | * known as FTDI_SIO (Serial Input/Output application of the chipset) |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index f9d15bd62785..4faa09fe308c 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * vendor/product IDs (VID/PID) of devices using FTDI USB serial converters. | 3 | * vendor/product IDs (VID/PID) of devices using FTDI USB serial converters. |
| 3 | * Please keep numerically sorted within individual areas, thanks! | 4 | * Please keep numerically sorted within individual areas, thanks! |
diff --git a/drivers/usb/serial/kl5kusb105.h b/drivers/usb/serial/kl5kusb105.h index 22a90badc86b..41c9bf60fbf0 100644 --- a/drivers/usb/serial/kl5kusb105.h +++ b/drivers/usb/serial/kl5kusb105.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Definitions for the KLSI KL5KUSB105 serial port adapter | 3 | * Definitions for the KLSI KL5KUSB105 serial port adapter |
| 3 | */ | 4 | */ |
diff --git a/drivers/usb/serial/kobil_sct.h b/drivers/usb/serial/kobil_sct.h index be207f7156fe..030c1b426611 100644 --- a/drivers/usb/serial/kobil_sct.h +++ b/drivers/usb/serial/kobil_sct.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #define SUSBCRequest_SetBaudRateParityAndStopBits 1 | 2 | #define SUSBCRequest_SetBaudRateParityAndStopBits 1 |
| 2 | #define SUSBCR_SBR_MASK 0xFF00 | 3 | #define SUSBCR_SBR_MASK 0xFF00 |
| 3 | #define SUSBCR_SBR_1200 0x0100 | 4 | #define SUSBCR_SBR_1200 0x0100 |
diff --git a/drivers/usb/serial/usb-wwan.h b/drivers/usb/serial/usb-wwan.h index 44b25c08c68a..d28dab4b9eff 100644 --- a/drivers/usb/serial/usb-wwan.h +++ b/drivers/usb/serial/usb-wwan.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Definitions for USB serial mobile broadband cards | 3 | * Definitions for USB serial mobile broadband cards |
| 3 | */ | 4 | */ |
diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile index 4cd55481b309..c5126a4cd954 100644 --- a/drivers/usb/storage/Makefile +++ b/drivers/usb/storage/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the USB Mass Storage device drivers. | 3 | # Makefile for the USB Mass Storage device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/usb/storage/option_ms.h b/drivers/usb/storage/option_ms.h index b6e448cab039..6439992184fa 100644 --- a/drivers/usb/storage/option_ms.h +++ b/drivers/usb/storage/option_ms.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _OPTION_MS_H_ | 2 | #ifndef _OPTION_MS_H_ |
| 2 | #define _OPTION_MS_H_ | 3 | #define _OPTION_MS_H_ |
| 3 | extern int option_ms_init(struct us_data *us); | 4 | extern int option_ms_init(struct us_data *us); |
diff --git a/drivers/usb/storage/sierra_ms.c b/drivers/usb/storage/sierra_ms.c index 9a51019ac7b2..daf62448483f 100644 --- a/drivers/usb/storage/sierra_ms.c +++ b/drivers/usb/storage/sierra_ms.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <scsi/scsi.h> | 2 | #include <scsi/scsi.h> |
| 2 | #include <scsi/scsi_host.h> | 3 | #include <scsi/scsi_host.h> |
| 3 | #include <scsi/scsi_cmnd.h> | 4 | #include <scsi/scsi_cmnd.h> |
diff --git a/drivers/usb/storage/sierra_ms.h b/drivers/usb/storage/sierra_ms.h index bb48634ac1fc..3e9da537d54a 100644 --- a/drivers/usb/storage/sierra_ms.h +++ b/drivers/usb/storage/sierra_ms.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _SIERRA_MS_H_ | 2 | #ifndef _SIERRA_MS_H_ |
| 2 | #define _SIERRA_MS_H_ | 3 | #define _SIERRA_MS_H_ |
| 3 | extern int sierra_ms_init(struct us_data *us); | 4 | extern int sierra_ms_init(struct us_data *us); |
diff --git a/drivers/usb/storage/uas-detect.h b/drivers/usb/storage/uas-detect.h index a155cd02bce2..1fcd758a961f 100644 --- a/drivers/usb/storage/uas-detect.h +++ b/drivers/usb/storage/uas-detect.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #include <linux/usb.h> | 2 | #include <linux/usb.h> |
| 2 | #include <linux/usb/hcd.h> | 3 | #include <linux/usb/hcd.h> |
| 3 | #include "usb.h" | 4 | #include "usb.h" |
diff --git a/drivers/usb/typec/ucsi/Makefile b/drivers/usb/typec/ucsi/Makefile index 8372fc22f9b3..b57891c1fd31 100644 --- a/drivers/usb/typec/ucsi/Makefile +++ b/drivers/usb/typec/ucsi/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | CFLAGS_trace.o := -I$(src) | 2 | CFLAGS_trace.o := -I$(src) |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_TYPEC_UCSI) += typec_ucsi.o | 4 | obj-$(CONFIG_TYPEC_UCSI) += typec_ucsi.o |
diff --git a/drivers/usb/typec/ucsi/debug.h b/drivers/usb/typec/ucsi/debug.h index e4d8fc763e6c..fdeff39df120 100644 --- a/drivers/usb/typec/ucsi/debug.h +++ b/drivers/usb/typec/ucsi/debug.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __UCSI_DEBUG_H | 2 | #ifndef __UCSI_DEBUG_H |
| 2 | #define __UCSI_DEBUG_H | 3 | #define __UCSI_DEBUG_H |
| 3 | 4 | ||
diff --git a/drivers/usb/typec/ucsi/trace.h b/drivers/usb/typec/ucsi/trace.h index 98b404404834..d5092446ecc6 100644 --- a/drivers/usb/typec/ucsi/trace.h +++ b/drivers/usb/typec/ucsi/trace.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #undef TRACE_SYSTEM | 3 | #undef TRACE_SYSTEM |
| 3 | #define TRACE_SYSTEM ucsi | 4 | #define TRACE_SYSTEM ucsi |
diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h index 8a88f45822e3..53b80f40a908 100644 --- a/drivers/usb/typec/ucsi/ucsi.h +++ b/drivers/usb/typec/ucsi/ucsi.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #ifndef __DRIVER_USB_TYPEC_UCSI_H | 3 | #ifndef __DRIVER_USB_TYPEC_UCSI_H |
| 3 | #define __DRIVER_USB_TYPEC_UCSI_H | 4 | #define __DRIVER_USB_TYPEC_UCSI_H |
diff --git a/drivers/usb/usbip/Makefile b/drivers/usb/usbip/Makefile index d843a9e68852..f4c8f3840262 100644 --- a/drivers/usb/usbip/Makefile +++ b/drivers/usb/usbip/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ccflags-$(CONFIG_USBIP_DEBUG) := -DDEBUG | 2 | ccflags-$(CONFIG_USBIP_DEBUG) := -DDEBUG |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_USBIP_CORE) += usbip-core.o | 4 | obj-$(CONFIG_USBIP_CORE) += usbip-core.o |
diff --git a/drivers/usb/wusbcore/Makefile b/drivers/usb/wusbcore/Makefile index b3bd313032b1..d604ccdd916f 100644 --- a/drivers/usb/wusbcore/Makefile +++ b/drivers/usb/wusbcore/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | ccflags-$(CONFIG_USB_WUSB_CBAF_DEBUG) := -DDEBUG | 2 | ccflags-$(CONFIG_USB_WUSB_CBAF_DEBUG) := -DDEBUG |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_USB_WUSB) += wusbcore.o | 4 | obj-$(CONFIG_USB_WUSB) += wusbcore.o |
diff --git a/drivers/uwb/Makefile b/drivers/uwb/Makefile index d47dd6e2942c..32f4de7afbd6 100644 --- a/drivers/uwb/Makefile +++ b/drivers/uwb/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_UWB) += uwb.o | 2 | obj-$(CONFIG_UWB) += uwb.o |
| 2 | obj-$(CONFIG_UWB_WHCI) += umc.o whci.o whc-rc.o | 3 | obj-$(CONFIG_UWB_WHCI) += umc.o whci.o whc-rc.o |
| 3 | obj-$(CONFIG_UWB_HWA) += hwa-rc.o | 4 | obj-$(CONFIG_UWB_HWA) += hwa-rc.o |
diff --git a/drivers/uwb/i1480/dfu/Makefile b/drivers/uwb/i1480/dfu/Makefile index bd1b9f25424c..4739fdac5922 100644 --- a/drivers/uwb/i1480/dfu/Makefile +++ b/drivers/uwb/i1480/dfu/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_UWB_I1480U) += i1480-dfu-usb.o | 2 | obj-$(CONFIG_UWB_I1480U) += i1480-dfu-usb.o |
| 2 | 3 | ||
| 3 | i1480-dfu-usb-objs := \ | 4 | i1480-dfu-usb-objs := \ |
diff --git a/drivers/vfio/Makefile b/drivers/vfio/Makefile index 4a23c13b6be4..de67c4725cce 100644 --- a/drivers/vfio/Makefile +++ b/drivers/vfio/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | vfio_virqfd-y := virqfd.o | 2 | vfio_virqfd-y := virqfd.o |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_VFIO) += vfio.o | 4 | obj-$(CONFIG_VFIO) += vfio.o |
diff --git a/drivers/vfio/platform/Makefile b/drivers/vfio/platform/Makefile index 41a6224f5e6b..3f3a24e7c4ef 100644 --- a/drivers/vfio/platform/Makefile +++ b/drivers/vfio/platform/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | vfio-platform-base-y := vfio_platform_common.o vfio_platform_irq.o | 2 | vfio-platform-base-y := vfio_platform_common.o vfio_platform_irq.o |
| 2 | vfio-platform-y := vfio_platform.o | 3 | vfio-platform-y := vfio_platform.o |
| 3 | 4 | ||
diff --git a/drivers/vfio/platform/reset/Makefile b/drivers/vfio/platform/reset/Makefile index 93f4e232697b..90ba20b646da 100644 --- a/drivers/vfio/platform/reset/Makefile +++ b/drivers/vfio/platform/reset/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | vfio-platform-calxedaxgmac-y := vfio_platform_calxedaxgmac.o | 2 | vfio-platform-calxedaxgmac-y := vfio_platform_calxedaxgmac.o |
| 2 | vfio-platform-amdxgbe-y := vfio_platform_amdxgbe.o | 3 | vfio-platform-amdxgbe-y := vfio_platform_amdxgbe.o |
| 3 | 4 | ||
diff --git a/drivers/vhost/Makefile b/drivers/vhost/Makefile index 6b012b986b57..6c6df24f770c 100644 --- a/drivers/vhost/Makefile +++ b/drivers/vhost/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_VHOST_NET) += vhost_net.o | 2 | obj-$(CONFIG_VHOST_NET) += vhost_net.o |
| 2 | vhost_net-y := net.o | 3 | vhost_net-y := net.o |
| 3 | 4 | ||
diff --git a/drivers/vhost/test.h b/drivers/vhost/test.h index 1fef5df82153..7dd265bfdf81 100644 --- a/drivers/vhost/test.h +++ b/drivers/vhost/test.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef LINUX_VHOST_TEST_H | 2 | #ifndef LINUX_VHOST_TEST_H |
| 2 | #define LINUX_VHOST_TEST_H | 3 | #define LINUX_VHOST_TEST_H |
| 3 | 4 | ||
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index d59a9cc65f9d..79c6e7a60a5e 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _VHOST_H | 2 | #ifndef _VHOST_H |
| 2 | #define _VHOST_H | 3 | #define _VHOST_H |
| 3 | 4 | ||
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 445b2c230b56..df7650adede9 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_VGASTATE) += vgastate.o | 2 | obj-$(CONFIG_VGASTATE) += vgastate.o |
| 2 | obj-$(CONFIG_HDMI) += hdmi.o | 3 | obj-$(CONFIG_HDMI) += hdmi.o |
| 3 | 4 | ||
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile index 8905129691e8..5e28f01c8391 100644 --- a/drivers/video/backlight/Makefile +++ b/drivers/video/backlight/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Backlight & LCD drivers | 2 | # Backlight & LCD drivers |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_LCD_AMS369FG06) += ams369fg06.o | 4 | obj-$(CONFIG_LCD_AMS369FG06) += ams369fg06.o |
diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile index eb2cbec52643..db07b784bd2c 100644 --- a/drivers/video/console/Makefile +++ b/drivers/video/console/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for the Linux graphics to console drivers. | 2 | # Makefile for the Linux graphics to console drivers. |
| 2 | # 5 Aug 1999, James Simmons, <mailto:jsimmons@users.sf.net> | 3 | # 5 Aug 1999, James Simmons, <mailto:jsimmons@users.sf.net> |
| 3 | # Rewritten to use lists instead of if-statements. | 4 | # Rewritten to use lists instead of if-statements. |
diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile index ee8c81405a7f..8895536a20d6 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for the Linux video drivers. | 2 | # Makefile for the Linux video drivers. |
| 2 | # 5 Aug 1999, James Simmons, <mailto:jsimmons@users.sf.net> | 3 | # 5 Aug 1999, James Simmons, <mailto:jsimmons@users.sf.net> |
| 3 | # Rewritten to use lists instead of if-statements. | 4 | # Rewritten to use lists instead of if-statements. |
diff --git a/drivers/video/fbdev/amba-clcd-nomadik.h b/drivers/video/fbdev/amba-clcd-nomadik.h index a24032c8156e..462c31381fa1 100644 --- a/drivers/video/fbdev/amba-clcd-nomadik.h +++ b/drivers/video/fbdev/amba-clcd-nomadik.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _AMBA_CLCD_NOMADIK_H | 2 | #ifndef _AMBA_CLCD_NOMADIK_H |
| 2 | #define _AMBA_CLCD_NOMADIK_H | 3 | #define _AMBA_CLCD_NOMADIK_H |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/amba-clcd-versatile.h b/drivers/video/fbdev/amba-clcd-versatile.h index 4692c3092823..b20baa47e6ad 100644 --- a/drivers/video/fbdev/amba-clcd-versatile.h +++ b/drivers/video/fbdev/amba-clcd-versatile.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Special local versatile callbacks | 3 | * Special local versatile callbacks |
| 3 | */ | 4 | */ |
diff --git a/drivers/video/fbdev/atafb.h b/drivers/video/fbdev/atafb.h index 014e05906cb1..2b2675980087 100644 --- a/drivers/video/fbdev/atafb.h +++ b/drivers/video/fbdev/atafb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _VIDEO_ATAFB_H | 2 | #ifndef _VIDEO_ATAFB_H |
| 2 | #define _VIDEO_ATAFB_H | 3 | #define _VIDEO_ATAFB_H |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/atafb_utils.h b/drivers/video/fbdev/atafb_utils.h index ac9e19dc5057..8f3396ea8ae5 100644 --- a/drivers/video/fbdev/atafb_utils.h +++ b/drivers/video/fbdev/atafb_utils.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _VIDEO_ATAFB_UTILS_H | 2 | #ifndef _VIDEO_ATAFB_UTILS_H |
| 2 | #define _VIDEO_ATAFB_UTILS_H | 3 | #define _VIDEO_ATAFB_UTILS_H |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/aty/Makefile b/drivers/video/fbdev/aty/Makefile index a6cc0e9ec790..069465c82d6d 100644 --- a/drivers/video/fbdev/aty/Makefile +++ b/drivers/video/fbdev/aty/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_FB_ATY) += atyfb.o | 2 | obj-$(CONFIG_FB_ATY) += atyfb.o |
| 2 | obj-$(CONFIG_FB_ATY128) += aty128fb.o | 3 | obj-$(CONFIG_FB_ATY128) += aty128fb.o |
| 3 | obj-$(CONFIG_FB_RADEON) += radeonfb.o | 4 | obj-$(CONFIG_FB_RADEON) += radeonfb.o |
diff --git a/drivers/video/fbdev/aty/ati_ids.h b/drivers/video/fbdev/aty/ati_ids.h index 3e9d28bcd9f8..2b589d687b4c 100644 --- a/drivers/video/fbdev/aty/ati_ids.h +++ b/drivers/video/fbdev/aty/ati_ids.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * ATI PCI IDs from XFree86, kept here to make sync'ing with | 3 | * ATI PCI IDs from XFree86, kept here to make sync'ing with |
| 3 | * XFree much simpler. Currently, this list is only used by | 4 | * XFree much simpler. Currently, this list is only used by |
diff --git a/drivers/video/fbdev/aty/atyfb.h b/drivers/video/fbdev/aty/atyfb.h index 63c4842eb224..8235b285dbb2 100644 --- a/drivers/video/fbdev/aty/atyfb.h +++ b/drivers/video/fbdev/aty/atyfb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * ATI Frame Buffer Device Driver Core Definitions | 3 | * ATI Frame Buffer Device Driver Core Definitions |
| 3 | */ | 4 | */ |
diff --git a/drivers/video/fbdev/aty/mach64_accel.c b/drivers/video/fbdev/aty/mach64_accel.c index 182bd680141f..2541a0e0de76 100644 --- a/drivers/video/fbdev/aty/mach64_accel.c +++ b/drivers/video/fbdev/aty/mach64_accel.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | /* | 3 | /* |
| 3 | * ATI Mach64 Hardware Acceleration | 4 | * ATI Mach64 Hardware Acceleration |
diff --git a/drivers/video/fbdev/aty/mach64_ct.c b/drivers/video/fbdev/aty/mach64_ct.c index 51f29d627ceb..7d3bd723d3d5 100644 --- a/drivers/video/fbdev/aty/mach64_ct.c +++ b/drivers/video/fbdev/aty/mach64_ct.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | /* | 3 | /* |
| 3 | * ATI Mach64 CT/VT/GT/LT Support | 4 | * ATI Mach64 CT/VT/GT/LT Support |
diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c index 2fa0317ab3c7..4cde25eab8e8 100644 --- a/drivers/video/fbdev/aty/mach64_cursor.c +++ b/drivers/video/fbdev/aty/mach64_cursor.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * ATI Mach64 CT/VT/GT/LT Cursor Support | 3 | * ATI Mach64 CT/VT/GT/LT Cursor Support |
| 3 | */ | 4 | */ |
diff --git a/drivers/video/fbdev/aty/mach64_gx.c b/drivers/video/fbdev/aty/mach64_gx.c index 10c988aef58e..27cb65fa2ba2 100644 --- a/drivers/video/fbdev/aty/mach64_gx.c +++ b/drivers/video/fbdev/aty/mach64_gx.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | /* | 3 | /* |
| 3 | * ATI Mach64 GX Support | 4 | * ATI Mach64 GX Support |
diff --git a/drivers/video/fbdev/aty/radeon_accel.c b/drivers/video/fbdev/aty/radeon_accel.c index a469a3d6edcb..bb147d8bf82d 100644 --- a/drivers/video/fbdev/aty/radeon_accel.c +++ b/drivers/video/fbdev/aty/radeon_accel.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "radeonfb.h" | 2 | #include "radeonfb.h" |
| 2 | 3 | ||
| 3 | /* the accelerated functions here are patterned after the | 4 | /* the accelerated functions here are patterned after the |
diff --git a/drivers/video/fbdev/aty/radeon_i2c.c b/drivers/video/fbdev/aty/radeon_i2c.c index ab1d0fd76316..269b12ebb673 100644 --- a/drivers/video/fbdev/aty/radeon_i2c.c +++ b/drivers/video/fbdev/aty/radeon_i2c.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "radeonfb.h" | 2 | #include "radeonfb.h" |
| 2 | 3 | ||
| 3 | #include <linux/module.h> | 4 | #include <linux/module.h> |
diff --git a/drivers/video/fbdev/aty/radeon_monitor.c b/drivers/video/fbdev/aty/radeon_monitor.c index dd823f5fe4c9..9966c58aa26c 100644 --- a/drivers/video/fbdev/aty/radeon_monitor.c +++ b/drivers/video/fbdev/aty/radeon_monitor.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include "radeonfb.h" | 2 | #include "radeonfb.h" |
| 2 | 3 | ||
| 3 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
diff --git a/drivers/video/fbdev/aty/radeon_pm.c b/drivers/video/fbdev/aty/radeon_pm.c index 1417542738fc..f7c253dd5899 100644 --- a/drivers/video/fbdev/aty/radeon_pm.c +++ b/drivers/video/fbdev/aty/radeon_pm.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * drivers/video/aty/radeon_pm.c | 3 | * drivers/video/aty/radeon_pm.c |
| 3 | * | 4 | * |
diff --git a/drivers/video/fbdev/aty/radeonfb.h b/drivers/video/fbdev/aty/radeonfb.h index 962e31263225..131b34dd65af 100644 --- a/drivers/video/fbdev/aty/radeonfb.h +++ b/drivers/video/fbdev/aty/radeonfb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __RADEONFB_H__ | 2 | #ifndef __RADEONFB_H__ |
| 2 | #define __RADEONFB_H__ | 3 | #define __RADEONFB_H__ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/carminefb.h b/drivers/video/fbdev/carminefb.h index 05306de0c6b6..297688eba469 100644 --- a/drivers/video/fbdev/carminefb.h +++ b/drivers/video/fbdev/carminefb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef CARMINE_CARMINE_H | 2 | #ifndef CARMINE_CARMINE_H |
| 2 | #define CARMINE_CARMINE_H | 3 | #define CARMINE_CARMINE_H |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/carminefb_regs.h b/drivers/video/fbdev/carminefb_regs.h index 045215600b73..ae18318d2fc2 100644 --- a/drivers/video/fbdev/carminefb_regs.h +++ b/drivers/video/fbdev/carminefb_regs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _CARMINEFB_REGS_H | 2 | #ifndef _CARMINEFB_REGS_H |
| 2 | #define _CARMINEFB_REGS_H | 3 | #define _CARMINEFB_REGS_H |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile index 73493bbd7a15..d34fd182ca68 100644 --- a/drivers/video/fbdev/core/Makefile +++ b/drivers/video/fbdev/core/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_FB_CMDLINE) += fb_cmdline.o | 2 | obj-$(CONFIG_FB_CMDLINE) += fb_cmdline.o |
| 2 | obj-$(CONFIG_FB_NOTIFY) += fb_notify.o | 3 | obj-$(CONFIG_FB_NOTIFY) += fb_notify.o |
| 3 | obj-$(CONFIG_FB) += fb.o | 4 | obj-$(CONFIG_FB) += fb.o |
diff --git a/drivers/video/fbdev/core/fb_draw.h b/drivers/video/fbdev/core/fb_draw.h index 624ee115f129..e0d829873930 100644 --- a/drivers/video/fbdev/core/fb_draw.h +++ b/drivers/video/fbdev/core/fb_draw.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _FB_DRAW_H | 2 | #ifndef _FB_DRAW_H |
| 2 | #define _FB_DRAW_H | 3 | #define _FB_DRAW_H |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c index 3a010641f630..d1bf9c2a78a7 100644 --- a/drivers/video/fbdev/efifb.c +++ b/drivers/video/fbdev/efifb.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Framebuffer driver for EFI/UEFI based system | 3 | * Framebuffer driver for EFI/UEFI based system |
| 3 | * | 4 | * |
diff --git a/drivers/video/fbdev/geode/Makefile b/drivers/video/fbdev/geode/Makefile index 5c98da126883..16ba8a71dc52 100644 --- a/drivers/video/fbdev/geode/Makefile +++ b/drivers/video/fbdev/geode/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for the Geode family framebuffer drivers | 2 | # Makefile for the Geode family framebuffer drivers |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_FB_GEODE_GX1) += gx1fb.o | 4 | obj-$(CONFIG_FB_GEODE_GX1) += gx1fb.o |
diff --git a/drivers/video/fbdev/i810/Makefile b/drivers/video/fbdev/i810/Makefile index 96e08c8ded97..3e466510fe05 100644 --- a/drivers/video/fbdev/i810/Makefile +++ b/drivers/video/fbdev/i810/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Intel 810/815 framebuffer driver | 3 | # Makefile for the Intel 810/815 framebuffer driver |
| 3 | # | 4 | # |
diff --git a/drivers/video/fbdev/intelfb/Makefile b/drivers/video/fbdev/intelfb/Makefile index f7d631ebee8e..7ff2debb31af 100644 --- a/drivers/video/fbdev/intelfb/Makefile +++ b/drivers/video/fbdev/intelfb/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_FB_INTEL) += intelfb.o | 2 | obj-$(CONFIG_FB_INTEL) += intelfb.o |
| 2 | 3 | ||
| 3 | intelfb-y := intelfbdrv.o intelfbhw.o | 4 | intelfb-y := intelfbdrv.o intelfbhw.o |
diff --git a/drivers/video/fbdev/intelfb/intelfb.h b/drivers/video/fbdev/intelfb/intelfb.h index 37f8339ea88c..b54db05f028d 100644 --- a/drivers/video/fbdev/intelfb/intelfb.h +++ b/drivers/video/fbdev/intelfb/intelfb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _INTELFB_H | 2 | #ifndef _INTELFB_H |
| 2 | #define _INTELFB_H | 3 | #define _INTELFB_H |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/matrox/g450_pll.h b/drivers/video/fbdev/matrox/g450_pll.h index aac615d18440..5303336c6547 100644 --- a/drivers/video/fbdev/matrox/g450_pll.h +++ b/drivers/video/fbdev/matrox/g450_pll.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __G450_PLL_H__ | 2 | #ifndef __G450_PLL_H__ |
| 2 | #define __G450_PLL_H__ | 3 | #define __G450_PLL_H__ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.h b/drivers/video/fbdev/matrox/matroxfb_DAC1064.h index 1e6e45b57b78..3b2a6fd35fff 100644 --- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.h +++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MATROXFB_DAC1064_H__ | 2 | #ifndef __MATROXFB_DAC1064_H__ |
| 2 | #define __MATROXFB_DAC1064_H__ | 3 | #define __MATROXFB_DAC1064_H__ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.h b/drivers/video/fbdev/matrox/matroxfb_Ti3026.h index 27872aaa0a17..faee149d0ba0 100644 --- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.h +++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MATROXFB_TI3026_H__ | 2 | #ifndef __MATROXFB_TI3026_H__ |
| 2 | #define __MATROXFB_TI3026_H__ | 3 | #define __MATROXFB_TI3026_H__ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/matrox/matroxfb_accel.h b/drivers/video/fbdev/matrox/matroxfb_accel.h index 1e418e62c22d..a7aa9a1d26c0 100644 --- a/drivers/video/fbdev/matrox/matroxfb_accel.h +++ b/drivers/video/fbdev/matrox/matroxfb_accel.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MATROXFB_ACCEL_H__ | 2 | #ifndef __MATROXFB_ACCEL_H__ |
| 2 | #define __MATROXFB_ACCEL_H__ | 3 | #define __MATROXFB_ACCEL_H__ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/matrox/matroxfb_base.h b/drivers/video/fbdev/matrox/matroxfb_base.h index 7a90ea2c4613..f85ad25659e5 100644 --- a/drivers/video/fbdev/matrox/matroxfb_base.h +++ b/drivers/video/fbdev/matrox/matroxfb_base.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * | 3 | * |
| 3 | * Hardware accelerated Matrox Millennium I, II, Mystique, G100, G200, G400 and G450 | 4 | * Hardware accelerated Matrox Millennium I, II, Mystique, G100, G200, G400 and G450 |
diff --git a/drivers/video/fbdev/matrox/matroxfb_crtc2.h b/drivers/video/fbdev/matrox/matroxfb_crtc2.h index 1005582e843e..23e90e210905 100644 --- a/drivers/video/fbdev/matrox/matroxfb_crtc2.h +++ b/drivers/video/fbdev/matrox/matroxfb_crtc2.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MATROXFB_CRTC2_H__ | 2 | #ifndef __MATROXFB_CRTC2_H__ |
| 2 | #define __MATROXFB_CRTC2_H__ | 3 | #define __MATROXFB_CRTC2_H__ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/matrox/matroxfb_g450.h b/drivers/video/fbdev/matrox/matroxfb_g450.h index 3a3e654444b8..b5f17b86eae5 100644 --- a/drivers/video/fbdev/matrox/matroxfb_g450.h +++ b/drivers/video/fbdev/matrox/matroxfb_g450.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MATROXFB_G450_H__ | 2 | #ifndef __MATROXFB_G450_H__ |
| 2 | #define __MATROXFB_G450_H__ | 3 | #define __MATROXFB_G450_H__ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/matrox/matroxfb_maven.h b/drivers/video/fbdev/matrox/matroxfb_maven.h index 99eddec9f30c..f896b78836b1 100644 --- a/drivers/video/fbdev/matrox/matroxfb_maven.h +++ b/drivers/video/fbdev/matrox/matroxfb_maven.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MATROXFB_MAVEN_H__ | 2 | #ifndef __MATROXFB_MAVEN_H__ |
| 2 | #define __MATROXFB_MAVEN_H__ | 3 | #define __MATROXFB_MAVEN_H__ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/matrox/matroxfb_misc.h b/drivers/video/fbdev/matrox/matroxfb_misc.h index 351c823f1f74..9cb6686d309e 100644 --- a/drivers/video/fbdev/matrox/matroxfb_misc.h +++ b/drivers/video/fbdev/matrox/matroxfb_misc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MATROXFB_MISC_H__ | 2 | #ifndef __MATROXFB_MISC_H__ |
| 2 | #define __MATROXFB_MISC_H__ | 3 | #define __MATROXFB_MISC_H__ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/mb862xx/mb862xx_reg.h b/drivers/video/fbdev/mb862xx/mb862xx_reg.h index 9df48b8edc94..e6d0513958c2 100644 --- a/drivers/video/fbdev/mb862xx/mb862xx_reg.h +++ b/drivers/video/fbdev/mb862xx/mb862xx_reg.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Fujitsu MB862xx Graphics Controller Registers/Bits | 3 | * Fujitsu MB862xx Graphics Controller Registers/Bits |
| 3 | */ | 4 | */ |
diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb.h b/drivers/video/fbdev/mb862xx/mb862xxfb.h index 8550630c1e01..50bc9b584ca1 100644 --- a/drivers/video/fbdev/mb862xx/mb862xxfb.h +++ b/drivers/video/fbdev/mb862xx/mb862xxfb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MB862XX_H__ | 2 | #ifndef __MB862XX_H__ |
| 2 | #define __MB862XX_H__ | 3 | #define __MB862XX_H__ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.h b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.h index 96a2dfef0f60..3a2549f9a48f 100644 --- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.h +++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __MB826XXFB_ACCEL_H__ | 2 | #ifndef __MB826XXFB_ACCEL_H__ |
| 2 | #define __MB826XXFB_ACCEL_H__ | 3 | #define __MB826XXFB_ACCEL_H__ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/mbx/mbxdebugfs.c b/drivers/video/fbdev/mbx/mbxdebugfs.c index 2528d3e609a4..2bd328883178 100644 --- a/drivers/video/fbdev/mbx/mbxdebugfs.c +++ b/drivers/video/fbdev/mbx/mbxdebugfs.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/debugfs.h> | 2 | #include <linux/debugfs.h> |
| 2 | #include <linux/slab.h> | 3 | #include <linux/slab.h> |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/mbx/reg_bits.h b/drivers/video/fbdev/mbx/reg_bits.h index 5f14b4befd71..6607f353639b 100644 --- a/drivers/video/fbdev/mbx/reg_bits.h +++ b/drivers/video/fbdev/mbx/reg_bits.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __REG_BITS_2700G_ | 2 | #ifndef __REG_BITS_2700G_ |
| 2 | #define __REG_BITS_2700G_ | 3 | #define __REG_BITS_2700G_ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/mbx/regs.h b/drivers/video/fbdev/mbx/regs.h index 063099d48839..591fc9d26084 100644 --- a/drivers/video/fbdev/mbx/regs.h +++ b/drivers/video/fbdev/mbx/regs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __REGS_2700G_ | 2 | #ifndef __REGS_2700G_ |
| 2 | #define __REGS_2700G_ | 3 | #define __REGS_2700G_ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/mmp/panel/Kconfig b/drivers/video/fbdev/mmp/panel/Kconfig index 4b2c4f457b11..808890f7064b 100644 --- a/drivers/video/fbdev/mmp/panel/Kconfig +++ b/drivers/video/fbdev/mmp/panel/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | config MMP_PANEL_TPOHVGA | 2 | config MMP_PANEL_TPOHVGA |
| 2 | bool "tpohvga panel TJ032MD01BW support" | 3 | bool "tpohvga panel TJ032MD01BW support" |
| 3 | depends on SPI_MASTER | 4 | depends on SPI_MASTER |
diff --git a/drivers/video/fbdev/nvidia/Makefile b/drivers/video/fbdev/nvidia/Makefile index 917d3eb05feb..cdd6e8ac454a 100644 --- a/drivers/video/fbdev/nvidia/Makefile +++ b/drivers/video/fbdev/nvidia/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the nVidia framebuffer driver | 3 | # Makefile for the nVidia framebuffer driver |
| 3 | # | 4 | # |
diff --git a/drivers/video/fbdev/nvidia/nv_proto.h b/drivers/video/fbdev/nvidia/nv_proto.h index 878a5ce02299..fb9c5ebf2958 100644 --- a/drivers/video/fbdev/nvidia/nv_proto.h +++ b/drivers/video/fbdev/nvidia/nv_proto.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_proto.h,v 1.10 2003/07/31 20:24:29 mvojkovi Exp $ */ | 2 | /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_proto.h,v 1.10 2003/07/31 20:24:29 mvojkovi Exp $ */ |
| 2 | 3 | ||
| 3 | #ifndef __NV_PROTO_H__ | 4 | #ifndef __NV_PROTO_H__ |
diff --git a/drivers/video/fbdev/nvidia/nv_type.h b/drivers/video/fbdev/nvidia/nv_type.h index 6ff321a36813..d7a1d4363d5f 100644 --- a/drivers/video/fbdev/nvidia/nv_type.h +++ b/drivers/video/fbdev/nvidia/nv_type.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __NV_TYPE_H__ | 2 | #ifndef __NV_TYPE_H__ |
| 2 | #define __NV_TYPE_H__ | 3 | #define __NV_TYPE_H__ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/omap/Makefile b/drivers/video/fbdev/omap/Makefile index 732e0718be53..daaa73a94e7f 100644 --- a/drivers/video/fbdev/omap/Makefile +++ b/drivers/video/fbdev/omap/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the OMAP1 framebuffer device driver | 3 | # Makefile for the OMAP1 framebuffer device driver |
| 3 | # | 4 | # |
diff --git a/drivers/video/fbdev/omap/lcdc.h b/drivers/video/fbdev/omap/lcdc.h index 845222270db3..8a7607d861c1 100644 --- a/drivers/video/fbdev/omap/lcdc.h +++ b/drivers/video/fbdev/omap/lcdc.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef LCDC_H | 2 | #ifndef LCDC_H |
| 2 | #define LCDC_H | 3 | #define LCDC_H |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/omap2/omapfb/Makefile b/drivers/video/fbdev/omap2/omapfb/Makefile index ad68ecf141af..602edfed09df 100644 --- a/drivers/video/fbdev/omap2/omapfb/Makefile +++ b/drivers/video/fbdev/omap2/omapfb/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_OMAP2_VRFB) += vrfb.o | 2 | obj-$(CONFIG_OMAP2_VRFB) += vrfb.o |
| 2 | obj-y += dss/ | 3 | obj-y += dss/ |
| 3 | obj-y += displays/ | 4 | obj-y += displays/ |
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/Makefile b/drivers/video/fbdev/omap2/omapfb/displays/Makefile index 4f7459272256..f801762ce455 100644 --- a/drivers/video/fbdev/omap2/omapfb/displays/Makefile +++ b/drivers/video/fbdev/omap2/omapfb/displays/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_FB_OMAP2_ENCODER_OPA362) += encoder-opa362.o | 2 | obj-$(CONFIG_FB_OMAP2_ENCODER_OPA362) += encoder-opa362.o |
| 2 | obj-$(CONFIG_FB_OMAP2_ENCODER_TFP410) += encoder-tfp410.o | 3 | obj-$(CONFIG_FB_OMAP2_ENCODER_TFP410) += encoder-tfp410.o |
| 3 | obj-$(CONFIG_FB_OMAP2_ENCODER_TPD12S015) += encoder-tpd12s015.o | 4 | obj-$(CONFIG_FB_OMAP2_ENCODER_TPD12S015) += encoder-tpd12s015.o |
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/Kconfig b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig index 27d220212870..6d0bb27e4f85 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/Kconfig +++ b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | config FB_OMAP2_DSS_INIT | 2 | config FB_OMAP2_DSS_INIT |
| 2 | bool | 3 | bool |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/Makefile b/drivers/video/fbdev/omap2/omapfb/dss/Makefile index 02308e24f3ef..7318d5260e8d 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/Makefile +++ b/drivers/video/fbdev/omap2/omapfb/dss/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_FB_OMAP2_DSS_INIT) += omapdss-boot-init.o | 2 | obj-$(CONFIG_FB_OMAP2_DSS_INIT) += omapdss-boot-init.o |
| 2 | obj-$(CONFIG_FB_OMAP2_DSS) += omapdss.o | 3 | obj-$(CONFIG_FB_OMAP2_DSS) += omapdss.o |
| 3 | # Core DSS files | 4 | # Core DSS files |
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c index 189a5ad125a3..f13d7639826d 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | 2 | ||
| 2 | #define DSS_SUBSYS_NAME "HDMI" | 3 | #define DSS_SUBSYS_NAME "HDMI" |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/pxa168fb.h b/drivers/video/fbdev/pxa168fb.h index eee09279c524..2aba90de1360 100644 --- a/drivers/video/fbdev/pxa168fb.h +++ b/drivers/video/fbdev/pxa168fb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __PXA168FB_H__ | 2 | #ifndef __PXA168FB_H__ |
| 2 | #define __PXA168FB_H__ | 3 | #define __PXA168FB_H__ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/pxa3xx-gcu.h b/drivers/video/fbdev/pxa3xx-gcu.h index 0428ed03dc49..ea9489d16de5 100644 --- a/drivers/video/fbdev/pxa3xx-gcu.h +++ b/drivers/video/fbdev/pxa3xx-gcu.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __PXA3XX_GCU_H__ | 2 | #ifndef __PXA3XX_GCU_H__ |
| 2 | #define __PXA3XX_GCU_H__ | 3 | #define __PXA3XX_GCU_H__ |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/riva/Makefile b/drivers/video/fbdev/riva/Makefile index 8898c9915b02..bdbdd6eb80ec 100644 --- a/drivers/video/fbdev/riva/Makefile +++ b/drivers/video/fbdev/riva/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Riva framebuffer driver | 3 | # Makefile for the Riva framebuffer driver |
| 3 | # | 4 | # |
diff --git a/drivers/video/fbdev/riva/nv_type.h b/drivers/video/fbdev/riva/nv_type.h index a69480c9a67c..51937a0ae0a4 100644 --- a/drivers/video/fbdev/riva/nv_type.h +++ b/drivers/video/fbdev/riva/nv_type.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h,v 1.35 2002/08/05 20:47:06 mvojkovi Exp $ */ | 2 | /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h,v 1.35 2002/08/05 20:47:06 mvojkovi Exp $ */ |
| 2 | 3 | ||
| 3 | #ifndef __NV_STRUCT_H__ | 4 | #ifndef __NV_STRUCT_H__ |
diff --git a/drivers/video/fbdev/riva/rivafb.h b/drivers/video/fbdev/riva/rivafb.h index 61fd37ca490a..593297ca2b20 100644 --- a/drivers/video/fbdev/riva/rivafb.h +++ b/drivers/video/fbdev/riva/rivafb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __RIVAFB_H | 2 | #ifndef __RIVAFB_H |
| 2 | #define __RIVAFB_H | 3 | #define __RIVAFB_H |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/sbuslib.c b/drivers/video/fbdev/sbuslib.c index a350209ffbd3..af6fc97f4ba4 100644 --- a/drivers/video/fbdev/sbuslib.c +++ b/drivers/video/fbdev/sbuslib.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* sbuslib.c: Helper library for SBUS framebuffer drivers. | 2 | /* sbuslib.c: Helper library for SBUS framebuffer drivers. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2003 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 2003 David S. Miller (davem@redhat.com) |
diff --git a/drivers/video/fbdev/sbuslib.h b/drivers/video/fbdev/sbuslib.h index 7ba3250236bd..a6b9a2467646 100644 --- a/drivers/video/fbdev/sbuslib.h +++ b/drivers/video/fbdev/sbuslib.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* sbuslib.h: SBUS fb helper library interfaces */ | 2 | /* sbuslib.h: SBUS fb helper library interfaces */ |
| 2 | #ifndef _SBUSLIB_H | 3 | #ifndef _SBUSLIB_H |
| 3 | #define _SBUSLIB_H | 4 | #define _SBUSLIB_H |
diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.h b/drivers/video/fbdev/sh_mobile_lcdcfb.h index f839adef1d90..cc52c74721fe 100644 --- a/drivers/video/fbdev/sh_mobile_lcdcfb.h +++ b/drivers/video/fbdev/sh_mobile_lcdcfb.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef SH_MOBILE_LCDCFB_H | 2 | #ifndef SH_MOBILE_LCDCFB_H |
| 2 | #define SH_MOBILE_LCDCFB_H | 3 | #define SH_MOBILE_LCDCFB_H |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/sticore.h b/drivers/video/fbdev/sticore.h index af1619536ac8..fb8f58f9867a 100644 --- a/drivers/video/fbdev/sticore.h +++ b/drivers/video/fbdev/sticore.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef STICORE_H | 2 | #ifndef STICORE_H |
| 2 | #define STICORE_H | 3 | #define STICORE_H |
| 3 | 4 | ||
diff --git a/drivers/video/fbdev/via/Makefile b/drivers/video/fbdev/via/Makefile index 159f26e6adb5..771a0eee7fb4 100644 --- a/drivers/video/fbdev/via/Makefile +++ b/drivers/video/fbdev/via/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the VIA framebuffer driver (for Linux Kernel 2.6) | 3 | # Makefile for the VIA framebuffer driver (for Linux Kernel 2.6) |
| 3 | # | 4 | # |
diff --git a/drivers/video/fbdev/wmt_ge_rops.h b/drivers/video/fbdev/wmt_ge_rops.h index f73ec6377a46..8d9ed8a51a79 100644 --- a/drivers/video/fbdev/wmt_ge_rops.h +++ b/drivers/video/fbdev/wmt_ge_rops.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifdef CONFIG_FB_WMT_GE_ROPS | 2 | #ifdef CONFIG_FB_WMT_GE_ROPS |
| 2 | 3 | ||
| 3 | extern void wmt_ge_fillrect(struct fb_info *info, | 4 | extern void wmt_ge_fillrect(struct fb_info *info, |
diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index 3b437813584c..6194373ee424 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # Makefile for the Linux logos | 2 | # Makefile for the Linux logos |
| 2 | 3 | ||
| 3 | obj-$(CONFIG_LOGO) += logo.o | 4 | obj-$(CONFIG_LOGO) += logo.o |
diff --git a/drivers/virtio/Makefile b/drivers/virtio/Makefile index 41e30e3dc842..3a2b5c5dcf46 100644 --- a/drivers/virtio/Makefile +++ b/drivers/virtio/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_VIRTIO) += virtio.o virtio_ring.o | 2 | obj-$(CONFIG_VIRTIO) += virtio.o virtio_ring.o |
| 2 | obj-$(CONFIG_VIRTIO_MMIO) += virtio_mmio.o | 3 | obj-$(CONFIG_VIRTIO_MMIO) += virtio_mmio.o |
| 3 | obj-$(CONFIG_VIRTIO_PCI) += virtio_pci.o | 4 | obj-$(CONFIG_VIRTIO_PCI) += virtio_pci.o |
diff --git a/drivers/vme/vme_bridge.h b/drivers/vme/vme_bridge.h index 2662e916b96a..42ecf961004e 100644 --- a/drivers/vme/vme_bridge.h +++ b/drivers/vme/vme_bridge.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _VME_BRIDGE_H_ | 2 | #ifndef _VME_BRIDGE_H_ |
| 2 | #define _VME_BRIDGE_H_ | 3 | #define _VME_BRIDGE_H_ |
| 3 | 4 | ||
diff --git a/drivers/w1/masters/Makefile b/drivers/w1/masters/Makefile index c5a3e96fcbab..18954cae4256 100644 --- a/drivers/w1/masters/Makefile +++ b/drivers/w1/masters/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for 1-wire bus master drivers. | 3 | # Makefile for 1-wire bus master drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/w1/slaves/Makefile b/drivers/w1/slaves/Makefile index 36b22fb2d3a1..79c611ce5f18 100644 --- a/drivers/w1/slaves/Makefile +++ b/drivers/w1/slaves/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Dallas's 1-wire slaves. | 3 | # Makefile for the Dallas's 1-wire slaves. |
| 3 | # | 4 | # |
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 56adf9fa67d0..715a21078e0c 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the WatchDog device drivers. | 3 | # Makefile for the WatchDog device drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/watchdog/iTCO_vendor.h b/drivers/watchdog/iTCO_vendor.h index 3c57b45537a2..7b82a7c6e7c3 100644 --- a/drivers/watchdog/iTCO_vendor.h +++ b/drivers/watchdog/iTCO_vendor.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* iTCO Vendor Specific Support hooks */ | 2 | /* iTCO Vendor Specific Support hooks */ |
| 2 | #ifdef CONFIG_ITCO_VENDOR_SUPPORT | 3 | #ifdef CONFIG_ITCO_VENDOR_SUPPORT |
| 3 | extern void iTCO_vendor_pre_start(struct resource *, unsigned int); | 4 | extern void iTCO_vendor_pre_start(struct resource *, unsigned int); |
diff --git a/drivers/watchdog/sp5100_tco.h b/drivers/watchdog/sp5100_tco.h index 2b28c00da0df..1af4dee71337 100644 --- a/drivers/watchdog/sp5100_tco.h +++ b/drivers/watchdog/sp5100_tco.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * sp5100_tco: TCO timer driver for sp5100 chipsets. | 3 | * sp5100_tco: TCO timer driver for sp5100 chipsets. |
| 3 | * | 4 | * |
diff --git a/drivers/watchdog/watchdog_pretimeout.h b/drivers/watchdog/watchdog_pretimeout.h index a5a32b39c56d..a3f1abc68839 100644 --- a/drivers/watchdog/watchdog_pretimeout.h +++ b/drivers/watchdog/watchdog_pretimeout.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __WATCHDOG_PRETIMEOUT_H | 2 | #ifndef __WATCHDOG_PRETIMEOUT_H |
| 2 | #define __WATCHDOG_PRETIMEOUT_H | 3 | #define __WATCHDOG_PRETIMEOUT_H |
| 3 | 4 | ||
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index caaa15dc37bc..d3930ecaf11d 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o | 2 | obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o |
| 2 | obj-$(CONFIG_X86) += fallback.o | 3 | obj-$(CONFIG_X86) += fallback.o |
| 3 | obj-y += grant-table.o features.o balloon.o manage.o preempt.o time.o | 4 | obj-y += grant-table.o features.o balloon.o manage.o preempt.o time.o |
diff --git a/drivers/xen/biomerge.c b/drivers/xen/biomerge.c index 1bdd02a6d6ac..30d7f52eb7ca 100644 --- a/drivers/xen/biomerge.c +++ b/drivers/xen/biomerge.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/bio.h> | 2 | #include <linux/bio.h> |
| 2 | #include <linux/io.h> | 3 | #include <linux/io.h> |
| 3 | #include <linux/export.h> | 4 | #include <linux/export.h> |
diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c index 0003912a8111..d4265c8ebb22 100644 --- a/drivers/xen/cpu_hotplug.c +++ b/drivers/xen/cpu_hotplug.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt | 2 | #define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt |
| 2 | 3 | ||
| 3 | #include <linux/notifier.h> | 4 | #include <linux/notifier.h> |
diff --git a/drivers/xen/events/events_2l.c b/drivers/xen/events/events_2l.c index bdff01095f54..8edef51c92e5 100644 --- a/drivers/xen/events/events_2l.c +++ b/drivers/xen/events/events_2l.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Xen event channels (2-level ABI) | 3 | * Xen event channels (2-level ABI) |
| 3 | * | 4 | * |
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index 82360594fa8e..57efbd3b053b 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c | |||
| @@ -1024,6 +1024,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) | |||
| 1024 | mutex_unlock(&priv->lock); | 1024 | mutex_unlock(&priv->lock); |
| 1025 | 1025 | ||
| 1026 | if (use_ptemod) { | 1026 | if (use_ptemod) { |
| 1027 | map->pages_vm_start = vma->vm_start; | ||
| 1027 | err = apply_to_page_range(vma->vm_mm, vma->vm_start, | 1028 | err = apply_to_page_range(vma->vm_mm, vma->vm_start, |
| 1028 | vma->vm_end - vma->vm_start, | 1029 | vma->vm_end - vma->vm_start, |
| 1029 | find_grant_ptes, map); | 1030 | find_grant_ptes, map); |
| @@ -1061,7 +1062,6 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) | |||
| 1061 | set_grant_ptes_as_special, NULL); | 1062 | set_grant_ptes_as_special, NULL); |
| 1062 | } | 1063 | } |
| 1063 | #endif | 1064 | #endif |
| 1064 | map->pages_vm_start = vma->vm_start; | ||
| 1065 | } | 1065 | } |
| 1066 | 1066 | ||
| 1067 | return 0; | 1067 | return 0; |
diff --git a/drivers/xen/time.c b/drivers/xen/time.c index ac5f23fcafc2..a63fedbdcbe9 100644 --- a/drivers/xen/time.c +++ b/drivers/xen/time.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Xen stolen ticks accounting. | 3 | * Xen stolen ticks accounting. |
| 3 | */ | 4 | */ |
diff --git a/drivers/xen/xen-balloon.c b/drivers/xen/xen-balloon.c index e89136ab851e..b437fccd4e62 100644 --- a/drivers/xen/xen-balloon.c +++ b/drivers/xen/xen-balloon.c | |||
| @@ -57,7 +57,7 @@ static int register_balloon(struct device *dev); | |||
| 57 | static void watch_target(struct xenbus_watch *watch, | 57 | static void watch_target(struct xenbus_watch *watch, |
| 58 | const char *path, const char *token) | 58 | const char *path, const char *token) |
| 59 | { | 59 | { |
| 60 | unsigned long long new_target; | 60 | unsigned long long new_target, static_max; |
| 61 | int err; | 61 | int err; |
| 62 | static bool watch_fired; | 62 | static bool watch_fired; |
| 63 | static long target_diff; | 63 | static long target_diff; |
| @@ -72,13 +72,20 @@ static void watch_target(struct xenbus_watch *watch, | |||
| 72 | * pages. PAGE_SHIFT converts bytes to pages, hence PAGE_SHIFT - 10. | 72 | * pages. PAGE_SHIFT converts bytes to pages, hence PAGE_SHIFT - 10. |
| 73 | */ | 73 | */ |
| 74 | new_target >>= PAGE_SHIFT - 10; | 74 | new_target >>= PAGE_SHIFT - 10; |
| 75 | if (watch_fired) { | 75 | |
| 76 | balloon_set_new_target(new_target - target_diff); | 76 | if (!watch_fired) { |
| 77 | return; | 77 | watch_fired = true; |
| 78 | err = xenbus_scanf(XBT_NIL, "memory", "static-max", "%llu", | ||
| 79 | &static_max); | ||
| 80 | if (err != 1) | ||
| 81 | static_max = new_target; | ||
| 82 | else | ||
| 83 | static_max >>= PAGE_SHIFT - 10; | ||
| 84 | target_diff = xen_pv_domain() ? 0 | ||
| 85 | : static_max - balloon_stats.target_pages; | ||
| 78 | } | 86 | } |
| 79 | 87 | ||
| 80 | watch_fired = true; | 88 | balloon_set_new_target(new_target - target_diff); |
| 81 | target_diff = new_target - balloon_stats.target_pages; | ||
| 82 | } | 89 | } |
| 83 | static struct xenbus_watch target_watch = { | 90 | static struct xenbus_watch target_watch = { |
| 84 | .node = "memory/target", | 91 | .node = "memory/target", |
diff --git a/drivers/xen/xen-pciback/Makefile b/drivers/xen/xen-pciback/Makefile index ffe0ad3438bd..e8d981d43235 100644 --- a/drivers/xen/xen-pciback/Makefile +++ b/drivers/xen/xen-pciback/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback.o | 2 | obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback.o |
| 2 | 3 | ||
| 3 | xen-pciback-y := pci_stub.o pciback_ops.o xenbus.o | 4 | xen-pciback-y := pci_stub.o pciback_ops.o xenbus.o |
diff --git a/drivers/xen/xen-pciback/conf_space.c b/drivers/xen/xen-pciback/conf_space.c index 9e9286d0872e..60111719b01f 100644 --- a/drivers/xen/xen-pciback/conf_space.c +++ b/drivers/xen/xen-pciback/conf_space.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * PCI Backend - Functions for creating a virtual configuration space for | 3 | * PCI Backend - Functions for creating a virtual configuration space for |
| 3 | * exported PCI Devices. | 4 | * exported PCI Devices. |
diff --git a/drivers/xen/xen-pciback/conf_space.h b/drivers/xen/xen-pciback/conf_space.h index 62461a8ba1d6..22db630717ea 100644 --- a/drivers/xen/xen-pciback/conf_space.h +++ b/drivers/xen/xen-pciback/conf_space.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * PCI Backend - Common data structures for overriding the configuration space | 3 | * PCI Backend - Common data structures for overriding the configuration space |
| 3 | * | 4 | * |
diff --git a/drivers/xen/xen-pciback/conf_space_capability.c b/drivers/xen/xen-pciback/conf_space_capability.c index 7f83e9083e9d..73427d8e0116 100644 --- a/drivers/xen/xen-pciback/conf_space_capability.c +++ b/drivers/xen/xen-pciback/conf_space_capability.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * PCI Backend - Handles the virtual fields found on the capability lists | 3 | * PCI Backend - Handles the virtual fields found on the capability lists |
| 3 | * in the configuration space. | 4 | * in the configuration space. |
diff --git a/drivers/xen/xen-pciback/conf_space_header.c b/drivers/xen/xen-pciback/conf_space_header.c index 5b3d57fc82d3..10ae24b5a76e 100644 --- a/drivers/xen/xen-pciback/conf_space_header.c +++ b/drivers/xen/xen-pciback/conf_space_header.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * PCI Backend - Handles the virtual fields in the configuration space headers. | 3 | * PCI Backend - Handles the virtual fields in the configuration space headers. |
| 3 | * | 4 | * |
diff --git a/drivers/xen/xen-pciback/conf_space_quirks.c b/drivers/xen/xen-pciback/conf_space_quirks.c index 7476791cab40..89d9744ece61 100644 --- a/drivers/xen/xen-pciback/conf_space_quirks.c +++ b/drivers/xen/xen-pciback/conf_space_quirks.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * PCI Backend - Handle special overlays for broken devices. | 3 | * PCI Backend - Handle special overlays for broken devices. |
| 3 | * | 4 | * |
diff --git a/drivers/xen/xen-pciback/conf_space_quirks.h b/drivers/xen/xen-pciback/conf_space_quirks.h index cfcc517e4570..d873abe35bf6 100644 --- a/drivers/xen/xen-pciback/conf_space_quirks.h +++ b/drivers/xen/xen-pciback/conf_space_quirks.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * PCI Backend - Data structures for special overlays for broken devices. | 3 | * PCI Backend - Data structures for special overlays for broken devices. |
| 3 | * | 4 | * |
diff --git a/drivers/xen/xen-pciback/passthrough.c b/drivers/xen/xen-pciback/passthrough.c index f16a30e2a110..66e9b814cc86 100644 --- a/drivers/xen/xen-pciback/passthrough.c +++ b/drivers/xen/xen-pciback/passthrough.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * PCI Backend - Provides restricted access to the real PCI bus topology | 3 | * PCI Backend - Provides restricted access to the real PCI bus topology |
| 3 | * to the frontend | 4 | * to the frontend |
diff --git a/drivers/xen/xen-pciback/pciback.h b/drivers/xen/xen-pciback/pciback.h index 7af369b6aaa2..263c059bff90 100644 --- a/drivers/xen/xen-pciback/pciback.h +++ b/drivers/xen/xen-pciback/pciback.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * PCI Backend Common Data Structures & Function Declarations | 3 | * PCI Backend Common Data Structures & Function Declarations |
| 3 | * | 4 | * |
diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c index f8c77751f330..ee2c891b55c6 100644 --- a/drivers/xen/xen-pciback/pciback_ops.c +++ b/drivers/xen/xen-pciback/pciback_ops.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * PCI Backend Operations - respond to PCI requests from Frontend | 3 | * PCI Backend Operations - respond to PCI requests from Frontend |
| 3 | * | 4 | * |
diff --git a/drivers/xen/xen-pciback/vpci.c b/drivers/xen/xen-pciback/vpci.c index c99f8bb1c56c..f6ba18191c0f 100644 --- a/drivers/xen/xen-pciback/vpci.c +++ b/drivers/xen/xen-pciback/vpci.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * PCI Backend - Provides a Virtual PCI bus (with real devices) | 3 | * PCI Backend - Provides a Virtual PCI bus (with real devices) |
| 3 | * to the frontend | 4 | * to the frontend |
diff --git a/drivers/xen/xen-pciback/xenbus.c b/drivers/xen/xen-pciback/xenbus.c index 3814b44bf1f7..581c4e1a8b82 100644 --- a/drivers/xen/xen-pciback/xenbus.c +++ b/drivers/xen/xen-pciback/xenbus.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * PCI Backend Xenbus Setup - handles setup with frontend and xend | 3 | * PCI Backend Xenbus Setup - handles setup with frontend and xend |
| 3 | * | 4 | * |
diff --git a/drivers/xen/xen-selfballoon.c b/drivers/xen/xen-selfballoon.c index a67e955cacd1..55988b8418ee 100644 --- a/drivers/xen/xen-selfballoon.c +++ b/drivers/xen/xen-selfballoon.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /****************************************************************************** | 2 | /****************************************************************************** |
| 2 | * Xen selfballoon driver (and optional frontswap self-shrinking driver) | 3 | * Xen selfballoon driver (and optional frontswap self-shrinking driver) |
| 3 | * | 4 | * |
diff --git a/drivers/xen/xenbus/Makefile b/drivers/xen/xenbus/Makefile index 31e2e9050c7a..0c7532110815 100644 --- a/drivers/xen/xenbus/Makefile +++ b/drivers/xen/xenbus/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | obj-y += xenbus.o | 2 | obj-y += xenbus.o |
| 2 | obj-y += xenbus_dev_frontend.o | 3 | obj-y += xenbus_dev_frontend.o |
| 3 | 4 | ||
diff --git a/drivers/xen/xenbus/xenbus_dev_backend.c b/drivers/xen/xenbus/xenbus_dev_backend.c index 1126701e212e..edba5fecde4d 100644 --- a/drivers/xen/xenbus/xenbus_dev_backend.c +++ b/drivers/xen/xenbus/xenbus_dev_backend.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | 2 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 2 | 3 | ||
| 3 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
diff --git a/drivers/xen/xenfs/xenfs.h b/drivers/xen/xenfs/xenfs.h index 2c5934ea9b1e..cfe4874b83a7 100644 --- a/drivers/xen/xenfs/xenfs.h +++ b/drivers/xen/xenfs/xenfs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef _XENFS_XENBUS_H | 2 | #ifndef _XENFS_XENBUS_H |
| 2 | #define _XENFS_XENBUS_H | 3 | #define _XENFS_XENBUS_H |
| 3 | 4 | ||
diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c index 82fd2a396d96..f59235f9f8a2 100644 --- a/drivers/xen/xenfs/xenstored.c +++ b/drivers/xen/xenfs/xenstored.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/slab.h> | 2 | #include <linux/slab.h> |
| 2 | #include <linux/types.h> | 3 | #include <linux/types.h> |
| 3 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
diff --git a/drivers/xen/xenfs/xensyms.c b/drivers/xen/xenfs/xensyms.c index c6e2b4a542ea..c6c73a33c44d 100644 --- a/drivers/xen/xenfs/xensyms.c +++ b/drivers/xen/xenfs/xensyms.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | #include <linux/init.h> | 2 | #include <linux/init.h> |
| 2 | #include <linux/seq_file.h> | 3 | #include <linux/seq_file.h> |
| 3 | #include <linux/fs.h> | 4 | #include <linux/fs.h> |
diff --git a/drivers/zorro/Makefile b/drivers/zorro/Makefile index 7dc5332ff984..b360ac4ea846 100644 --- a/drivers/zorro/Makefile +++ b/drivers/zorro/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | ||
| 1 | # | 2 | # |
| 2 | # Makefile for the Zorro bus specific drivers. | 3 | # Makefile for the Zorro bus specific drivers. |
| 3 | # | 4 | # |
diff --git a/drivers/zorro/gen-devlist.c b/drivers/zorro/gen-devlist.c index 16fe206f9998..e325c5ce995b 100644 --- a/drivers/zorro/gen-devlist.c +++ b/drivers/zorro/gen-devlist.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Generate devlist.h from the Zorro ID file. | 3 | * Generate devlist.h from the Zorro ID file. |
| 3 | * | 4 | * |
diff --git a/drivers/zorro/names.c b/drivers/zorro/names.c index 83eedddbb794..fa3c83dbe843 100644 --- a/drivers/zorro/names.c +++ b/drivers/zorro/names.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Zorro Device Name Tables | 3 | * Zorro Device Name Tables |
| 3 | * | 4 | * |
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c index 05397305fccd..df05a26ab8d8 100644 --- a/drivers/zorro/proc.c +++ b/drivers/zorro/proc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * Procfs interface for the Zorro bus. | 3 | * Procfs interface for the Zorro bus. |
| 3 | * | 4 | * |
diff --git a/drivers/zorro/zorro.h b/drivers/zorro/zorro.h index 4f805c01cfbc..ac0bab3412d9 100644 --- a/drivers/zorro/zorro.h +++ b/drivers/zorro/zorro.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | 2 | ||
| 2 | #ifdef CONFIG_ZORRO_NAMES | 3 | #ifdef CONFIG_ZORRO_NAMES |
| 3 | extern void zorro_name_device(struct zorro_dev *z); | 4 | extern void zorro_name_device(struct zorro_dev *z); |