Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mfd: Push byte swap out of WM8994 bulk I/O

For bulk I/O it is both convenient and more sensible to pre-swap the data
rather than doing the swap as part of the I/O operation so move the byte
swaps we're currently doing into the core write function into the register
based functions, giving the bulk write function a straight pass through
to the chip.

This leaves reads inconsistent, this will be addressed as a followup patch.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

authored by

Mark Brown and committed by
Samuel Ortiz
4277163c 334e9ab8

+6 -4
+6 -4
drivers/mfd/wm8994-core.c
··· 107 107 108 108 for (i = 0; i < bytes / 2; i++) { 109 109 dev_vdbg(wm8994->dev, "Write %04x to R%d(0x%x)\n", 110 - buf[i], reg + i, reg + i); 111 - 112 - buf[i] = cpu_to_be16(buf[i]); 110 + be16_to_cpu(buf[i]), reg + i, reg + i); 113 111 } 114 112 115 113 return wm8994->write_dev(wm8994, reg, bytes, src); ··· 125 127 { 126 128 int ret; 127 129 130 + val = cpu_to_be16(val); 131 + 128 132 mutex_lock(&wm8994->io_lock); 129 133 130 134 ret = wm8994_write(wm8994, reg, 2, &val); ··· 143 143 * @wm8994: Device to write to 144 144 * @reg: First register 145 145 * @count: Number of registers 146 - * @buf: Buffer to write from. 146 + * @buf: Buffer to write from. Data must be big-endian formatted. 147 147 */ 148 148 int wm8994_bulk_write(struct wm8994 *wm8994, unsigned short reg, 149 149 int count, u16 *buf) ··· 182 182 183 183 r &= ~mask; 184 184 r |= val; 185 + 186 + r = cpu_to_be16(r); 185 187 186 188 ret = wm8994_write(wm8994, reg, 2, &r); 187 189