Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'i2c-for-6.5-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull more i2c updates from Wolfram Sang:

- xiic patch should have been in the original pull but slipped through

- mpc patch fixes a build regression

- nomadik cleanup

* tag 'i2c-for-6.5-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: mpc: Drop unused variable
i2c: nomadik: Remove a useless call in the remove function
i2c: xiic: Don't try to handle more interrupt events after error

+2 -3
-1
drivers/i2c/busses/i2c-mpc.c
··· 307 307 { 308 308 struct device_node *node_ctrl; 309 309 void __iomem *ctrl; 310 - const u32 *pval; 311 310 u32 idx; 312 311 313 312 /* Enable I2C interrupts for mpc5121 */
-2
drivers/i2c/busses/i2c-nomadik.c
··· 1038 1038 1039 1039 static void nmk_i2c_remove(struct amba_device *adev) 1040 1040 { 1041 - struct resource *res = &adev->res; 1042 1041 struct nmk_i2c_dev *dev = amba_get_drvdata(adev); 1043 1042 1044 1043 i2c_del_adapter(&dev->adap); ··· 1046 1047 clear_all_interrupts(dev); 1047 1048 /* disable the controller */ 1048 1049 i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE); 1049 - release_mem_region(res->start, resource_size(res)); 1050 1050 } 1051 1051 1052 1052 static struct i2c_vendor_data vendor_stn8815 = {
+2
drivers/i2c/busses/i2c-xiic.c
··· 721 721 wakeup_req = 1; 722 722 wakeup_code = STATE_ERROR; 723 723 } 724 + /* don't try to handle other events */ 725 + goto out; 724 726 } 725 727 if (pend & XIIC_INTR_RX_FULL_MASK) { 726 728 /* Receive register/FIFO is full */