mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-27 18:43:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'hsi-for-7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

Browse Source 
Pull HSI updates from Sebastian Reichel:

 - omap_ssi_core: fix missing DMA mask

 - misc small cleanups

* tag 'hsi-for-7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  hsi: omap_ssi_core: fix missing DMA mask setup for SSI controller device
  HSI: omap_ssi: Remove redundant dev_err()
  HSI: nokia-modem: Remove redundant dev_err()
  hsi: omap_ssi: remove debugfs on port creation failure
This commit is contained in:
Linus Torvalds
2026-08-21 12:01:23 -07:00
parent f96718fc1f e81250ec6b
commit 283955dfac
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/hsi/clients/nokia-modem.c
View File

@@ -157,11 +157,8 @@ static int nokia_modem_probe(struct device *dev)
do_nokia_modem_rst_ind_tasklet, (unsigned long)modem);
err = devm_request_irq(dev, irq, nokia_modem_rst_ind_isr,
pflags, "modem_rst_ind", modem);
if (err < 0) {
dev_err(dev, "Request rst_ind irq(%d) failed (flags %d)\n",
irq, pflags);
if (err < 0)
return err;
}
enable_irq_wake(irq);
if (pm) {

14
drivers/hsi/controllers/omap_ssi_core.c
View File

@@ -370,11 +370,8 @@ static int ssi_add_controller(struct hsi_controller *ssi,
(unsigned long)ssi);
err = devm_request_irq(&ssi->device, omap_ssi->gdd_irq, ssi_gdd_isr,
0, "gdd_mpu", ssi);
if (err < 0) {
dev_err(&ssi->device, "Request GDD IRQ %d failed (%d)",
omap_ssi->gdd_irq, err);
if (err < 0)
goto out_err;
}
omap_ssi->port = devm_kcalloc(&ssi->device, ssi->num_ports,
sizeof(*omap_ssi->port), GFP_KERNEL);
@@ -502,6 +499,12 @@ static int ssi_probe(struct platform_device *pd)
pm_runtime_enable(&pd->dev);
ssi->device.dma_mask = &ssi->device.coherent_dma_mask;
err = dma_set_mask_and_coherent(&ssi->device, DMA_BIT_MASK(32));
if (err)
goto out2;
err = ssi_hw_init(ssi);
if (err < 0)
goto out2;
@@ -529,6 +532,9 @@ static int ssi_probe(struct platform_device *pd)
return err;
out3:
device_for_each_child(&pd->dev, NULL, ssi_remove_ports);
#ifdef CONFIG_DEBUG_FS
ssi_debug_remove_ctrl(ssi);
#endif
out2:
ssi_remove_controller(ssi);
pm_runtime_disable(&pd->dev);

6
drivers/hsi/controllers/omap_ssi_port.c
View File

@@ -1024,9 +1024,6 @@ static int ssi_port_irq(struct hsi_port *port, struct platform_device *pd)
omap_port->irq = err;
err = devm_request_threaded_irq(&port->device, omap_port->irq, NULL,
ssi_pio_thread, IRQF_ONESHOT, "SSI PORT", port);
if (err < 0)
dev_err(&port->device, "Request IRQ %d failed (%d)\n",
omap_port->irq, err);
return err;
}
@@ -1048,9 +1045,6 @@ static int ssi_wake_irq(struct hsi_port *port, struct platform_device *pd)
ssi_wake_thread,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"SSI cawake", port);
if (err < 0)
dev_err(&port->device, "Request Wake in IRQ %d failed %d\n",
cawake_irq, err);
err = enable_irq_wake(cawake_irq);
if (err < 0)
dev_err(&port->device, "Enable wake on the wakeline in irq %d failed %d\n",