diff options
Diffstat (limited to 'drivers/net/caif')
| -rw-r--r-- | drivers/net/caif/caif_hsi.c | 9 | ||||
| -rw-r--r-- | drivers/net/caif/caif_spi.c | 10 |
2 files changed, 7 insertions, 12 deletions
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c index 9a66e2a910ae..9c1c8cd5223f 100644 --- a/drivers/net/caif/caif_hsi.c +++ b/drivers/net/caif/caif_hsi.c | |||
| @@ -744,14 +744,14 @@ static void cfhsi_wake_up(struct work_struct *work) | |||
| 744 | size_t fifo_occupancy = 0; | 744 | size_t fifo_occupancy = 0; |
| 745 | 745 | ||
| 746 | /* Wakeup timeout */ | 746 | /* Wakeup timeout */ |
| 747 | dev_err(&cfhsi->ndev->dev, "%s: Timeout.\n", | 747 | dev_dbg(&cfhsi->ndev->dev, "%s: Timeout.\n", |
| 748 | __func__); | 748 | __func__); |
| 749 | 749 | ||
| 750 | /* Check FIFO to check if modem has sent something. */ | 750 | /* Check FIFO to check if modem has sent something. */ |
| 751 | WARN_ON(cfhsi->dev->cfhsi_fifo_occupancy(cfhsi->dev, | 751 | WARN_ON(cfhsi->dev->cfhsi_fifo_occupancy(cfhsi->dev, |
| 752 | &fifo_occupancy)); | 752 | &fifo_occupancy)); |
| 753 | 753 | ||
| 754 | dev_err(&cfhsi->ndev->dev, "%s: Bytes in FIFO: %u.\n", | 754 | dev_dbg(&cfhsi->ndev->dev, "%s: Bytes in FIFO: %u.\n", |
| 755 | __func__, (unsigned) fifo_occupancy); | 755 | __func__, (unsigned) fifo_occupancy); |
| 756 | 756 | ||
| 757 | /* Check if we misssed the interrupt. */ | 757 | /* Check if we misssed the interrupt. */ |
| @@ -1210,7 +1210,7 @@ int cfhsi_probe(struct platform_device *pdev) | |||
| 1210 | 1210 | ||
| 1211 | static void cfhsi_shutdown(struct cfhsi *cfhsi) | 1211 | static void cfhsi_shutdown(struct cfhsi *cfhsi) |
| 1212 | { | 1212 | { |
| 1213 | u8 *tx_buf, *rx_buf; | 1213 | u8 *tx_buf, *rx_buf, *flip_buf; |
| 1214 | 1214 | ||
| 1215 | /* Stop TXing */ | 1215 | /* Stop TXing */ |
| 1216 | netif_tx_stop_all_queues(cfhsi->ndev); | 1216 | netif_tx_stop_all_queues(cfhsi->ndev); |
| @@ -1234,7 +1234,7 @@ static void cfhsi_shutdown(struct cfhsi *cfhsi) | |||
| 1234 | /* Store bufferes: will be freed later. */ | 1234 | /* Store bufferes: will be freed later. */ |
| 1235 | tx_buf = cfhsi->tx_buf; | 1235 | tx_buf = cfhsi->tx_buf; |
| 1236 | rx_buf = cfhsi->rx_buf; | 1236 | rx_buf = cfhsi->rx_buf; |
| 1237 | 1237 | flip_buf = cfhsi->rx_flip_buf; | |
| 1238 | /* Flush transmit queues. */ | 1238 | /* Flush transmit queues. */ |
| 1239 | cfhsi_abort_tx(cfhsi); | 1239 | cfhsi_abort_tx(cfhsi); |
| 1240 | 1240 | ||
| @@ -1247,6 +1247,7 @@ static void cfhsi_shutdown(struct cfhsi *cfhsi) | |||
| 1247 | /* Free buffers. */ | 1247 | /* Free buffers. */ |
| 1248 | kfree(tx_buf); | 1248 | kfree(tx_buf); |
| 1249 | kfree(rx_buf); | 1249 | kfree(rx_buf); |
| 1250 | kfree(flip_buf); | ||
| 1250 | } | 1251 | } |
| 1251 | 1252 | ||
| 1252 | int cfhsi_remove(struct platform_device *pdev) | 1253 | int cfhsi_remove(struct platform_device *pdev) |
diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c index 96391c36fa74..b71ce9bf0afb 100644 --- a/drivers/net/caif/caif_spi.c +++ b/drivers/net/caif/caif_spi.c | |||
| @@ -127,12 +127,6 @@ static inline void dev_debugfs_rem(struct cfspi *cfspi) | |||
| 127 | debugfs_remove(cfspi->dbgfs_dir); | 127 | debugfs_remove(cfspi->dbgfs_dir); |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | static int dbgfs_open(struct inode *inode, struct file *file) | ||
| 131 | { | ||
| 132 | file->private_data = inode->i_private; | ||
| 133 | return 0; | ||
| 134 | } | ||
| 135 | |||
| 136 | static ssize_t dbgfs_state(struct file *file, char __user *user_buf, | 130 | static ssize_t dbgfs_state(struct file *file, char __user *user_buf, |
| 137 | size_t count, loff_t *ppos) | 131 | size_t count, loff_t *ppos) |
| 138 | { | 132 | { |
| @@ -243,13 +237,13 @@ static ssize_t dbgfs_frame(struct file *file, char __user *user_buf, | |||
| 243 | } | 237 | } |
| 244 | 238 | ||
| 245 | static const struct file_operations dbgfs_state_fops = { | 239 | static const struct file_operations dbgfs_state_fops = { |
| 246 | .open = dbgfs_open, | 240 | .open = simple_open, |
| 247 | .read = dbgfs_state, | 241 | .read = dbgfs_state, |
| 248 | .owner = THIS_MODULE | 242 | .owner = THIS_MODULE |
| 249 | }; | 243 | }; |
| 250 | 244 | ||
| 251 | static const struct file_operations dbgfs_frame_fops = { | 245 | static const struct file_operations dbgfs_frame_fops = { |
| 252 | .open = dbgfs_open, | 246 | .open = simple_open, |
| 253 | .read = dbgfs_frame, | 247 | .read = dbgfs_frame, |
| 254 | .owner = THIS_MODULE | 248 | .owner = THIS_MODULE |
| 255 | }; | 249 | }; |
