Merged TI feature connectivity into ti-linux-5.4.y

TI-Feature: connectivity
TI-Branch: connectivity-ti-linux-5.4.y

* 'connectivity-ti-linux-5.4.y' of ssh://bitbucket.itg.ti.com/lcpdpublicdom/connectivity:
  serial: 8250: pruss: fix overflow in conversion build warning
  net: hsr/prp: fix cppcheck 'warning: Clarify calculation precedence'

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

drivers/tty/serial/8250/8250_pruss.c

@@ -24,10 +24,10 @@
 #define PRUSS_UART_RX_EN	BIT(13)
 #define PRUSS_UART_FREE_RUN	BIT(0)
 
-#define PRUSS_UART_MDR		13
-#define PRUSS_UART_MDR_OSM_SEL	BIT(0)
-#define PRUSS_UART_MDR_16X_MODE	0
-#define PRUSS_UART_MDR_13X_MODE	1
+#define PRUSS_UART_MDR			13
+#define PRUSS_UART_MDR_OSM_SEL_MASK	BIT(0)
+#define PRUSS_UART_MDR_16X_MODE		0
+#define PRUSS_UART_MDR_13X_MODE		1
 
 struct pruss8250_info {
 	struct rproc *pru;
@@ -123,12 +123,12 @@ static void pruss8250_set_divisor(struct uart_port *port, unsigned int baud,
 				  unsigned int quot, unsigned int quot_frac)
 {
 	serial8250_do_set_divisor(port, baud, quot, quot_frac);
-	if (quot_frac == PRUSS_UART_MDR_13X_MODE)
-		/* set mdr for 13x */
-		serial_port_out(port, PRUSS_UART_MDR, PRUSS_UART_MDR_OSM_SEL);
-	else
-		/* set mdr for 16x */
-		serial_port_out(port, PRUSS_UART_MDR, ~PRUSS_UART_MDR_OSM_SEL);
+	/*
+	 * quot_frac holds the MDR over-sampling mode
+	 * which is set in pruss8250_get_divisor()
+	 */
+	quot_frac &= PRUSS_UART_MDR_OSM_SEL_MASK;
+	serial_port_out(port, PRUSS_UART_MDR, quot_frac);
 }
 
 static int pruss8250_probe(struct platform_device *pdev)

net/hsr/hsr_device.c

@@ -636,8 +636,8 @@ static void hsr_change_rx_flags(struct net_device *dev, int change)
 		case HSR_PT_SLAVE_B:
 			if (change & IFF_ALLMULTI)
 				dev_set_allmulti(port->dev,
-						 dev->flags &
-						 IFF_ALLMULTI ? 1 : -1);
+						 (dev->flags &
+						 IFF_ALLMULTI) ? 1 : -1);
 			break;
 		default:
 			break;