Skip to content

Commit c899bd2

Browse files
sfrothwellsfrothwell
committed
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
2 parents 96f1a92 + 03f25d5 commit c899bd2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+580
-428
lines changed

‎Documentation/ABI/stable/sysfs-driver-dma-idxd

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,12 @@ Description: Shows the operation capability bits displayed in bitmap format
270270
correlates to the operations allowed. It's visible only
271271
on platforms that support the capability.
272272

273+
What: /sys/bus/dsa/devices/wq<m>.<n>/driver_name
274+
Date: Sept 8, 2023
275+
KernelVersion: 6.7.0
276+
Contact: dmaengine@vger.kernel.org
277+
Description: Name of driver to be bounded to the wq.
278+
273279
What: /sys/bus/dsa/devices/engine<m>.<n>/group_id
274280
Date: Oct 25, 2019
275281
KernelVersion: 5.6.0

‎Documentation/devicetree/bindings/dma/qcom,gpi.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ properties:
6969
dma-channel-mask:
7070
maxItems: 1
7171

72+
dma-coherent: true
73+
7274
required:
7375
- compatible
7476
- reg

‎MAINTAINERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8359,6 +8359,14 @@ F: Documentation/devicetree/bindings/spi/spi-fsl-dspi.txt
83598359
F: drivers/spi/spi-fsl-dspi.c
83608360
F: include/linux/spi/spi-fsl-dspi.h
83618361

8362+
FREESCALE eDMA DRIVER
8363+
M: Frank Li <Frank.Li@nxp.com>
8364+
L: imx@lists.linux.dev
8365+
L: dmaengine@vger.kernel.org
8366+
S: Maintained
8367+
F: Documentation/devicetree/bindings/dma/fsl,edma.yaml
8368+
F: drivers/dma/fsl-edma*.*
8369+
83628370
FREESCALE ENETC ETHERNET DRIVERS
83638371
M: Claudiu Manoil <claudiu.manoil@nxp.com>
83648372
M: Vladimir Oltean <vladimir.oltean@nxp.com>

‎drivers/dma/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ config INTEL_IOATDMA
362362

363363
config K3_DMA
364364
tristate "Hisilicon K3 DMA support"
365-
depends on ARCH_HI3xxx || ARCH_HISI || COMPILE_TEST
365+
depends on ARCH_HISI || COMPILE_TEST
366366
select DMA_ENGINE
367367
select DMA_VIRTUAL_CHANNELS
368368
help

‎drivers/dma/altera-msgdma.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ static int msgdma_probe(struct platform_device *pdev)
923923
*
924924
* Return: Always '0'
925925
*/
926-
static int msgdma_remove(struct platform_device *pdev)
926+
static void msgdma_remove(struct platform_device *pdev)
927927
{
928928
struct msgdma_device *mdev = platform_get_drvdata(pdev);
929929

@@ -933,8 +933,6 @@ static int msgdma_remove(struct platform_device *pdev)
933933
msgdma_dev_remove(mdev);
934934

935935
dev_notice(&pdev->dev, "Altera mSGDMA driver removed\n");
936-
937-
return 0;
938936
}
939937

940938
#ifdef CONFIG_OF
@@ -952,7 +950,7 @@ static struct platform_driver msgdma_driver = {
952950
.of_match_table = of_match_ptr(msgdma_match),
953951
},
954952
.probe = msgdma_probe,
955-
.remove = msgdma_remove,
953+
.remove_new = msgdma_remove,
956954
};
957955

958956
module_platform_driver(msgdma_driver);

‎drivers/dma/apple-admac.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ struct admac_data {
128128
int irq;
129129
int irq_index;
130130
int nchannels;
131-
struct admac_chan channels[];
131+
struct admac_chan channels[] __counted_by(nchannels);
132132
};
133133

134134
struct admac_tx {
@@ -925,16 +925,14 @@ static int admac_probe(struct platform_device *pdev)
925925
return err;
926926
}
927927

928-
static int admac_remove(struct platform_device *pdev)
928+
static void admac_remove(struct platform_device *pdev)
929929
{
930930
struct admac_data *ad = platform_get_drvdata(pdev);
931931

932932
of_dma_controller_free(pdev->dev.of_node);
933933
dma_async_device_unregister(&ad->dma);
934934
free_irq(ad->irq, ad);
935935
reset_control_rearm(ad->rstc);
936-
937-
return 0;
938936
}
939937

940938
static const struct of_device_id admac_of_match[] = {
@@ -949,7 +947,7 @@ static struct platform_driver apple_admac_driver = {
949947
.of_match_table = admac_of_match,
950948
},
951949
.probe = admac_probe,
952-
.remove = admac_remove,
950+
.remove_new = admac_remove,
953951
};
954952
module_platform_driver(apple_admac_driver);
955953

