diff for duplicates of <1331311133-26937-3-git-send-email-thomas@codesourcery.com> diff --git a/a/1.txt b/N1/1.txt index fe181bb..403f4c3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,10 +18,10 @@ index aff9d61..0b45258 100644 @@ -332,9 +332,9 @@ static unsigned int sci_serial_in(struct uart_port *p, int offset) struct plat_sci_reg *reg = sci_getreg(p, offset); - if (reg->size = 8) + if (reg->size == 8) - return ioread8(p->membase + (reg->offset << p->regshift)); + return __raw_readb(p->membase + (reg->offset << p->regshift)); - else if (reg->size = 16) + else if (reg->size == 16) - return ioread16(p->membase + (reg->offset << p->regshift)); + return __raw_readw(p->membase + (reg->offset << p->regshift)); else @@ -30,10 +30,10 @@ index aff9d61..0b45258 100644 @@ -346,9 +346,9 @@ static void sci_serial_out(struct uart_port *p, int offset, int value) struct plat_sci_reg *reg = sci_getreg(p, offset); - if (reg->size = 8) + if (reg->size == 8) - iowrite8(value, p->membase + (reg->offset << p->regshift)); + __raw_writeb(value, p->membase + (reg->offset << p->regshift)); - else if (reg->size = 16) + else if (reg->size == 16) - iowrite16(value, p->membase + (reg->offset << p->regshift)); + __raw_writew(value, p->membase + (reg->offset << p->regshift)); else diff --git a/a/content_digest b/N1/content_digest index 74a566f..5c246ba 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01331311133-26937-1-git-send-email-thomas@codesourcery.com\0" "From\0Thomas Schwinge <thomas@codesourcery.com>\0" "Subject\0[PATCH 3/7] serial: sh-sci: restore big-endian operation.\0" - "Date\0Fri, 09 Mar 2012 16:38:49 +0000\0" + "Date\0Fri, 9 Mar 2012 17:38:49 +0100\0" "Cc\0Thomas Schwinge <thomas@codesourcery.com>" Paul Mundt <lethal@linux-sh.org> linux-sh@vger.kernel.org @@ -28,10 +28,10 @@ "@@ -332,9 +332,9 @@ static unsigned int sci_serial_in(struct uart_port *p, int offset)\n" " \tstruct plat_sci_reg *reg = sci_getreg(p, offset);\n" " \n" - " \tif (reg->size = 8)\n" + " \tif (reg->size == 8)\n" "-\t\treturn ioread8(p->membase + (reg->offset << p->regshift));\n" "+\t\treturn __raw_readb(p->membase + (reg->offset << p->regshift));\n" - " \telse if (reg->size = 16)\n" + " \telse if (reg->size == 16)\n" "-\t\treturn ioread16(p->membase + (reg->offset << p->regshift));\n" "+\t\treturn __raw_readw(p->membase + (reg->offset << p->regshift));\n" " \telse\n" @@ -40,10 +40,10 @@ "@@ -346,9 +346,9 @@ static void sci_serial_out(struct uart_port *p, int offset, int value)\n" " \tstruct plat_sci_reg *reg = sci_getreg(p, offset);\n" " \n" - " \tif (reg->size = 8)\n" + " \tif (reg->size == 8)\n" "-\t\tiowrite8(value, p->membase + (reg->offset << p->regshift));\n" "+\t\t__raw_writeb(value, p->membase + (reg->offset << p->regshift));\n" - " \telse if (reg->size = 16)\n" + " \telse if (reg->size == 16)\n" "-\t\tiowrite16(value, p->membase + (reg->offset << p->regshift));\n" "+\t\t__raw_writew(value, p->membase + (reg->offset << p->regshift));\n" " \telse\n" @@ -52,4 +52,4 @@ "-- \n" 1.7.4.1 -4edc87961343c2f60a45fc72b475b2367ba358345b973345e56666b10aab0e41 +83456fce1977eda9758d99d24c28cdc79571049a73be719ccd53eed243fb8c68
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.