2021-03-30 06:50:47

by fanghao (A)

[permalink] [raw]
Subject: [PATCH] irqchip/hisi: Use the correct HiSilicon copyright

s/Hisilicon/HiSilicon/
It should use capital S, according to
https://www.hisilicon.com/en/terms-of-use.

Signed-off-by: Hao Fang <[email protected]>
---
drivers/irqchip/irq-hip04.c | 4 ++--
drivers/irqchip/irq-mbigen.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/irqchip/irq-hip04.c b/drivers/irqchip/irq-hip04.c
index a6ed877..058ebae 100644
--- a/drivers/irqchip/irq-hip04.c
+++ b/drivers/irqchip/irq-hip04.c
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * Hisilicon HiP04 INTC
+ * HiSilicon HiP04 INTC
*
* Copyright (C) 2002-2014 ARM Limited.
- * Copyright (c) 2013-2014 Hisilicon Ltd.
+ * Copyright (c) 2013-2014 HiSilicon Ltd.
* Copyright (c) 2013-2014 Linaro Ltd.
*
* Interrupt architecture for the HIP04 INTC:
diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c
index ff7627b..2cb45c6 100644
--- a/drivers/irqchip/irq-mbigen.c
+++ b/drivers/irqchip/irq-mbigen.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * Copyright (C) 2015 Hisilicon Limited, All Rights Reserved.
+ * Copyright (C) 2015 HiSilicon Limited, All Rights Reserved.
* Author: Jun Ma <[email protected]>
* Author: Yun Wu <[email protected]>
*/
@@ -390,4 +390,4 @@ module_platform_driver(mbigen_platform_driver);
MODULE_AUTHOR("Jun Ma <[email protected]>");
MODULE_AUTHOR("Yun Wu <[email protected]>");
MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Hisilicon MBI Generator driver");
+MODULE_DESCRIPTION("HiSilicon MBI Generator driver");
--
2.8.1


2021-04-07 20:58:20

by Marc Zyngier

[permalink] [raw]
Subject: Re: [PATCH] irqchip/hisi: Use the correct HiSilicon copyright

On Tue, 30 Mar 2021 14:46:20 +0800, Hao Fang wrote:
> s/Hisilicon/HiSilicon/
> It should use capital S, according to
> https://www.hisilicon.com/en/terms-of-use.

Applied to irq/irqchip-next, thanks!

[1/1] irqchip/hisi: Use the correct HiSilicon copyright
commit: 64ec2ad3b84d43926e618bb515f2382c266535ee

Cheers,

M.
--
Without deviation from the norm, progress is not possible.


Subject: [irqchip: irq/irqchip-next] irqchip/hisi: Use the correct HiSilicon copyright

The following commit has been merged into the irq/irqchip-next branch of irqchip:

Commit-ID: 64ec2ad3b84d43926e618bb515f2382c266535ee
Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/64ec2ad3b84d43926e618bb515f2382c266535ee
Author: Hao Fang <[email protected]>
AuthorDate: Tue, 30 Mar 2021 14:46:20 +08:00
Committer: Marc Zyngier <[email protected]>
CommitterDate: Wed, 07 Apr 2021 13:25:52 +01:00

irqchip/hisi: Use the correct HiSilicon copyright

s/Hisilicon/HiSilicon/
It should use capital S, according to
https://www.hisilicon.com/en/terms-of-use.

Signed-off-by: Hao Fang <[email protected]>
Signed-off-by: Marc Zyngier <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
drivers/irqchip/irq-hip04.c | 4 ++--
drivers/irqchip/irq-mbigen.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/irqchip/irq-hip04.c b/drivers/irqchip/irq-hip04.c
index a6ed877..058ebae 100644
--- a/drivers/irqchip/irq-hip04.c
+++ b/drivers/irqchip/irq-hip04.c
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * Hisilicon HiP04 INTC
+ * HiSilicon HiP04 INTC
*
* Copyright (C) 2002-2014 ARM Limited.
- * Copyright (c) 2013-2014 Hisilicon Ltd.
+ * Copyright (c) 2013-2014 HiSilicon Ltd.
* Copyright (c) 2013-2014 Linaro Ltd.
*
* Interrupt architecture for the HIP04 INTC:
diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c
index ff7627b..2cb45c6 100644
--- a/drivers/irqchip/irq-mbigen.c
+++ b/drivers/irqchip/irq-mbigen.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * Copyright (C) 2015 Hisilicon Limited, All Rights Reserved.
+ * Copyright (C) 2015 HiSilicon Limited, All Rights Reserved.
* Author: Jun Ma <[email protected]>
* Author: Yun Wu <[email protected]>
*/
@@ -390,4 +390,4 @@ module_platform_driver(mbigen_platform_driver);
MODULE_AUTHOR("Jun Ma <[email protected]>");
MODULE_AUTHOR("Yun Wu <[email protected]>");
MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Hisilicon MBI Generator driver");
+MODULE_DESCRIPTION("HiSilicon MBI Generator driver");