Merge 6.3-rc6 into tty-next
[platform/kernel/linux-rpi.git] / drivers / tty / serial / sh-sci.c
index caa09a0..ca31e34 100644 (file)
@@ -1531,15 +1531,12 @@ static struct dma_chan *sci_request_dma_chan(struct uart_port *port,
 
        memset(&cfg, 0, sizeof(cfg));
        cfg.direction = dir;
-       if (dir == DMA_MEM_TO_DEV) {
-               cfg.dst_addr = port->mapbase +
-                       (sci_getreg(port, SCxTDR)->offset << port->regshift);
-               cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
-       } else {
-               cfg.src_addr = port->mapbase +
-                       (sci_getreg(port, SCxRDR)->offset << port->regshift);
-               cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
-       }
+       cfg.dst_addr = port->mapbase +
+               (sci_getreg(port, SCxTDR)->offset << port->regshift);
+       cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
+       cfg.src_addr = port->mapbase +
+               (sci_getreg(port, SCxRDR)->offset << port->regshift);
+       cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
 
        ret = dmaengine_slave_config(chan, &cfg);
        if (ret) {
@@ -1574,7 +1571,7 @@ static void sci_request_dma(struct uart_port *port)
         * Don't request a dma channel if no channel was specified
         * in the device tree.
         */
-       if (!of_find_property(port->dev->of_node, "dmas", NULL))
+       if (!of_property_present(port->dev->of_node, "dmas"))
                return;
 
        chan = sci_request_dma_chan(port, DMA_MEM_TO_DEV);
@@ -3149,7 +3146,7 @@ static int sci_remove(struct platform_device *dev)
 #define SCI_OF_TYPE(data)              ((unsigned long)(data) >> 16)
 #define SCI_OF_REGTYPE(data)           ((unsigned long)(data) & 0xffff)
 
-static const struct of_device_id of_sci_match[] = {
+static const struct of_device_id of_sci_match[] __maybe_unused = {
        /* SoC-specific types */
        {
                .compatible = "renesas,scif-r7s72100",