‎drivers/dma/at_hdmac.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ struct at_desc {
239239
bool memset_buffer;
240240
dma_addr_t memset_paddr;
241241
int *memset_vaddr;
242-
struct atdma_sg sg[];
242+
struct atdma_sg sg[] __counted_by(sglen);
243243
};
244244

245245
/*-- Channels --------------------------------------------------------*/
@@ -2100,7 +2100,7 @@ static int __init at_dma_probe(struct platform_device *pdev)
21002100
return err;
21012101
}
21022102

2103-
static int at_dma_remove(struct platform_device *pdev)
2103+
static void at_dma_remove(struct platform_device *pdev)
21042104
{
21052105
struct at_dma *atdma = platform_get_drvdata(pdev);
21062106
struct dma_chan *chan, *_chan;
@@ -2122,8 +2122,6 @@ static int at_dma_remove(struct platform_device *pdev)
21222122
}
21232123

21242124
clk_disable_unprepare(atdma->clk);
2125-
2126-
return 0;
21272125
}
21282126

21292127
static void at_dma_shutdown(struct platform_device *pdev)
@@ -2242,7 +2240,7 @@ static const struct dev_pm_ops __maybe_unused at_dma_dev_pm_ops = {
22422240
};
22432241

22442242
static struct platform_driver at_dma_driver = {
2245-
.remove = at_dma_remove,
2243+
.remove_new = at_dma_remove,
22462244
.shutdown = at_dma_shutdown,
22472245
.id_table = atdma_devtypes,
22482246
.driver = {

‎drivers/dma/at_xdmac.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2431,7 +2431,7 @@ static int at_xdmac_probe(struct platform_device *pdev)
24312431
return ret;
24322432
}
24332433

2434-
static int at_xdmac_remove(struct platform_device *pdev)
2434+
static void at_xdmac_remove(struct platform_device *pdev)
24352435
{
24362436
struct at_xdmac *atxdmac = (struct at_xdmac *)platform_get_drvdata(pdev);
24372437
int i;
@@ -2452,8 +2452,6 @@ static int at_xdmac_remove(struct platform_device *pdev)
24522452
tasklet_kill(&atchan->tasklet);
24532453
at_xdmac_free_chan_resources(&atchan->chan);
24542454
}
2455-
2456-
return 0;
24572455
}
24582456

24592457
static const struct dev_pm_ops __maybe_unused atmel_xdmac_dev_pm_ops = {
@@ -2478,7 +2476,7 @@ MODULE_DEVICE_TABLE(of, atmel_xdmac_dt_ids);
24782476

24792477
static struct platform_driver at_xdmac_driver = {
24802478
.probe = at_xdmac_probe,
2481-
.remove = at_xdmac_remove,
2479+
.remove_new = at_xdmac_remove,
24822480
.driver = {
24832481
.name = "at_xdmac",
24842482
.of_match_table = of_match_ptr(atmel_xdmac_dt_ids),

‎drivers/dma/bcm-sba-raid.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,7 +1734,7 @@ static int sba_probe(struct platform_device *pdev)
17341734
return ret;
17351735
}
17361736

1737-
static int sba_remove(struct platform_device *pdev)
1737+
static void sba_remove(struct platform_device *pdev)
17381738
{
17391739
struct sba_device *sba = platform_get_drvdata(pdev);
17401740

@@ -1745,8 +1745,6 @@ static int sba_remove(struct platform_device *pdev)
17451745
sba_freeup_channel_resources(sba);
17461746

17471747
mbox_free_channel(sba->mchan);
1748-
1749-
return 0;
17501748
}
17511749

17521750
static const struct of_device_id sba_of_match[] = {
@@ -1758,7 +1756,7 @@ MODULE_DEVICE_TABLE(of, sba_of_match);
17581756

17591757
static struct platform_driver sba_driver = {
17601758
.probe = sba_probe,
1761-
.remove = sba_remove,
1759+
.remove_new = sba_remove,
17621760
.driver = {
17631761
.name = "bcm-sba-raid",
17641762
.of_match_table = sba_of_match,

‎drivers/dma/bcm2835-dma.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,19 +1019,17 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
10191019
return rc;
10201020
}
10211021

1022-
static int bcm2835_dma_remove(struct platform_device *pdev)
1022+
static void bcm2835_dma_remove(struct platform_device *pdev)
10231023
{
10241024
struct bcm2835_dmadev *od = platform_get_drvdata(pdev);
10251025

10261026
dma_async_device_unregister(&od->ddev);
10271027
bcm2835_dma_free(od);
1028-
1029-
return 0;
10301028
}
10311029

10321030
static struct platform_driver bcm2835_dma_driver = {
10331031
.probe = bcm2835_dma_probe,
1034-
.remove = bcm2835_dma_remove,
1032+
.remove_new = bcm2835_dma_remove,
10351033
.driver = {
10361034
.name = "bcm2835-dma",
10371035
.of_match_table = of_match_ptr(bcm2835_dma_of_match),

0 commit comments

Comments
 (0)