All drivers should have SPDX on the first line of the source
files in the format
/* SPDX-License-Identifier: ...
Several files used minor modifications which were inconsistent
with the pattern. Fix it to make scanning tools easier.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
drivers/bus/fslmc/qbman/include/fsl_qbman_debug.h | 6 +++---
drivers/bus/fslmc/qbman/qbman_debug.c | 5 ++---
drivers/crypto/dpaa2_sec/hw/desc/pdcp.h | 4 +---
drivers/event/dpaa2/dpaa2_eventdev.h | 7 ++-----
drivers/event/dpaa2/dpaa2_eventdev_logs.h | 3 +--
drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h | 3 +--
drivers/net/dpaa2/dpaa2_pmd_logs.h | 3 +--
drivers/net/mvpp2/mrvl_mtr.c | 3 +--
8 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/drivers/bus/fslmc/qbman/include/fsl_qbman_debug.h
b/drivers/bus/fslmc/qbman/include/fsl_qbman_debug.h
index 072ad551c548..653946cff9a0 100644
--- a/drivers/bus/fslmc/qbman/include/fsl_qbman_debug.h
+++ b/drivers/bus/fslmc/qbman/include/fsl_qbman_debug.h
@@ -1,7 +1,7 @@
-/* Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
*/
+
struct qbman_swp;
struct qbman_fq_query_np_rslt {
diff --git a/drivers/bus/fslmc/qbman/qbman_debug.c
b/drivers/bus/fslmc/qbman/qbman_debug.c
index 591673abc76e..30fbdaac9398 100644
--- a/drivers/bus/fslmc/qbman/qbman_debug.c
+++ b/drivers/bus/fslmc/qbman/qbman_debug.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
*/
#include "compat.h"
diff --git a/drivers/crypto/dpaa2_sec/hw/desc/pdcp.h
b/drivers/crypto/dpaa2_sec/hw/desc/pdcp.h
index 719ef605fdc4..fee844100532 100644
--- a/drivers/crypto/dpaa2_sec/hw/desc/pdcp.h
+++ b/drivers/crypto/dpaa2_sec/hw/desc/pdcp.h
@@ -1,7 +1,5 @@
-/*
+/* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0+
* Copyright 2008-2013 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: BSD-3-Clause or GPL-2.0+
*/
#ifndef __DESC_PDCP_H__
diff --git a/drivers/event/dpaa2/dpaa2_eventdev.h
b/drivers/event/dpaa2/dpaa2_eventdev.h
index c847b3eab5e4..bdac1aa5628a 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev.h
+++ b/drivers/event/dpaa2/dpaa2_eventdev.h
@@ -1,8 +1,5 @@
-/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Copyright 2017 NXP
- *
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2017 NXP
*/
#ifndef __DPAA2_EVENTDEV_H__
diff --git a/drivers/event/dpaa2/dpaa2_eventdev_logs.h
b/drivers/event/dpaa2/dpaa2_eventdev_logs.h
index a2c2060cfb18..86f2e5393d5a 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev_logs.h
+++ b/drivers/event/dpaa2/dpaa2_eventdev_logs.h
@@ -1,5 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2018 NXP
*/
diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
index c79b3d1cfc9a..986264319623 100644
--- a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
+++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
@@ -1,5 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2017 NXP
*/
diff --git a/drivers/net/dpaa2/dpaa2_pmd_logs.h
b/drivers/net/dpaa2/dpaa2_pmd_logs.h
index c04babdb4d30..c47ba8e10bfc 100644
--- a/drivers/net/dpaa2/dpaa2_pmd_logs.h
+++ b/drivers/net/dpaa2/dpaa2_pmd_logs.h
@@ -1,5 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2017 NXP
*/
diff --git a/drivers/net/mvpp2/mrvl_mtr.c b/drivers/net/mvpp2/mrvl_mtr.c
index 9adcd9751bcb..39272acea457 100644
--- a/drivers/net/mvpp2/mrvl_mtr.c
+++ b/drivers/net/mvpp2/mrvl_mtr.c
@@ -1,5 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2018 Marvell International Ltd.
* Copyright(c) 2018 Semihalf.
* All rights reserved.
--
2.20.1
