Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: David S. Miller <davem@davemloft.net>

+7 -10
+1 -2
drivers/net/ieee802154/adf7242.c
··· 1308 1308 { 1309 1309 struct adf7242_local *lp = spi_get_drvdata(spi); 1310 1310 1311 - if (!IS_ERR_OR_NULL(lp->debugfs_root)) 1312 - debugfs_remove_recursive(lp->debugfs_root); 1311 + debugfs_remove_recursive(lp->debugfs_root); 1313 1312 1314 1313 cancel_delayed_work_sync(&lp->work); 1315 1314 destroy_workqueue(lp->wqueue);
+2 -4
drivers/net/ieee802154/ca8210.c
··· 634 634 for (i = 0; i < len; i++) 635 635 dev_dbg(&priv->spi->dev, "%#03x\n", buf[i]); 636 636 637 - fifo_buffer = kmalloc(len, GFP_KERNEL); 637 + fifo_buffer = kmemdup(buf, len, GFP_KERNEL); 638 638 if (!fifo_buffer) 639 639 return -ENOMEM; 640 - memcpy(fifo_buffer, buf, len); 641 640 kfifo_in(&test->up_fifo, &fifo_buffer, 4); 642 641 wake_up_interruptible(&priv->test.readq); 643 642 ··· 3043 3044 { 3044 3045 struct ca8210_test *test = &priv->test; 3045 3046 3046 - if (!IS_ERR(test->ca8210_dfs_spi_int)) 3047 - debugfs_remove(test->ca8210_dfs_spi_int); 3047 + debugfs_remove(test->ca8210_dfs_spi_int); 3048 3048 kfifo_free(&test->up_fifo); 3049 3049 dev_info(&priv->spi->dev, "Test interface removed\n"); 3050 3050 }
+4 -4
drivers/net/ieee802154/mcr20a.c
··· 903 903 904 904 switch (seq_state) { 905 905 /* TX IRQ, RX IRQ and SEQ IRQ */ 906 - case (0x03): 906 + case (DAR_IRQSTS1_TXIRQ | DAR_IRQSTS1_SEQIRQ): 907 907 if (lp->is_tx) { 908 908 lp->is_tx = 0; 909 909 dev_dbg(printdev(lp), "TX is done. No ACK\n"); 910 910 mcr20a_handle_tx_complete(lp); 911 911 } 912 912 break; 913 - case (0x05): 913 + case (DAR_IRQSTS1_RXIRQ | DAR_IRQSTS1_SEQIRQ): 914 914 /* rx is starting */ 915 915 dev_dbg(printdev(lp), "RX is starting\n"); 916 916 mcr20a_handle_rx(lp); 917 917 break; 918 - case (0x07): 918 + case (DAR_IRQSTS1_RXIRQ | DAR_IRQSTS1_TXIRQ | DAR_IRQSTS1_SEQIRQ): 919 919 if (lp->is_tx) { 920 920 /* tx is done */ 921 921 lp->is_tx = 0; ··· 927 927 mcr20a_handle_rx(lp); 928 928 } 929 929 break; 930 - case (0x01): 930 + case (DAR_IRQSTS1_SEQIRQ): 931 931 if (lp->is_tx) { 932 932 dev_dbg(printdev(lp), "TX is starting\n"); 933 933 mcr20a_handle_tx(lp);