diff options
author | John Klug <john.klug@multitech.com> | 2020-11-02 13:10:20 -0600 |
---|---|---|
committer | John Klug <john.klug@multitech.com> | 2020-11-02 13:10:20 -0600 |
commit | 07b8de9f8b9a8dd650145d46607dd9aeb4dc02aa (patch) | |
tree | 4d0fc02f582747707b2c272fdb83561562b121c2 /io-module/machine | |
parent | ec753120385b76ac670c0b8fd8968070f84edf8b (diff) | |
download | mts-io-07b8de9f8b9a8dd650145d46607dd9aeb4dc02aa.tar.gz mts-io-07b8de9f8b9a8dd650145d46607dd9aeb4dc02aa.tar.bz2 mts-io-07b8de9f8b9a8dd650145d46607dd9aeb4dc02aa.zip |
Fix conflict between mts-io and mtcdt3b over has-radio attribute4.4.5
Diffstat (limited to 'io-module/machine')
-rw-r--r-- | io-module/machine/mtcpm.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/io-module/machine/mtcpm.c b/io-module/machine/mtcpm.c index dfffef6..4a55127 100644 --- a/io-module/machine/mtcpm.c +++ b/io-module/machine/mtcpm.c @@ -202,7 +202,6 @@ static struct attribute *mtcpm_platform_attributes[] = { &dev_attr_usbhub_reset.attr, &dev_attr_eth_reset.attr, - &dev_attr_has_radio.attr, // radio-reset must be first for mtcdt3 &dev_attr_radio_reset.attr, @@ -214,6 +213,10 @@ static struct attribute *mtcpm_platform_attributes[] = { NULL, }; +static struct attribute *mtcpm_has_radio_attribute[] = { + &dev_attr_has_radio.attr, +}; + static struct attribute *mtcpm_wifi_bt_attributes[] = { &dev_attr_wifi_reset_mtcpm.attr, &dev_attr_bt_reset_mtcpm.attr, @@ -231,12 +234,6 @@ static struct attribute_group mtcpm_platform_attribute_group = { .attrs = mtcpm_platform_attributes }; -static int -is_radio_reset_attr_mtcpm(struct attribute *attr) -{ - return (attr == &dev_attr_radio_power.attr); -}; - static struct attribute *mtcpm_lora_attributes[] = { &dev_attr_lora_eui_mtcpm.attr, &dev_attr_lora_product_id_mtcpm.attr, @@ -296,7 +293,7 @@ static void mts_cpu_dir_delete(void) } static int -is_radio_reset_attr_mtcdt(struct attribute *attr) +is_radio_reset_attr_mtcpm(struct attribute *attr) { return (attr == &dev_attr_radio_reset.attr); } |