cfi_flash: Fix spacing around casts/operators

[u-boot] / drivers / spi / mvebu_a3700_spi.c

diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c
index 7c58c3661fa2c06cf35894df811a2803fde017ed..d1708a8d56c8a18564efaaff87905d9abd93218c 100644 (file)
--- a/drivers/spi/mvebu_a3700_spi.c
+++ b/drivers/spi/mvebu_a3700_spi.c
@@ -95,8 +95,9 @@ static int spi_legacy_shift_byte(struct spi_reg *reg, unsigned int bytelen,
        din_8 = din;
 
        while (bytelen) {
-               ret = wait_for_bit(__func__, &reg->ctrl,
-                                  MVEBU_SPI_A3700_XFER_RDY, true, 100, false);
+               ret = wait_for_bit_le32(&reg->ctrl,
+                                       MVEBU_SPI_A3700_XFER_RDY,
+                                       true,100, false);
                if (ret)
                        return ret;
 
@@ -109,9 +110,9 @@ static int spi_legacy_shift_byte(struct spi_reg *reg, unsigned int bytelen,
                writel(pending_dout, &reg->dout);
 
                if (din) {
-                       ret = wait_for_bit(__func__, &reg->ctrl,
-                                          MVEBU_SPI_A3700_XFER_RDY,
-                                          true, 100, false);
+                       ret = wait_for_bit_le32(&reg->ctrl,
+                                               MVEBU_SPI_A3700_XFER_RDY,
+                                               true, 100, false);
                        if (ret)
                                return ret;
 
@@ -160,8 +161,9 @@ static int mvebu_spi_xfer(struct udevice *dev, unsigned int bitlen,
 
        /* Deactivate CS */
        if (flags & SPI_XFER_END) {
-               ret = wait_for_bit(__func__, &reg->ctrl,
-                                  MVEBU_SPI_A3700_XFER_RDY, true, 100, false);
+               ret = wait_for_bit_le32(&reg->ctrl,
+                                       MVEBU_SPI_A3700_XFER_RDY,
+                                       true, 100, false);
                if (ret)
                        return ret;
 
@@ -231,8 +233,8 @@ static int mvebu_spi_probe(struct udevice *bus)
        /* Flush read/write FIFO */
        data = readl(&reg->cfg);
        writel(data | MVEBU_SPI_A3700_FIFO_FLUSH, &reg->cfg);
-       ret = wait_for_bit(__func__, &reg->cfg, MVEBU_SPI_A3700_FIFO_FLUSH,
-                          false, 1000, false);
+       ret = wait_for_bit_le32(&reg->cfg, MVEBU_SPI_A3700_FIFO_FLUSH,
+                               false, 1000, false);
        if (ret)
                return ret;
 
@@ -251,7 +253,7 @@ static int mvebu_spi_ofdata_to_platdata(struct udevice *bus)
 {
        struct mvebu_spi_platdata *plat = dev_get_platdata(bus);
 
-       plat->spireg = (struct spi_reg *)dev_get_addr(bus);
+       plat->spireg = (struct spi_reg *)devfdt_get_addr(bus);
 
        /*
         * FIXME
@@ -261,9 +263,9 @@ static int mvebu_spi_ofdata_to_platdata(struct udevice *bus)
         * it should be used to read the input clock and the DT property
         * can be removed.
         */
-       plat->clock = fdtdec_get_int(gd->fdt_blob, bus->of_offset,
+       plat->clock = fdtdec_get_int(gd->fdt_blob, dev_of_offset(bus),
                                     "clock-frequency", 160000);
-       plat->frequency = fdtdec_get_int(gd->fdt_blob, bus->of_offset,
+       plat->frequency = fdtdec_get_int(gd->fdt_blob, dev_of_offset(bus),
                                         "spi-max-frequency", 40000);
 
        return 0;