diff options
| author | Vinod Koul <vkoul@kernel.org> | 2020-08-05 19:02:07 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-08-05 19:02:07 +0530 |
| commit | 0b5ad7b9522e6172342511fac6114fd8b7eb622a (patch) | |
| tree | b6a29560e6364bd98634564181cab54a3b6164a4 /drivers/dma/hisi_dma.c | |
| parent | 87730ccbddcb48478b1b88e88b14e73424130764 (diff) | |
| parent | 6bd0dffa1a6e19e73964ae47c964f57c625cce05 (diff) | |
| download | linux-0b5ad7b9522e6172342511fac6114fd8b7eb622a.tar.bz2 | |
Merge branch 'for-linus' into fixes
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Conflicts:
drivers/dma/idxd/sysfs.c
Diffstat (limited to 'drivers/dma/hisi_dma.c')
| -rw-r--r-- | drivers/dma/hisi_dma.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/dma/hisi_dma.c b/drivers/dma/hisi_dma.c index ed3619266a48..e1a958ae7925 100644 --- a/drivers/dma/hisi_dma.c +++ b/drivers/dma/hisi_dma.c @@ -511,7 +511,6 @@ static int hisi_dma_probe(struct pci_dev *pdev, const struct pci_device_id *id) struct device *dev = &pdev->dev; struct hisi_dma_dev *hdma_dev; struct dma_device *dma_dev; - size_t dev_size; int ret; ret = pcim_enable_device(pdev); @@ -534,9 +533,7 @@ static int hisi_dma_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (ret) return ret; - dev_size = sizeof(struct hisi_dma_chan) * HISI_DMA_CHAN_NUM + - sizeof(*hdma_dev); - hdma_dev = devm_kzalloc(dev, dev_size, GFP_KERNEL); + hdma_dev = devm_kzalloc(dev, struct_size(hdma_dev, chan, HISI_DMA_CHAN_NUM), GFP_KERNEL); if (!hdma_dev) return -EINVAL; |