spi: cf_qspi: Use DIV_ROUND_UP at appropriate place

[u-boot.git] / drivers / spi / cf_qspi.c

diff --git a/drivers/spi/cf_qspi.c b/drivers/spi/cf_qspi.c
index 72dd1a520db822ca7a936e111fe4e84311d75dd1..06bcf91a4aa3e6a7d346e7885592af441261d63f 100644 (file)
--- a/drivers/spi/cf_qspi.c
+++ b/drivers/spi/cf_qspi.c
@@ -120,13 +120,11 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
        if (!spi_cs_is_valid(bus, cs))
                return NULL;
 
-       dev = malloc(sizeof(struct cf_qspi_slave));
+       dev = spi_alloc_slave(struct cf_qspi_slave, bus, cs);
        if (!dev)
                return NULL;
 
        /* Initialize to known value */
-       dev->slave.bus = bus;
-       dev->slave.cs  = cs;
        dev->regs      = (qspi_t *)MMAP_QSPI;
        dev->qmr       = 0;
        dev->qwr       = 0;
@@ -173,7 +171,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
        volatile qspi_t *qspi = dev->regs;
        u8 *txbuf = (u8 *)dout;
        u8 *rxbuf = (u8 *)din;
-       u32 count = ((bitlen / 8) + (bitlen % 8 ? 1 : 0));
+       u32 count = DIV_ROUND_UP(bitlen, 8);
        u32 n, i = 0;
 
        /* Sanitize arguments */