* [PATCH net-next 0/4] net: hns: clean up some code style issues
@ 2021-05-14 7:31 Guangbin Huang
2021-05-14 7:31 ` [PATCH net-next 1/4] net: hns: fix the comments style issue Guangbin Huang
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Guangbin Huang @ 2021-05-14 7:31 UTC (permalink / raw)
To: davem, kuba
Cc: netdev, linux-kernel, salil.mehta, lipeng321, tanhuazhong,
huangguangbin2
This patchset clean up some code style issues.
Peng Li (4):
net: hns: fix the comments style issue
net: hns: fix some code style issue about space
net: hns: space required before the open brace '{'
net: hns: remove redundant return int void function
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 2 -
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 3 +-
drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 72 +++++++++++-----------
3 files changed, 37 insertions(+), 40 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH net-next 1/4] net: hns: fix the comments style issue 2021-05-14 7:31 [PATCH net-next 0/4] net: hns: clean up some code style issues Guangbin Huang @ 2021-05-14 7:31 ` Guangbin Huang 2021-05-14 7:31 ` [PATCH net-next 2/4] net: hns: fix some code style issue about space Guangbin Huang ` (3 subsequent siblings) 4 siblings, 0 replies; 6+ messages in thread From: Guangbin Huang @ 2021-05-14 7:31 UTC (permalink / raw) To: davem, kuba Cc: netdev, linux-kernel, salil.mehta, lipeng321, tanhuazhong, huangguangbin2 From: Peng Li <lipeng321@huawei.com> Networking block comments don't use an empty /* line, use /* Comment... This patch fix the comments style issue. Signed-off-by: Peng Li <lipeng321@huawei.com> Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com> --- drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c index f4cf569..de6f051 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c @@ -914,8 +914,7 @@ static int hns_mac_get_info(struct hns_mac_cb *mac_cb) } } else if (is_acpi_node(mac_cb->fw_port)) { ret = hns_mac_register_phy(mac_cb); - /* - * Mac can work well if there is phy or not.If the port don't + /* Mac can work well if there is phy or not.If the port don't * connect with phy, the return value will be ignored. Only * when there is phy but can't find mdio bus, the return value * will be handled. -- 2.7.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next 2/4] net: hns: fix some code style issue about space 2021-05-14 7:31 [PATCH net-next 0/4] net: hns: clean up some code style issues Guangbin Huang 2021-05-14 7:31 ` [PATCH net-next 1/4] net: hns: fix the comments style issue Guangbin Huang @ 2021-05-14 7:31 ` Guangbin Huang 2021-05-14 7:31 ` [PATCH net-next 3/4] net: hns: space required before the open brace '{' Guangbin Huang ` (2 subsequent siblings) 4 siblings, 0 replies; 6+ messages in thread From: Guangbin Huang @ 2021-05-14 7:31 UTC (permalink / raw) To: davem, kuba Cc: netdev, linux-kernel, salil.mehta, lipeng321, tanhuazhong, huangguangbin2 From: Peng Li <lipeng321@huawei.com> Spaces at the start of a line will cause checkpatch warning. This patch replaces the spaces by tab at the start of a line. Signed-off-by: Peng Li <lipeng321@huawei.com> Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com> --- drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 70 +++++++++++----------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c index 325e81d..4f7684a 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c @@ -56,31 +56,31 @@ static u32 dsaf_read_sub(struct dsaf_device *dsaf_dev, u32 reg) } static void hns_dsaf_acpi_ledctrl_by_port(struct hns_mac_cb *mac_cb, u8 op_type, - u32 link, u32 port, u32 act) + u32 link, u32 port, u32 act) { - union acpi_object *obj; - union acpi_object obj_args[3], argv4; + union acpi_object *obj; + union acpi_object obj_args[3], argv4; - obj_args[0].integer.type = ACPI_TYPE_INTEGER; - obj_args[0].integer.value = link; - obj_args[1].integer.type = ACPI_TYPE_INTEGER; - obj_args[1].integer.value = port; - obj_args[2].integer.type = ACPI_TYPE_INTEGER; - obj_args[2].integer.value = act; + obj_args[0].integer.type = ACPI_TYPE_INTEGER; + obj_args[0].integer.value = link; + obj_args[1].integer.type = ACPI_TYPE_INTEGER; + obj_args[1].integer.value = port; + obj_args[2].integer.type = ACPI_TYPE_INTEGER; + obj_args[2].integer.value = act; - argv4.type = ACPI_TYPE_PACKAGE; - argv4.package.count = 3; - argv4.package.elements = obj_args; + argv4.type = ACPI_TYPE_PACKAGE; + argv4.package.count = 3; + argv4.package.elements = obj_args; - obj = acpi_evaluate_dsm(ACPI_HANDLE(mac_cb->dev), - &hns_dsaf_acpi_dsm_guid, 0, op_type, &argv4); - if (!obj) { - dev_warn(mac_cb->dev, "ledctrl fail, link:%d port:%d act:%d!\n", - link, port, act); - return; - } + obj = acpi_evaluate_dsm(ACPI_HANDLE(mac_cb->dev), + &hns_dsaf_acpi_dsm_guid, 0, op_type, &argv4); + if (!obj) { + dev_warn(mac_cb->dev, "ledctrl fail, link:%d port:%d act:%d!\n", + link, port, act); + return; + } - ACPI_FREE(obj); + ACPI_FREE(obj); } static void hns_dsaf_acpi_locate_ledctrl_by_port(struct hns_mac_cb *mac_cb, @@ -151,15 +151,15 @@ static void hns_cpld_set_led(struct hns_mac_cb *mac_cb, int link_status, } static void hns_cpld_set_led_acpi(struct hns_mac_cb *mac_cb, int link_status, - u16 speed, int data) + u16 speed, int data) { - if (!mac_cb) { - pr_err("cpld_led_set mac_cb is null!\n"); - return; - } + if (!mac_cb) { + pr_err("cpld_led_set mac_cb is null!\n"); + return; + } - hns_dsaf_acpi_ledctrl_by_port(mac_cb, HNS_OP_LED_SET_FUNC, - link_status, mac_cb->mac_id, data); + hns_dsaf_acpi_ledctrl_by_port(mac_cb, HNS_OP_LED_SET_FUNC, + link_status, mac_cb->mac_id, data); } static void cpld_led_reset(struct hns_mac_cb *mac_cb) @@ -174,16 +174,16 @@ static void cpld_led_reset(struct hns_mac_cb *mac_cb) static void cpld_led_reset_acpi(struct hns_mac_cb *mac_cb) { - if (!mac_cb) { - pr_err("cpld_led_reset mac_cb is null!\n"); - return; - } + if (!mac_cb) { + pr_err("cpld_led_reset mac_cb is null!\n"); + return; + } - if (mac_cb->media_type != HNAE_MEDIA_TYPE_FIBER) - return; + if (mac_cb->media_type != HNAE_MEDIA_TYPE_FIBER) + return; - hns_dsaf_acpi_ledctrl_by_port(mac_cb, HNS_OP_LED_SET_FUNC, - 0, mac_cb->mac_id, 0); + hns_dsaf_acpi_ledctrl_by_port(mac_cb, HNS_OP_LED_SET_FUNC, + 0, mac_cb->mac_id, 0); } static int cpld_set_led_id(struct hns_mac_cb *mac_cb, -- 2.7.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next 3/4] net: hns: space required before the open brace '{' 2021-05-14 7:31 [PATCH net-next 0/4] net: hns: clean up some code style issues Guangbin Huang 2021-05-14 7:31 ` [PATCH net-next 1/4] net: hns: fix the comments style issue Guangbin Huang 2021-05-14 7:31 ` [PATCH net-next 2/4] net: hns: fix some code style issue about space Guangbin Huang @ 2021-05-14 7:31 ` Guangbin Huang 2021-05-14 7:31 ` [PATCH net-next 4/4] net: hns: remove redundant return int void function Guangbin Huang 2021-05-14 22:20 ` [PATCH net-next 0/4] net: hns: clean up some code style issues patchwork-bot+netdevbpf 4 siblings, 0 replies; 6+ messages in thread From: Guangbin Huang @ 2021-05-14 7:31 UTC (permalink / raw) To: davem, kuba Cc: netdev, linux-kernel, salil.mehta, lipeng321, tanhuazhong, huangguangbin2 From: Peng Li <lipeng321@huawei.com> Add the space required before the open brace '{'. Signed-off-by: Peng Li <lipeng321@huawei.com> Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com> --- drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c index 4f7684a..1eaac89 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c @@ -521,7 +521,7 @@ static phy_interface_t hns_mac_get_phy_if(struct hns_mac_cb *mac_cb) reg = HNS_MAC_HILINK4_REG; else reg = HNS_MAC_HILINK3_REG; - } else{ + } else { if (!HNS_DSAF_IS_DEBUG(mac_cb->dsaf_dev) && mac_id <= 3) reg = HNS_MAC_HILINK4V2_REG; else -- 2.7.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next 4/4] net: hns: remove redundant return int void function 2021-05-14 7:31 [PATCH net-next 0/4] net: hns: clean up some code style issues Guangbin Huang ` (2 preceding siblings ...) 2021-05-14 7:31 ` [PATCH net-next 3/4] net: hns: space required before the open brace '{' Guangbin Huang @ 2021-05-14 7:31 ` Guangbin Huang 2021-05-14 22:20 ` [PATCH net-next 0/4] net: hns: clean up some code style issues patchwork-bot+netdevbpf 4 siblings, 0 replies; 6+ messages in thread From: Guangbin Huang @ 2021-05-14 7:31 UTC (permalink / raw) To: davem, kuba Cc: netdev, linux-kernel, salil.mehta, lipeng321, tanhuazhong, huangguangbin2 From: Peng Li <lipeng321@huawei.com> Void function return statements are not generally useful, so remove the redundant return. Signed-off-by: Peng Li <lipeng321@huawei.com> Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com> --- drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c index c615fbf..75e4ec5 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c @@ -462,8 +462,6 @@ static void hns_ae_adjust_link(struct hnae_handle *handle, int speed, default: break; } - - return; } static void hns_ae_get_ring_bdnum_limit(struct hnae_queue *queue, -- 2.7.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next 0/4] net: hns: clean up some code style issues 2021-05-14 7:31 [PATCH net-next 0/4] net: hns: clean up some code style issues Guangbin Huang ` (3 preceding siblings ...) 2021-05-14 7:31 ` [PATCH net-next 4/4] net: hns: remove redundant return int void function Guangbin Huang @ 2021-05-14 22:20 ` patchwork-bot+netdevbpf 4 siblings, 0 replies; 6+ messages in thread From: patchwork-bot+netdevbpf @ 2021-05-14 22:20 UTC (permalink / raw) To: Guangbin Huang Cc: davem, kuba, netdev, linux-kernel, salil.mehta, lipeng321, tanhuazhong Hello: This series was applied to netdev/net-next.git (refs/heads/master): On Fri, 14 May 2021 15:31:38 +0800 you wrote: > This patchset clean up some code style issues. > > Peng Li (4): > net: hns: fix the comments style issue > net: hns: fix some code style issue about space > net: hns: space required before the open brace '{' > net: hns: remove redundant return int void function > > [...] Here is the summary with links: - [net-next,1/4] net: hns: fix the comments style issue https://git.kernel.org/netdev/net-next/c/699e803e9a4d - [net-next,2/4] net: hns: fix some code style issue about space https://git.kernel.org/netdev/net-next/c/510fe8e70b0b - [net-next,3/4] net: hns: space required before the open brace '{' https://git.kernel.org/netdev/net-next/c/5caab55a2979 - [net-next,4/4] net: hns: remove redundant return int void function https://git.kernel.org/netdev/net-next/c/cb0672697601 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-05-14 22:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-14 7:31 [PATCH net-next 0/4] net: hns: clean up some code style issues Guangbin Huang
2021-05-14 7:31 ` [PATCH net-next 1/4] net: hns: fix the comments style issue Guangbin Huang
2021-05-14 7:31 ` [PATCH net-next 2/4] net: hns: fix some code style issue about space Guangbin Huang
2021-05-14 7:31 ` [PATCH net-next 3/4] net: hns: space required before the open brace '{' Guangbin Huang
2021-05-14 7:31 ` [PATCH net-next 4/4] net: hns: remove redundant return int void function Guangbin Huang
2021-05-14 22:20 ` [PATCH net-next 0/4] net: hns: clean up some code style issues patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).