generic: routerboot sysfs: move tag_show_string()

[openwrt/staging/luka.git] / target / linux / generic / files / drivers / platform / mikrotik / rb_hardconfig.c

diff --git a/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c b/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c
index 4bcbb75e6f0218ee60e67ecfe2457606fc1831d5..bef71a0b5ffdfc516f273bef9172cbd15ea52daa 100644 (file)
--- a/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c
+++ b/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c
@@ -310,11 +310,6 @@ static struct hc_hwopt {
        },
 };
 
-static ssize_t hc_tag_show_string(const u8 *pld, u16 pld_len, char *buf)
-{
-       return snprintf(buf, pld_len+1, "%s\n", pld);
-}
-
 static ssize_t hc_tag_show_u32(const u8 *pld, u16 pld_len, char *buf)
 {
        char *out = buf;
@@ -402,15 +397,15 @@ static struct hc_attr {
                .kattr = __ATTR(mac_base, S_IRUSR, hc_attr_show, NULL),
        }, {
                .tag_id = RB_ID_BOARD_PRODUCT_CODE,
-               .tshow = hc_tag_show_string,
+               .tshow = routerboot_tag_show_string,
                .kattr = __ATTR(board_product_code, S_IRUSR, hc_attr_show, NULL),
        }, {
                .tag_id = RB_ID_BIOS_VERSION,
-               .tshow = hc_tag_show_string,
+               .tshow = routerboot_tag_show_string,
                .kattr = __ATTR(booter_version, S_IRUSR, hc_attr_show, NULL),
        }, {
                .tag_id = RB_ID_SERIAL_NUMBER,
-               .tshow = hc_tag_show_string,
+               .tshow = routerboot_tag_show_string,
                .kattr = __ATTR(board_serial, S_IRUSR, hc_attr_show, NULL),
        }, {
                .tag_id = RB_ID_MEMORY_SIZE,
@@ -429,15 +424,15 @@ static struct hc_attr {
                .tshow = NULL,
        }, {
                .tag_id = RB_ID_BOARD_IDENTIFIER,
-               .tshow = hc_tag_show_string,
+               .tshow = routerboot_tag_show_string,
                .kattr = __ATTR(board_identifier, S_IRUSR, hc_attr_show, NULL),
        }, {
                .tag_id = RB_ID_PRODUCT_NAME,
-               .tshow = hc_tag_show_string,
+               .tshow = routerboot_tag_show_string,
                .kattr = __ATTR(product_name, S_IRUSR, hc_attr_show, NULL),
        }, {
                .tag_id = RB_ID_DEFCONF,
-               .tshow = hc_tag_show_string,
+               .tshow = routerboot_tag_show_string,
                .kattr = __ATTR(defconf, S_IRUSR, hc_attr_show, NULL),
        }
 };