The io_state variable in the vga_arb_write() function is declared with
unsigned int type, while the vga_str_to_iostate() function takes int *
type. To keep them consistent, replace the third argument of
vga_str_to_iostate() function with the unsigned int * type.
Signed-off-by: Sui Jingfeng <[email protected]>
---
drivers/pci/vgaarb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index 5a696078b382..c1bc6c983932 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -77,7 +77,7 @@ static const char *vga_iostate_to_str(unsigned int iostate)
return "none";
}
-static int vga_str_to_iostate(char *buf, int str_size, int *io_state)
+static int vga_str_to_iostate(char *buf, int str_size, unsigned int *io_state)
{
/* we could in theory hand out locks on IO and mem
* separately to userspace but it can cause deadlocks */
--
2.25.1
Per Documentation/process/license-rules.rst, the SPDX MIT identifier is
equivalent to including the entire MIT license text from
LICENSES/preferred/MIT.
Replace the MIT license text with the equivalent SPDX identifier.
Signed-off-by: Sui Jingfeng <[email protected]>
---
include/linux/vgaarb.h | 30 +-----------------------------
1 file changed, 1 insertion(+), 29 deletions(-)
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index 6d5465f8c3f2..341245205e1c 100644
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -1,32 +1,4 @@
-/*
- * The VGA aribiter manages VGA space routing and VGA resource decode to
- * allow multiple VGA devices to be used in a system in a safe way.
- *
- * (C) Copyright 2005 Benjamin Herrenschmidt <[email protected]>
- * (C) Copyright 2007 Paulo R. Zanoni <[email protected]>
- * (C) Copyright 2007, 2009 Tiago Vignatti <[email protected]>
- *
- * 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 (including the next
- * paragraph) 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
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- */
+/* SPDX-License-Identifier: MIT */
#ifndef LINUX_VGA_H
#define LINUX_VGA_H
--
2.25.1
Hi,
On 2023/6/9 18:58, Jani Nikula wrote:
> On Fri, 09 Jun 2023, Sui Jingfeng <[email protected]> wrote:
>> Per Documentation/process/license-rules.rst, the SPDX MIT identifier is
>> equivalent to including the entire MIT license text from
>> LICENSES/preferred/MIT.
>>
>> Replace the MIT license text with the equivalent SPDX identifier.
>>
>> Signed-off-by: Sui Jingfeng <[email protected]>
>> ---
>> include/linux/vgaarb.h | 30 +-----------------------------
>> 1 file changed, 1 insertion(+), 29 deletions(-)
>>
>> diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
>> index 6d5465f8c3f2..341245205e1c 100644
>> --- a/include/linux/vgaarb.h
>> +++ b/include/linux/vgaarb.h
>> @@ -1,32 +1,4 @@
>> -/*
>> - * The VGA aribiter manages VGA space routing and VGA resource decode to
>> - * allow multiple VGA devices to be used in a system in a safe way.
> Why is this being removed?
>
>> - *
>> - * (C) Copyright 2005 Benjamin Herrenschmidt <[email protected]>
>> - * (C) Copyright 2007 Paulo R. Zanoni <[email protected]>
>> - * (C) Copyright 2007, 2009 Tiago Vignatti <[email protected]>
> Replacing the license text with SPDX is fine, removing copyright notices
> is not.
Sorry, I'm mindless
I should keep the copyright notices(original authors) there.
I will respin this patch. Thanks for pointed out.
> BR,
> Jani.
>
>> - *
>> - * 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 (including the next
>> - * paragraph) 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
>> - * THE AUTHORS OR COPYRIGHT HOLDERS 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.
>> - *
>> - */
>> +/* SPDX-License-Identifier: MIT */
>>
>> #ifndef LINUX_VGA_H
>> #define LINUX_VGA_H
--
Jingfeng
On Fri, 09 Jun 2023, Sui Jingfeng <[email protected]> wrote:
> Per Documentation/process/license-rules.rst, the SPDX MIT identifier is
> equivalent to including the entire MIT license text from
> LICENSES/preferred/MIT.
>
> Replace the MIT license text with the equivalent SPDX identifier.
>
> Signed-off-by: Sui Jingfeng <[email protected]>
> ---
> include/linux/vgaarb.h | 30 +-----------------------------
> 1 file changed, 1 insertion(+), 29 deletions(-)
>
> diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
> index 6d5465f8c3f2..341245205e1c 100644
> --- a/include/linux/vgaarb.h
> +++ b/include/linux/vgaarb.h
> @@ -1,32 +1,4 @@
> -/*
> - * The VGA aribiter manages VGA space routing and VGA resource decode to
> - * allow multiple VGA devices to be used in a system in a safe way.
Why is this being removed?
> - *
> - * (C) Copyright 2005 Benjamin Herrenschmidt <[email protected]>
> - * (C) Copyright 2007 Paulo R. Zanoni <[email protected]>
> - * (C) Copyright 2007, 2009 Tiago Vignatti <[email protected]>
Replacing the license text with SPDX is fine, removing copyright notices
is not.
BR,
Jani.
> - *
> - * 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 (including the next
> - * paragraph) 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
> - * THE AUTHORS OR COPYRIGHT HOLDERS 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.
> - *
> - */
> +/* SPDX-License-Identifier: MIT */
>
> #ifndef LINUX_VGA_H
> #define LINUX_VGA_H
--
Jani Nikula, Intel Open Source Graphics Center