Merge branch 'i2c/for-current-fixed' into i2c/for-5.8

diff --cc drivers/i2c/busses/i2c-altera.c
index 027faabe3d043062ab82636065b0dd6c8912072a,16ddc26c00e65698bf4f9986e8e02667326cf58c..70c81f88b293f1cdb81cf0f0dada9874924f1255
--- 1/drivers/i2c/busses/i2c-altera.c
--- 2/drivers/i2c/busses/i2c-altera.c
+++ b/drivers/i2c/busses/i2c-altera.c
@@@ -382,8 -389,8 +389,7 @@@ static const struct i2c_algorithm altr_
  static int altr_i2c_probe(struct platform_device *pdev)
  {
        struct altr_i2c_dev *idev = NULL;
 -      struct resource *res;
        int irq, ret;
-       u32 val;
  
        idev = devm_kzalloc(&pdev->dev, sizeof(*idev), GFP_KERNEL);
        if (!idev)

diff --cc drivers/i2c/busses/i2c-at91-master.c
Simple merge

diff --cc drivers/i2c/busses/i2c-bcm-iproc.c
Simple merge

diff --cc drivers/i2c/busses/i2c-designware-platdrv.c
Simple merge

diff --cc drivers/i2c/i2c-core-base.c
Simple merge

diff --cc include/linux/i2c.h
Simple merge