projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dm-9oct18' of git://git.denx.de/u-boot-dm
[platform/kernel/u-boot.git]
/
drivers
/
spi
/
spi-uclass.c
diff --git
a/drivers/spi/spi-uclass.c
b/drivers/spi/spi-uclass.c
index
15d90a5
..
b84255b
100644
(file)
--- a/
drivers/spi/spi-uclass.c
+++ b/
drivers/spi/spi-uclass.c
@@
-1,7
+1,6
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (c) 2014 Google, Inc
/*
* Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-64,11
+63,11
@@
int dm_spi_claim_bus(struct udevice *dev)
int ret = spi_set_speed_mode(bus, speed, slave->mode);
if (ret)
int ret = spi_set_speed_mode(bus, speed, slave->mode);
if (ret)
- return
ret
;
+ return
log_ret(ret)
;
slave->speed = speed;
}
slave->speed = speed;
}
- return
ops->claim_bus ? ops->claim_bus(dev) : 0
;
+ return
log_ret(ops->claim_bus ? ops->claim_bus(dev) : 0)
;
}
void dm_spi_release_bus(struct udevice *dev)
}
void dm_spi_release_bus(struct udevice *dev)
@@
-93,7
+92,7
@@
int dm_spi_xfer(struct udevice *dev, unsigned int bitlen,
int spi_claim_bus(struct spi_slave *slave)
{
int spi_claim_bus(struct spi_slave *slave)
{
- return
dm_spi_claim_bus(slave->dev
);
+ return
log_ret(dm_spi_claim_bus(slave->dev)
);
}
void spi_release_bus(struct spi_slave *slave)
}
void spi_release_bus(struct spi_slave *slave)
@@
-274,7
+273,7
@@
int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
bool created = false;
int ret;
bool created = false;
int ret;
-#if CONFIG_IS_ENABLED(OF_PLATDATA)
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
|| CONFIG_IS_ENABLED(OF_PRIOR_STAGE)
ret = uclass_first_device_err(UCLASS_SPI, &bus);
#else
ret = uclass_get_device_by_seq(UCLASS_SPI, busnum, &bus);
ret = uclass_first_device_err(UCLASS_SPI, &bus);
#else
ret = uclass_get_device_by_seq(UCLASS_SPI, busnum, &bus);