drivers/char/agp/hp-agp.c - mismatch between SPDX and MODULE_LICENSE

From: Joe Perches
Date: Thu Oct 29 2020 - 14:19:12 EST


(SPDX mismatches found using this grep)

$ git grep --name-only 'MODULE_LICENSE("GPL and add' -- '*.c' | xargs grep SPDX
drivers/char/agp/hp-agp.c:// SPDX-License-Identifier: GPL-2.0-only
drivers/dma-buf/selftest.c:/* SPDX-License-Identifier: MIT */
drivers/gpu/drm/ttm/ttm_module.c:/* SPDX-License-Identifier: GPL-2.0 OR MIT */
drivers/gpu/drm/vboxvideo/vbox_drv.c:// SPDX-License-Identifier: MIT
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c:// SPDX-License-Identifier: GPL-2.0 OR MIT

Back in 2003, the (fullhist) commit below perhaps inappropriately
removed license text that allowed arbitrary changes to source
code while adding 'MODULE_LICENSE("GPL and additional rights");'

Today, the license for this file is:

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

So there is a mismatch between the SPDX identifier and the
MODULE_LICENSE in the file.

So the SPDX identifier now seems inappropriate.
Perhaps that can be rectified somehow...

commit 229f2fcdfa1377fb20174e6990460d8c60d33ada
Author: Dave Jones <davej@xxxxxxxxxxxxxxxxx>
Date: Tue Dec 3 01:22:23 2002 -0100

rework as per Linus' suggestion. Chipset drivers are now seperate modules
that use the pci driver interfaces, and register with the agpgart backend.
---
drivers/char/agp/hp-agp.c | 98 ++++++++++++++++++++++++++++++++---------------
1 file changed, 67 insertions(+), 31 deletions(-)

diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index b1911f1dce7a..a733f38a3928 100644
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -1,29 +1,5 @@
/*
- * AGPGART module version 0.99
- * Copyright (C) 1999 Jeff Hartmann
- * Copyright (C) 1999 Precision Insight, Inc.
- * Copyright (C) 1999 Xi Graphics, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * JEFF HARTMANN, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.