Skip to content

Commit 84dc5aa

Browse files
committed
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 parents 8fc3b8f + 6537ed3 commit 84dc5aa

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

drivers/i2c/busses/i2c-mpc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,6 @@ static void mpc_i2c_setup_512x(struct device_node *node,
307307
{
308308
struct device_node *node_ctrl;
309309
void __iomem *ctrl;
310-
const u32 *pval;
311310
u32 idx;
312311

313312
/* Enable I2C interrupts for mpc5121 */

drivers/i2c/busses/i2c-nomadik.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
10381038

10391039
static void nmk_i2c_remove(struct amba_device *adev)
10401040
{
1041-
struct resource *res = &adev->res;
10421041
struct nmk_i2c_dev *dev = amba_get_drvdata(adev);
10431042

10441043
i2c_del_adapter(&dev->adap);
@@ -1047,7 +1046,6 @@ static void nmk_i2c_remove(struct amba_device *adev)
10471046
clear_all_interrupts(dev);
10481047
/* disable the controller */
10491048
i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE);
1050-
release_mem_region(res->start, resource_size(res));
10511049
}
10521050

10531051
static struct i2c_vendor_data vendor_stn8815 = {

drivers/i2c/busses/i2c-xiic.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,8 @@ static irqreturn_t xiic_process(int irq, void *dev_id)
721721
wakeup_req = 1;
722722
wakeup_code = STATE_ERROR;
723723
}
724+
/* don't try to handle other events */
725+
goto out;
724726
}
725727
if (pend & XIIC_INTR_RX_FULL_MASK) {
726728
/* Receive register/FIFO is full */

0 commit comments

Comments
 (0)