Commit 88bbd8a0 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'i3c/for-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux

Pull i3c updates from Alexandre Belloni:

 - two small fixes to the svc driver

* tag 'i3c/for-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
  i3c: master: svc: fix doc warning in svc-i3c-master.c
  i3c: master: svc: drop free_irq of devm_request_irq allocated irq
parents f7ea4be4 3e5feb11
...@@ -195,7 +195,7 @@ struct svc_i3c_master { ...@@ -195,7 +195,7 @@ struct svc_i3c_master {
}; };
/** /**
* struct svc_i3c_i3c_dev_data - Device specific data * struct svc_i3c_i2c_dev_data - Device specific data
* @index: Index in the master tables corresponding to this device * @index: Index in the master tables corresponding to this device
* @ibi: IBI slot index in the master structure * @ibi: IBI slot index in the master structure
* @ibi_pool: IBI pool associated to this device * @ibi_pool: IBI pool associated to this device
...@@ -1448,7 +1448,6 @@ static int svc_i3c_master_remove(struct platform_device *pdev) ...@@ -1448,7 +1448,6 @@ static int svc_i3c_master_remove(struct platform_device *pdev)
if (ret) if (ret)
return ret; return ret;
free_irq(master->irq, master);
clk_disable_unprepare(master->pclk); clk_disable_unprepare(master->pclk);
clk_disable_unprepare(master->fclk); clk_disable_unprepare(master->fclk);
clk_disable_unprepare(master->sclk); clk_disable_unprepare(master->sclk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment