Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c335631a authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Wolfram Sang
Browse files

i2c: designware: Remove interrupt clearing from i2c_dw_pci_probe() 



There is no need to clear interrupts in i2c_dw_pci_probe() since only place
where interrupts are unmasked is i2c_dw_xfer_init() and there interrupts
are always cleared after commit 2a2d95e9 ("i2c: designware: always
clear interrupts before enabling them").

This allows to cleanup the code and replace i2c_dw_clear_int() in
i2c_dw_xfer_init() by direct register read as there are no other callers.

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 58b0497d

drivers/i2c/busses/i2c-designware-core.c

+1 −7
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev) 
	__i2c_dw_enable(dev, true);



	/* Clear and enable interrupts */

	i2c_dw_clear_int(dev);

	dw_readl(dev, DW_IC_CLR_INTR);

	dw_writel(dev, DW_IC_INTR_DEFAULT_MASK, DW_IC_INTR_MASK);

}
@@ -839,12 +839,6 @@ void i2c_dw_disable(struct dw_i2c_dev *dev) 
}

EXPORT_SYMBOL_GPL(i2c_dw_disable);



void i2c_dw_clear_int(struct dw_i2c_dev *dev)

{

	dw_readl(dev, DW_IC_CLR_INTR);

}

EXPORT_SYMBOL_GPL(i2c_dw_clear_int);



void i2c_dw_disable_int(struct dw_i2c_dev *dev)

{

	dw_writel(dev, 0, DW_IC_INTR_MASK);

drivers/i2c/busses/i2c-designware-core.h

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ extern irqreturn_t i2c_dw_isr(int this_irq, void *dev_id); 
extern void i2c_dw_enable(struct dw_i2c_dev *dev);

extern u32 i2c_dw_is_enabled(struct dw_i2c_dev *dev);

extern void i2c_dw_disable(struct dw_i2c_dev *dev);

extern void i2c_dw_clear_int(struct dw_i2c_dev *dev);

extern void i2c_dw_disable_int(struct dw_i2c_dev *dev);

extern u32 i2c_dw_read_comp_param(struct dw_i2c_dev *dev);

drivers/i2c/busses/i2c-designware-pcidrv.c

+0 −1
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, 
	}



	i2c_dw_disable_int(dev);

	i2c_dw_clear_int(dev);

	r = i2c_add_numbered_adapter(adap);

	if (r) {

		dev_err(&pdev->dev, "failure adding adapter\n");