diff options
| author | Vinod Koul <vkoul@kernel.org> | 2021-07-27 19:12:14 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2021-07-27 19:12:14 +0530 |
| commit | c28d5d5688c6278a1ad32670cbee35802a9e65c1 (patch) | |
| tree | 9ee168f44d748f04d9fdbb490fbfabb55a39b708 /drivers/dma | |
| parent | 0e96454ca26cc5c594ec792f7e5168cce726f7cf (diff) | |
| parent | fc7a6209d5710618eb4f72a77cd81b8d694ecf89 (diff) | |
Merge tag 'bus_remove_return_void-5.15' into next
This helps to remove conflict on idxd driver
Conflicts:
drivers/dma/idxd/sysfs.c
drivers/dma/idxd/bus.c
Greg says:
Bus: Make remove callback return void tag
Tag for other trees/branches to pull from in order to have a stable
place to build off of if they want to add new busses for 5.15.
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/idxd/bus.c | 3 | ||||
| -rw-r--r-- | drivers/dma/ipu/ipu_idmac.c | 2 | ||||
| -rw-r--r-- | drivers/dma/mpc512x_dma.c | 1 | ||||
| -rw-r--r-- | drivers/dma/ti/k3-udma.c | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/drivers/dma/idxd/bus.c b/drivers/dma/idxd/bus.c index 02837f0fb3e4..6f84621053c6 100644 --- a/drivers/dma/idxd/bus.c +++ b/drivers/dma/idxd/bus.c @@ -58,14 +58,13 @@ static int idxd_config_bus_probe(struct device *dev) return idxd_drv->probe(idxd_dev); } -static int idxd_config_bus_remove(struct device *dev) +static void idxd_config_bus_remove(struct device *dev) { struct idxd_device_driver *idxd_drv = container_of(dev->driver, struct idxd_device_driver, drv); struct idxd_dev *idxd_dev = confdev_to_idxd_dev(dev); idxd_drv->remove(idxd_dev); - return 0; } struct bus_type dsa_bus_type = { diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c index 104ad420abbe..baab1ca9f621 100644 --- a/drivers/dma/ipu/ipu_idmac.c +++ b/drivers/dma/ipu/ipu_idmac.c @@ -618,6 +618,7 @@ static int ipu_enable_channel(struct idmac *idmac, struct idmac_channel *ichan) case IDMAC_SDC_1: case IDMAC_IC_7: ipu_channel_set_priority(ipu, channel, true); + break; default: break; } @@ -978,6 +979,7 @@ static int ipu_init_channel(struct idmac *idmac, struct idmac_channel *ichan) case IDMAC_SDC_0: case IDMAC_SDC_1: n_desc = 4; + break; default: break; } diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c index c1a69149c8bf..4a51fdbf5aa9 100644 --- a/drivers/dma/mpc512x_dma.c +++ b/drivers/dma/mpc512x_dma.c @@ -813,6 +813,7 @@ inline bool is_buswidth_valid(u8 buswidth, bool is_mpc8308) case 16: if (is_mpc8308) return false; + break; case 1: case 2: case 4: diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 96ad21869ba7..a35858610780 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -4948,6 +4948,7 @@ static int setup_resources(struct udma_dev *ud) ud->tchan_cnt), ud->rchan_cnt - bitmap_weight(ud->rchan_map, ud->rchan_cnt)); + break; default: break; } |