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
This commit is contained in:
Linus Torvalds 2008-12-13 11:32:04 -08:00
Родитель 8d9c02ec76 2b895c3f35
Коммит 68b32d4499
2 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -92,7 +92,7 @@ static void highlander_i2c_setup(struct highlander_i2c_dev *dev)
static void smbus_write_data(u8 *src, u16 *dst, int len) static void smbus_write_data(u8 *src, u16 *dst, int len)
{ {
for (; len > 1; len -= 2) { for (; len > 1; len -= 2) {
*dst++ = be16_to_cpup((u16 *)src); *dst++ = be16_to_cpup((__be16 *)src);
src += 2; src += 2;
} }
@ -103,7 +103,7 @@ static void smbus_write_data(u8 *src, u16 *dst, int len)
static void smbus_read_data(u16 *src, u8 *dst, int len) static void smbus_read_data(u16 *src, u8 *dst, int len)
{ {
for (; len > 1; len -= 2) { for (; len > 1; len -= 2) {
*(u16 *)dst = cpu_to_be16p(src++); *(__be16 *)dst = cpu_to_be16p(src++);
dst += 2; dst += 2;
} }

Просмотреть файл

@ -486,7 +486,7 @@ static enum pmcmsptwi_xfer_result pmcmsptwi_xfer_cmd(
if (cmd->type == MSP_TWI_CMD_WRITE || if (cmd->type == MSP_TWI_CMD_WRITE ||
cmd->type == MSP_TWI_CMD_WRITE_READ) { cmd->type == MSP_TWI_CMD_WRITE_READ) {
__be64 tmp = cpu_to_be64p((u64 *)cmd->write_data); u64 tmp = be64_to_cpup((__be64 *)cmd->write_data);
tmp >>= (MSP_MAX_BYTES_PER_RW - cmd->write_len) * 8; tmp >>= (MSP_MAX_BYTES_PER_RW - cmd->write_len) * 8;
dev_dbg(&pmcmsptwi_adapter.dev, "Writing 0x%016llx\n", tmp); dev_dbg(&pmcmsptwi_adapter.dev, "Writing 0x%016llx\n", tmp);
pmcmsptwi_writel(tmp & 0x00000000ffffffffLL, pmcmsptwi_writel(tmp & 0x00000000ffffffffLL,