summaryrefslogtreecommitdiff
path: root/chip/mchp/gpspi.c
diff options
context:
space:
mode:
Diffstat (limited to 'chip/mchp/gpspi.c')
-rw-r--r--chip/mchp/gpspi.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/chip/mchp/gpspi.c b/chip/mchp/gpspi.c
index c92813b300..0142fe0e3c 100644
--- a/chip/mchp/gpspi.c
+++ b/chip/mchp/gpspi.c
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
@@ -20,7 +20,7 @@
#include "tfdp_chip.h"
#define CPUTS(outstr) cputs(CC_SPI, outstr)
-#define CPRINTS(format, args...) cprints(CC_SPI, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_SPI, format, ##args)
#define SPI_BYTE_TRANSFER_TIMEOUT_US (3 * MSEC)
/* One byte at 12 MHz full duplex = 0.67 us */
@@ -91,8 +91,8 @@ static int gpspi_tx(const int ctrl, const uint8_t *txdata, int txlen)
#endif
int gpspi_transaction_async(const struct spi_device_t *spi_device,
- const uint8_t *txdata, int txlen,
- uint8_t *rxdata, int rxlen)
+ const uint8_t *txdata, int txlen, uint8_t *rxdata,
+ int rxlen)
{
int hw_port, ctrl;
int ret = EC_SUCCESS;
@@ -232,7 +232,6 @@ int gpspi_enable(int hw_port, int enable)
ctrl = (uint32_t)hw_port & 0x0f;
if (enable) {
-
if (ctrl)
MCHP_PCR_SLP_DIS_DEV(MCHP_PCR_GPSPI1);
else