Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'

[oweals/u-boot.git] / drivers / spi / andes_spi.c

diff --git a/drivers/spi/andes_spi.c b/drivers/spi/andes_spi.c
index fdde13954b18a0aac466f5e9852637fa65e4c033..82aed75ca187b0dcf2060cb9691965c4b1b243d1 100644 (file)
--- a/drivers/spi/andes_spi.c
+++ b/drivers/spi/andes_spi.c
@@ -4,23 +4,7 @@
  * (C) Copyright 2011 Andes Technology
  * Macpaul Lin <macpaul@andestech.com>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -53,12 +37,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
        if (!spi_cs_is_valid(bus, cs))
                return NULL;
 
-       ds = malloc(sizeof(*ds));
+       ds = spi_alloc_slave(struct andes_spi_slave, bus, cs);
        if (!ds)
                return NULL;
 
-       ds->slave.bus = bus;
-       ds->slave.cs = cs;
        ds->regs = (struct andes_spi_regs *)CONFIG_SYS_SPI_BASE;
 
        /*