Commit 982d608f authored by David S. Miller's avatar David S. Miller

Merge branch 'ieee802154-for-davem-2018-09-28' of...

Merge branch 'ieee802154-for-davem-2018-09-28' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan

Stefan Schmidt says:

====================
pull-request: ieee802154 for net 2018-09-28

An update from ieee802154 for your *net* tree.

Some cleanup patches throughout the drivers from the Huawei tag team
Yue Haibing and Zhong Jiang.
Xue is replacing some magic numbers with defines in his mcr20a driver.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f810dcec d6d1cd25
...@@ -1308,7 +1308,6 @@ static int adf7242_remove(struct spi_device *spi) ...@@ -1308,7 +1308,6 @@ static int adf7242_remove(struct spi_device *spi)
{ {
struct adf7242_local *lp = spi_get_drvdata(spi); struct adf7242_local *lp = spi_get_drvdata(spi);
if (!IS_ERR_OR_NULL(lp->debugfs_root))
debugfs_remove_recursive(lp->debugfs_root); debugfs_remove_recursive(lp->debugfs_root);
cancel_delayed_work_sync(&lp->work); cancel_delayed_work_sync(&lp->work);
......
...@@ -634,10 +634,9 @@ static int ca8210_test_int_driver_write( ...@@ -634,10 +634,9 @@ static int ca8210_test_int_driver_write(
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
dev_dbg(&priv->spi->dev, "%#03x\n", buf[i]); dev_dbg(&priv->spi->dev, "%#03x\n", buf[i]);
fifo_buffer = kmalloc(len, GFP_KERNEL); fifo_buffer = kmemdup(buf, len, GFP_KERNEL);
if (!fifo_buffer) if (!fifo_buffer)
return -ENOMEM; return -ENOMEM;
memcpy(fifo_buffer, buf, len);
kfifo_in(&test->up_fifo, &fifo_buffer, 4); kfifo_in(&test->up_fifo, &fifo_buffer, 4);
wake_up_interruptible(&priv->test.readq); wake_up_interruptible(&priv->test.readq);
...@@ -3044,7 +3043,6 @@ static void ca8210_test_interface_clear(struct ca8210_priv *priv) ...@@ -3044,7 +3043,6 @@ static void ca8210_test_interface_clear(struct ca8210_priv *priv)
{ {
struct ca8210_test *test = &priv->test; struct ca8210_test *test = &priv->test;
if (!IS_ERR(test->ca8210_dfs_spi_int))
debugfs_remove(test->ca8210_dfs_spi_int); debugfs_remove(test->ca8210_dfs_spi_int);
kfifo_free(&test->up_fifo); kfifo_free(&test->up_fifo);
dev_info(&priv->spi->dev, "Test interface removed\n"); dev_info(&priv->spi->dev, "Test interface removed\n");
......
...@@ -903,19 +903,19 @@ mcr20a_irq_clean_complete(void *context) ...@@ -903,19 +903,19 @@ mcr20a_irq_clean_complete(void *context)
switch (seq_state) { switch (seq_state) {
/* TX IRQ, RX IRQ and SEQ IRQ */ /* TX IRQ, RX IRQ and SEQ IRQ */
case (0x03): case (DAR_IRQSTS1_TXIRQ | DAR_IRQSTS1_SEQIRQ):
if (lp->is_tx) { if (lp->is_tx) {
lp->is_tx = 0; lp->is_tx = 0;
dev_dbg(printdev(lp), "TX is done. No ACK\n"); dev_dbg(printdev(lp), "TX is done. No ACK\n");
mcr20a_handle_tx_complete(lp); mcr20a_handle_tx_complete(lp);
} }
break; break;
case (0x05): case (DAR_IRQSTS1_RXIRQ | DAR_IRQSTS1_SEQIRQ):
/* rx is starting */ /* rx is starting */
dev_dbg(printdev(lp), "RX is starting\n"); dev_dbg(printdev(lp), "RX is starting\n");
mcr20a_handle_rx(lp); mcr20a_handle_rx(lp);
break; break;
case (0x07): case (DAR_IRQSTS1_RXIRQ | DAR_IRQSTS1_TXIRQ | DAR_IRQSTS1_SEQIRQ):
if (lp->is_tx) { if (lp->is_tx) {
/* tx is done */ /* tx is done */
lp->is_tx = 0; lp->is_tx = 0;
...@@ -927,7 +927,7 @@ mcr20a_irq_clean_complete(void *context) ...@@ -927,7 +927,7 @@ mcr20a_irq_clean_complete(void *context)
mcr20a_handle_rx(lp); mcr20a_handle_rx(lp);
} }
break; break;
case (0x01): case (DAR_IRQSTS1_SEQIRQ):
if (lp->is_tx) { if (lp->is_tx) {
dev_dbg(printdev(lp), "TX is starting\n"); dev_dbg(printdev(lp), "TX is starting\n");
mcr20a_handle_tx(lp); mcr20a_handle_tx(lp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment