Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c-highlander: Trivial endian casting fixes
i2c-pmcmsp: Fix endianness misannotation

+3 -3
+2 -2
drivers/i2c/busses/i2c-highlander.c
··· 92 92 static void smbus_write_data(u8 *src, u16 *dst, int len) 93 93 { 94 94 for (; len > 1; len -= 2) { 95 - *dst++ = be16_to_cpup((u16 *)src); 95 + *dst++ = be16_to_cpup((__be16 *)src); 96 96 src += 2; 97 97 } 98 98 ··· 103 103 static void smbus_read_data(u16 *src, u8 *dst, int len) 104 104 { 105 105 for (; len > 1; len -= 2) { 106 - *(u16 *)dst = cpu_to_be16p(src++); 106 + *(__be16 *)dst = cpu_to_be16p(src++); 107 107 dst += 2; 108 108 } 109 109
+1 -1
drivers/i2c/busses/i2c-pmcmsp.c
··· 486 486 487 487 if (cmd->type == MSP_TWI_CMD_WRITE || 488 488 cmd->type == MSP_TWI_CMD_WRITE_READ) { 489 - __be64 tmp = cpu_to_be64p((u64 *)cmd->write_data); 489 + u64 tmp = be64_to_cpup((__be64 *)cmd->write_data); 490 490 tmp >>= (MSP_MAX_BYTES_PER_RW - cmd->write_len) * 8; 491 491 dev_dbg(&pmcmsptwi_adapter.dev, "Writing 0x%016llx\n", tmp); 492 492 pmcmsptwi_writel(tmp & 0x00000000ffffffffLL,