These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / pci / mantis / mantis_i2c.c

diff --git a/kernel/drivers/media/pci/mantis/mantis_i2c.c b/kernel/drivers/media/pci/mantis/mantis_i2c.c
index 895ddba..d72ee47 100644 (file)
--- a/kernel/drivers/media/pci/mantis/mantis_i2c.c
+++ b/kernel/drivers/media/pci/mantis/mantis_i2c.c
@@ -219,7 +219,7 @@ static struct i2c_algorithm mantis_algo = {
 
 int mantis_i2c_init(struct mantis_pci *mantis)
 {
-       u32 intstat, intmask;
+       u32 intstat;
        struct i2c_adapter *i2c_adapter = &mantis->adapter;
        struct pci_dev *pdev            = mantis->pdev;
 
@@ -242,11 +242,10 @@ int mantis_i2c_init(struct mantis_pci *mantis)
        dprintk(MANTIS_DEBUG, 1, "Initializing I2C ..");
 
        intstat = mmread(MANTIS_INT_STAT);
-       intmask = mmread(MANTIS_INT_MASK);
+       mmread(MANTIS_INT_MASK);
        mmwrite(intstat, MANTIS_INT_STAT);
        dprintk(MANTIS_DEBUG, 1, "Disabling I2C interrupt");
-       intmask = mmread(MANTIS_INT_MASK);
-       mmwrite((intmask & ~MANTIS_INT_I2CDONE), MANTIS_INT_MASK);
+       mantis_mask_ints(mantis, MANTIS_INT_I2CDONE);
 
        return 0;
 }
@@ -254,11 +253,8 @@ EXPORT_SYMBOL_GPL(mantis_i2c_init);
 
 int mantis_i2c_exit(struct mantis_pci *mantis)
 {
-       u32 intmask;
-
        dprintk(MANTIS_DEBUG, 1, "Disabling I2C interrupt");
-       intmask = mmread(MANTIS_INT_MASK);
-       mmwrite((intmask & ~MANTIS_INT_I2CDONE), MANTIS_INT_MASK);
+       mantis_mask_ints(mantis, MANTIS_INT_I2CDONE);
 
        dprintk(MANTIS_DEBUG, 1, "Removing I2C adapter");
        i2c_del_adapter(&mantis->adapter);