Merge branch 'tpm' of git://git.denx.de/u-boot-x86

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

diff --git a/drivers/spi/bfin_spi.c b/drivers/spi/bfin_spi.c
index 213e79281aca3ddb8f24841927c4a890a3181aaa..ab2e8b998bbf0ff1e089abf6e4f5aa740fa39593 100644 (file)
--- a/drivers/spi/bfin_spi.c
+++ b/drivers/spi/bfin_spi.c
@@ -182,12 +182,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
                default: return NULL;
        }
 
-       bss = malloc(sizeof(*bss));
+       bss = spi_alloc_slave(struct bfin_spi_slave, bus, cs);
        if (!bss)
                return NULL;
 
-       bss->slave.bus = bus;
-       bss->slave.cs = cs;
        bss->mmr_base = (void *)mmr_base;
        bss->ctl = SPE | MSTR | TDBR_CORE;
        if (mode & SPI_CPHA) bss->ctl |= CPHA;
@@ -197,7 +195,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
        spi_set_speed(&bss->slave, max_hz);
 
        debug("%s: bus:%i cs:%i mmr:%x ctl:%x baud:%i flg:%i\n", __func__,
-               bus, cs, mmr_base, bss->ctl, baud, bss->flg);
+               bus, cs, mmr_base, bss->ctl, bss->baud, bss->flg);
 
        return &bss->slave;
 }