Skip to contentSkip to conversation

gemalto: radio-settings: cleanup

PATCH Applied Sergey Matyukevich 2 participants 2 messages Jul 23, 2021 – Jul 27, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gemalto: radio-settings: cleanup

Enum ofono_radio_access_mode has been replaced by unsigned int. This change allows to move handling of all the modes into 'switch' in the function gemalto_set_rat_mode.

---
 drivers/gemaltomodem/radio-settings.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/gemaltomodem/radio-settings.c +6 -9
index 738a6908..50764f83 100644
@@ -171,21 +171,18 @@ static void gemalto_set_rat_mode(struct ofono_radio_settings *rs,
 	case OFONO_RADIO_ACCESS_MODE_LTE:
 		val = 3;
 		break;
-	}
-
-	if (m == (OFONO_RADIO_ACCESS_MODE_UMTS|OFONO_RADIO_ACCESS_MODE_GSM)) {
+	case OFONO_RADIO_ACCESS_MODE_UMTS|OFONO_RADIO_ACCESS_MODE_GSM:
 		val = 1;
 		p1 = 2;
-	}
-
-	if (m == (OFONO_RADIO_ACCESS_MODE_LTE|OFONO_RADIO_ACCESS_MODE_UMTS)) {
+		break;
+	case OFONO_RADIO_ACCESS_MODE_LTE|OFONO_RADIO_ACCESS_MODE_UMTS:
 		val = 4;
 		p1 = 3;
-	}
-
-	if (m == (OFONO_RADIO_ACCESS_MODE_LTE|OFONO_RADIO_ACCESS_MODE_GSM)) {
+		break;
+	case OFONO_RADIO_ACCESS_MODE_LTE|OFONO_RADIO_ACCESS_MODE_GSM:
 		val = 5;
 		p1 = 3;
+		break;
 	}
 
 	if (val == 6)
Signature · 1 line
2.32.0
#1 lore raw

Hi Sergey,

Quoted 7 lines · Sergey Matyukevich

Enum ofono_radio_access_mode has been replaced by unsigned int. This change allows to move handling of all the modes into 'switch' in the function gemalto_set_rat_mode.

---
  drivers/gemaltomodem/radio-settings.c | 15 ++++++---------
  1 file changed, 6 insertions(+), 9 deletions(-)

Applied, thanks.

Regards,
-Denis