summaryrefslogtreecommitdiff
path: root/drivers/spi/mpc8xxx_spi.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-03-20 14:55:10 -0400
committerTom Rini <trini@ti.com>2013-03-20 14:55:10 -0400
commit8b906a9f0b3fd0d4421e08c4fa62f61a01289611 (patch)
tree049acc34fee9692c0c394b8d1697d97257c0a074 /drivers/spi/mpc8xxx_spi.c
parent3c47f2f4871c345c20b9d986b11fec550ef6cc9f (diff)
parent1e7133e99e27c4f02998e7eb87fa43424d48152b (diff)
downloadu-boot-imx-8b906a9f0b3fd0d4421e08c4fa62f61a01289611.zip
u-boot-imx-8b906a9f0b3fd0d4421e08c4fa62f61a01289611.tar.gz
u-boot-imx-8b906a9f0b3fd0d4421e08c4fa62f61a01289611.tar.bz2
Merge branch 'spi' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/spi/mpc8xxx_spi.c')
-rw-r--r--drivers/spi/mpc8xxx_spi.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index 4e46041..6b0e3b4 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -45,13 +45,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
if (!spi_cs_is_valid(bus, cs))
return NULL;
- slave = malloc(sizeof(struct spi_slave));
+ slave = spi_alloc_slave_base(bus, cs);
if (!slave)
return NULL;
- slave->bus = bus;
- slave->cs = cs;
-
/*
* TODO: Some of the code in spi_init() should probably move
* here, or into spi_claim_bus() below.