diff for duplicates of <521E04D6.6060302@codethink.co.uk> diff --git a/a/1.txt b/N1/1.txt index c62c1ac..7457676 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -245,8 +245,7 @@ yuck, why do we have to prod other registers outside of the driver. > + > +static void em_i2c_reset(struct i2c_adapter *adap) > +{ -> + struct em_i2c_device *i2c_dev = -> + (struct em_i2c_device *)(i2c_get_adapdata(adap)); +> + struct em_i2c_device *i2c_dev > + (struct em_i2c_device *)(i2c_get_adapdata(adap)); > + > + /* If I2C active */ > + if (readl(i2c_dev->membase + I2C_OFS_IICACT0)& I2C_BIT_IICE0) { @@ -254,7 +253,7 @@ yuck, why do we have to prod other registers outside of the driver. > + /* Disable I2C operation */ > + writel(0, i2c_dev->membase + I2C_OFS_IICACT0); > + -> + while (readl(i2c_dev->membase + I2C_OFS_IICACT0) == 1) +> + while (readl(i2c_dev->membase + I2C_OFS_IICACT0) = 1) > + ; > + } > + @@ -271,15 +270,14 @@ yuck, why do we have to prod other registers outside of the driver. > + /* Enable I2C operation */ > + writel(I2C_BIT_IICE0, i2c_dev->membase + I2C_OFS_IICACT0); > + -> + while (readl(i2c_dev->membase + I2C_OFS_IICACT0) == 0) +> + while (readl(i2c_dev->membase + I2C_OFS_IICACT0) = 0) > + ; > +} > + > +static int __em_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, > + int stop) > +{ -> + struct em_i2c_device *i2c_dev = -> + (struct em_i2c_device *)i2c_get_adapdata(adap); +> + struct em_i2c_device *i2c_dev > + (struct em_i2c_device *)i2c_get_adapdata(adap); > + int count = 0; > + u16 status; > + @@ -338,11 +336,10 @@ yuck, why do we have to prod other registers outside of the driver. > + if (!(msg->flags& I2C_M_RD)) > + goto out_reset; > + -> + if (count == msg->len) +> + if (count = msg->len) > + break; > + -> + msg->buf[count++] = -> + readl(i2c_dev->membase + I2C_OFS_IIC0); +> + msg->buf[count++] > + readl(i2c_dev->membase + I2C_OFS_IIC0); > + > + > + writel((readl(i2c_dev->membase + I2C_OFS_IICC0) @@ -361,7 +358,7 @@ yuck, why do we have to prod other registers outside of the driver. > + goto out; > + } > + -> + if (count == msg->len) +> + if (count = msg->len) > + break; > + > + /* Write data */ @@ -411,16 +408,15 @@ yuck, why do we have to prod other registers outside of the driver. > +static int em_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, > + int num) > +{ -> + struct em_i2c_device *i2c_dev = -> + (struct em_i2c_device *)(i2c_get_adapdata(adap)); +> + struct em_i2c_device *i2c_dev > + (struct em_i2c_device *)(i2c_get_adapdata(adap)); > + int ret = 0; > + int i; > + -> + if (msgs == NULL) +> + if (msgs = NULL) > + return -EINVAL; > + > + for (i = 0; i< num; i++) -> + if (msgs[i].buf == NULL) +> + if (msgs[i].buf = NULL) > + return -EINVAL; > + > + em_i2c_enable_clock(i2c_dev); @@ -452,7 +448,7 @@ yuck, why do we have to prod other registers outside of the driver. > + > + /* Send messages */ > + for (i = 0; i< num; i++) { -> + ret = __em_i2c_xfer(adap,&msgs[i], (i == (num - 1))); +> + ret = __em_i2c_xfer(adap,&msgs[i], (i = (num - 1))); > + if (ret< 0) > + goto out; > + } diff --git a/a/content_digest b/N1/content_digest index 7bc9dd7..5d81764 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01377698664-12610-1-git-send-email-y\0" "From\0Ben Dooks <ben.dooks@codethink.co.uk>\0" "Subject\0Re: [PATCH] EMMA: Add em i2c driver\0" - "Date\0Wed, 28 Aug 2013 15:10:30 +0100\0" + "Date\0Wed, 28 Aug 2013 14:10:30 +0000\0" "Cc\0linux-i2c@vger.kernel.org" grant.likely@linaro.org rob.herring@calxeda.com @@ -257,8 +257,7 @@ "> +\n" "> +static void em_i2c_reset(struct i2c_adapter *adap)\n" "> +{\n" - "> +\tstruct em_i2c_device *i2c_dev =\n" - "> +\t\t(struct em_i2c_device *)(i2c_get_adapdata(adap));\n" + "> +\tstruct em_i2c_device *i2c_dev > +\t\t(struct em_i2c_device *)(i2c_get_adapdata(adap));\n" "> +\n" "> +\t/* If I2C active */\n" "> +\tif (readl(i2c_dev->membase + I2C_OFS_IICACT0)& I2C_BIT_IICE0) {\n" @@ -266,7 +265,7 @@ "> +\t\t/* Disable I2C operation */\n" "> +\t\twritel(0, i2c_dev->membase + I2C_OFS_IICACT0);\n" "> +\n" - "> +\t\twhile (readl(i2c_dev->membase + I2C_OFS_IICACT0) == 1)\n" + "> +\t\twhile (readl(i2c_dev->membase + I2C_OFS_IICACT0) = 1)\n" "> +\t\t\t;\n" "> +\t}\n" "> +\n" @@ -283,15 +282,14 @@ "> +\t/* Enable I2C operation */\n" "> +\twritel(I2C_BIT_IICE0, i2c_dev->membase + I2C_OFS_IICACT0);\n" "> +\n" - "> +\twhile (readl(i2c_dev->membase + I2C_OFS_IICACT0) == 0)\n" + "> +\twhile (readl(i2c_dev->membase + I2C_OFS_IICACT0) = 0)\n" "> +\t\t;\n" "> +}\n" "> +\n" "> +static int __em_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,\n" "> +\t\t\t\tint stop)\n" "> +{\n" - "> +\tstruct em_i2c_device *i2c_dev =\n" - "> +\t\t(struct em_i2c_device *)i2c_get_adapdata(adap);\n" + "> +\tstruct em_i2c_device *i2c_dev > +\t\t(struct em_i2c_device *)i2c_get_adapdata(adap);\n" "> +\tint count = 0;\n" "> +\tu16 status;\n" "> +\n" @@ -350,11 +348,10 @@ "> +\t\t\tif (!(msg->flags& I2C_M_RD))\n" "> +\t\t\t\tgoto out_reset;\n" "> +\n" - "> +\t\t\tif (count == msg->len)\n" + "> +\t\t\tif (count = msg->len)\n" "> +\t\t\t\tbreak;\n" "> +\n" - "> +\t\t\tmsg->buf[count++] =\n" - "> +\t\t\t\treadl(i2c_dev->membase + I2C_OFS_IIC0);\n" + "> +\t\t\tmsg->buf[count++] > +\t\t\t\treadl(i2c_dev->membase + I2C_OFS_IIC0);\n" "> +\n" "> +\n" "> +\t\t\twritel((readl(i2c_dev->membase + I2C_OFS_IICC0)\n" @@ -373,7 +370,7 @@ "> +\t\t\t\tgoto out;\n" "> +\t\t\t}\n" "> +\n" - "> +\t\t\tif (count == msg->len)\n" + "> +\t\t\tif (count = msg->len)\n" "> +\t\t\t\tbreak;\n" "> +\n" "> +\t\t\t/* Write data */\n" @@ -423,16 +420,15 @@ "> +static int em_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,\n" "> +\tint num)\n" "> +{\n" - "> +\tstruct em_i2c_device *i2c_dev =\n" - "> +\t\t(struct em_i2c_device *)(i2c_get_adapdata(adap));\n" + "> +\tstruct em_i2c_device *i2c_dev > +\t\t(struct em_i2c_device *)(i2c_get_adapdata(adap));\n" "> +\tint ret = 0;\n" "> +\tint i;\n" "> +\n" - "> +\tif (msgs == NULL)\n" + "> +\tif (msgs = NULL)\n" "> +\t\treturn -EINVAL;\n" "> +\n" "> +\tfor (i = 0; i< num; i++)\n" - "> +\t\tif (msgs[i].buf == NULL)\n" + "> +\t\tif (msgs[i].buf = NULL)\n" "> +\t\t\treturn -EINVAL;\n" "> +\n" "> +\tem_i2c_enable_clock(i2c_dev);\n" @@ -464,7 +460,7 @@ "> +\n" "> +\t/* Send messages */\n" "> +\tfor (i = 0; i< num; i++) {\n" - "> +\t\tret = __em_i2c_xfer(adap,&msgs[i], (i == (num - 1)));\n" + "> +\t\tret = __em_i2c_xfer(adap,&msgs[i], (i = (num - 1)));\n" "> +\t\tif (ret< 0)\n" "> +\t\t\tgoto out;\n" "> +\t}\n" @@ -615,4 +611,4 @@ "Ben Dooks\t\t\t\thttp://www.codethink.co.uk/\n" "Senior Engineer\t\t\t\tCodethink - Providing Genius" -c9c666807873ee69c9732ac7a499e6cc2b40686fb26b58214b70629bfc9fb947 +42d96b4aad90bb755514409dd8fde8ebea22060ab9e7dcce3043b250bbe21f8f
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.