mediatek: update v4.19 switch support to latest vendor version

[openwrt/staging/jow.git] / target / linux / mediatek / files-4.19 / drivers / net / phy / mtk / mt753x / mt753x_nl.c

diff --git a/target/linux/mediatek/files-4.19/drivers/net/phy/mtk/mt753x/mt753x_nl.c b/target/linux/mediatek/files-4.19/drivers/net/phy/mtk/mt753x/mt753x_nl.c
index 756df4e21fed5a89c1ddc3e6f216fa6760549355..78aecd34edff4e6170a46148ec199a3f39b71e81 100644 (file)
--- a/target/linux/mediatek/files-4.19/drivers/net/phy/mtk/mt753x/mt753x_nl.c
+++ b/target/linux/mediatek/files-4.19/drivers/net/phy/mtk/mt753x/mt753x_nl.c
@@ -1,11 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * Configuration layer for MediaTek MT753x gigabit switch
- *
- * Copyright (C) 2018 MediaTek Inc. All Rights Reserved.
- *
+ * Copyright (c) 2018 MediaTek Inc.
  * Author: Sirui Zhao <Sirui.Zhao@mediatek.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <linux/types.h>
@@ -17,10 +13,6 @@
 #include "mt753x.h"
 #include "mt753x_nl.h"
 
-#define MT753X_NL_CMD_REQ_ATTRS(attr)          \
-       .required_attrs = attr,                 \
-       .nr_required_attrs = ARRAY_SIZE(attr),
-
 struct mt753x_nl_cmd_item {
        enum mt753x_cmd cmd;
        bool require_dev;
@@ -61,7 +53,6 @@ static const struct genl_ops mt753x_nl_ops[] = {
 };
 
 static struct genl_family mt753x_nl_family = {
-//     .id =           GENL_ID_GENERATE,
        .name =         MT753X_GENL_NAME,
        .version =      MT753X_GENL_VERSION,
        .maxattr =      MT753X_NR_ATTR_TYPE,
@@ -208,7 +199,8 @@ static int mt753x_nl_reply_read(struct genl_info *info, struct gsw_mt753x *gsw)
 {
        struct sk_buff *rep_skb = NULL;
        s32 phy, devad, reg;
-       int ret, value;
+       int value;
+       int ret = 0;
 
        phy = mt753x_nl_get_s32(info, MT753X_ATTR_TYPE_PHY, -1);
        devad = mt753x_nl_get_s32(info, MT753X_ATTR_TYPE_DEVAD, -1);
@@ -252,7 +244,7 @@ static int mt753x_nl_reply_write(struct genl_info *info, struct gsw_mt753x *gsw)
        struct sk_buff *rep_skb = NULL;
        s32 phy, devad, reg;
        u32 value;
-       int ret;
+       int ret = 0;
 
        phy = mt753x_nl_get_s32(info, MT753X_ATTR_TYPE_PHY, -1);
        devad = mt753x_nl_get_s32(info, MT753X_ATTR_TYPE_DEVAD, -1);
@@ -312,12 +304,14 @@ static const struct mt753x_nl_cmd_item mt753x_nl_cmds[] = {
                .cmd = MT753X_CMD_READ,
                .require_dev = true,
                .process = mt753x_nl_reply_read,
-               MT753X_NL_CMD_REQ_ATTRS(mt753x_nl_cmd_read_attrs)
+               .required_attrs = mt753x_nl_cmd_read_attrs,
+               .nr_required_attrs = ARRAY_SIZE(mt753x_nl_cmd_read_attrs),
        }, {
                .cmd = MT753X_CMD_WRITE,
                .require_dev = true,
                .process = mt753x_nl_reply_write,
-               MT753X_NL_CMD_REQ_ATTRS(mt753x_nl_cmd_write_attrs)
+               .required_attrs = mt753x_nl_cmd_write_attrs,
+               .nr_required_attrs = ARRAY_SIZE(mt753x_nl_cmd_write_attrs),
        }
 };