diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 12:55:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 12:55:43 -0400 |
commit | 47ebe00b684c2bc183a766bc33c8b5943bc0df85 (patch) | |
tree | c0f155acc5623f6990d20b7a623f48f5e7aa0f61 /drivers/dma/bcm-sba-raid.c | |
parent | fa121bb3fed6313b1f0af23952301e06cf6d32ed (diff) | |
parent | 5c274ca4cfb22a455e880f61536b1894fa29fd17 (diff) |
Merge tag 'dmaengine-5.3-rc1' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine updates from Vinod Koul:
- Add support in dmaengine core to do device node checks for DT devices
and update bunch of drivers to use that and remove open coding from
drivers
- New driver/driver support for new hardware, namely:
- MediaTek UART APDMA
- Freescale i.mx7ulp edma2
- Synopsys eDMA IP core version 0
- Allwinner H6 DMA
- Updates to axi-dma and support for interleaved cyclic transfers
- Greg's debugfs return value check removals on drivers
- Updates to stm32-dma, hsu, dw, pl330, tegra drivers
* tag 'dmaengine-5.3-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (68 commits)
dmaengine: Revert "dmaengine: fsl-edma: add i.mx7ulp edma2 version support"
dmaengine: at_xdmac: check for non-empty xfers_list before invoking callback
Documentation: dmaengine: clean up description of dmatest usage
dmaengine: tegra210-adma: remove PM_CLK dependency
dmaengine: fsl-edma: add i.mx7ulp edma2 version support
dt-bindings: dma: fsl-edma: add new i.mx7ulp-edma
dmaengine: fsl-edma-common: version check for v2 instead
dmaengine: fsl-edma-common: move dmamux register to another single function
dmaengine: fsl-edma: add drvdata for fsl-edma
dmaengine: Revert "dmaengine: fsl-edma: support little endian for edma driver"
dmaengine: rcar-dmac: Reject zero-length slave DMA requests
dmaengine: dw: Enable iDMA 32-bit on Intel Elkhart Lake
dmaengine: dw-edma: fix semicolon.cocci warnings
dmaengine: sh: usb-dmac: Use [] to denote a flexible array member
dmaengine: dmatest: timeout value of -1 should specify infinite wait
dmaengine: dw: Distinguish ->remove() between DW and iDMA 32-bit
dmaengine: fsl-edma: support little endian for edma driver
dmaengine: hsu: Revert "set HSU_CH_MTSR to memory width"
dmagengine: pl330: add code to get reset property
dt-bindings: pl330: document the optional resets property
...
Diffstat (limited to 'drivers/dma/bcm-sba-raid.c')
-rw-r--r-- | drivers/dma/bcm-sba-raid.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/dma/bcm-sba-raid.c b/drivers/dma/bcm-sba-raid.c index fa81d0177765..275e90fa829d 100644 --- a/drivers/dma/bcm-sba-raid.c +++ b/drivers/dma/bcm-sba-raid.c | |||
@@ -164,7 +164,6 @@ struct sba_device { | |||
164 | struct list_head reqs_free_list; | 164 | struct list_head reqs_free_list; |
165 | /* DebugFS directory entries */ | 165 | /* DebugFS directory entries */ |
166 | struct dentry *root; | 166 | struct dentry *root; |
167 | struct dentry *stats; | ||
168 | }; | 167 | }; |
169 | 168 | ||
170 | /* ====== Command helper routines ===== */ | 169 | /* ====== Command helper routines ===== */ |
@@ -1716,17 +1715,11 @@ static int sba_probe(struct platform_device *pdev) | |||
1716 | 1715 | ||
1717 | /* Create debugfs root entry */ | 1716 | /* Create debugfs root entry */ |
1718 | sba->root = debugfs_create_dir(dev_name(sba->dev), NULL); | 1717 | sba->root = debugfs_create_dir(dev_name(sba->dev), NULL); |
1719 | if (IS_ERR_OR_NULL(sba->root)) { | ||
1720 | dev_err(sba->dev, "failed to create debugfs root entry\n"); | ||
1721 | sba->root = NULL; | ||
1722 | goto skip_debugfs; | ||
1723 | } | ||
1724 | 1718 | ||
1725 | /* Create debugfs stats entry */ | 1719 | /* Create debugfs stats entry */ |
1726 | sba->stats = debugfs_create_devm_seqfile(sba->dev, "stats", sba->root, | 1720 | debugfs_create_devm_seqfile(sba->dev, "stats", sba->root, |
1727 | sba_debugfs_stats_show); | 1721 | sba_debugfs_stats_show); |
1728 | if (IS_ERR_OR_NULL(sba->stats)) | 1722 | |
1729 | dev_err(sba->dev, "failed to create debugfs stats file\n"); | ||
1730 | skip_debugfs: | 1723 | skip_debugfs: |
1731 | 1724 | ||
1732 | /* Register DMA device with Linux async framework */ | 1725 | /* Register DMA device with Linux async framework */ |