evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

p54spi: return status of p54spi_wakeup

Browse source 
Return whether wakeup operation succeeded.
Make use of this return value.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Max Filippov 2009-05-18 03:02:33 +04:00 • committed by John W. Linville
parent 69712e926b
commit 465b63537f
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/net/wireless/p54/p54spi.c
View file

@ -325,7 +325,7 @@ static inline void p54spi_int_ack(struct p54s_priv *priv, u32 val)
p54spi_write32(priv, SPI_ADRS_HOST_INT_ACK, cpu_to_le32(val)); p54spi_write32(priv, SPI_ADRS_HOST_INT_ACK, cpu_to_le32(val));
} }
static void p54spi_wakeup(struct p54s_priv *priv) static int p54spi_wakeup(struct p54s_priv *priv)
{ {
/* wake the chip */ /* wake the chip */
p54spi_write32(priv, SPI_ADRS_ARM_INTERRUPTS, p54spi_write32(priv, SPI_ADRS_ARM_INTERRUPTS,
@ -335,13 +335,11 @@ static void p54spi_wakeup(struct p54s_priv *priv)
if (!p54spi_wait_bit(priv, SPI_ADRS_HOST_INTERRUPTS, if (!p54spi_wait_bit(priv, SPI_ADRS_HOST_INTERRUPTS,
cpu_to_le32(SPI_HOST_INT_READY))) { cpu_to_le32(SPI_HOST_INT_READY))) {
dev_err(&priv->spi->dev, "INT_READY timeout\n"); dev_err(&priv->spi->dev, "INT_READY timeout\n");
goto out; return -EBUSY;
} }
p54spi_int_ack(priv, SPI_HOST_INT_READY); p54spi_int_ack(priv, SPI_HOST_INT_READY);
return 0;
out:
return;
} }
static inline void p54spi_sleep(struct p54s_priv *priv) static inline void p54spi_sleep(struct p54s_priv *priv)
@ -374,7 +372,8 @@ static int p54spi_rx(struct p54s_priv *priv)
struct sk_buff *skb; struct sk_buff *skb;
u16 len; u16 len;
p54spi_wakeup(priv); if (p54spi_wakeup(priv) < 0)
return -EBUSY;
/* dummy read to flush SPI DMA controller bug */ /* dummy read to flush SPI DMA controller bug */
p54spi_read16(priv, SPI_ADRS_GEN_PURP_1); p54spi_read16(priv, SPI_ADRS_GEN_PURP_1);
@ -425,7 +424,8 @@ static int p54spi_tx_frame(struct p54s_priv *priv, struct sk_buff *skb)
struct p54_hdr *hdr = (struct p54_hdr *) skb->data; struct p54_hdr *hdr = (struct p54_hdr *) skb->data;
int ret = 0; int ret = 0;
p54spi_wakeup(priv); if (p54spi_wakeup(priv) < 0)
return -EBUSY;
ret = p54spi_spi_write_dma(priv, hdr->req_id, skb->data, skb->len); ret = p54spi_spi_write_dma(priv, hdr->req_id, skb->data, skb->len);
if (ret < 0) if (ret < 0)