@@ -180,16 +180,14 @@ static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset,
};
/* buf->data is maximum size - we may only use parts of it */
struct um_pci_message_buffer *buf;
- u8 *data;
unsigned long ret = ~0ULL;
if (!dev)
return ~0ULL;
buf = get_cpu_var(um_pci_msg_bufs);
- data = buf->data;
- memset(data, 0xff, sizeof(data));
+ memset(buf->data, 0xff, sizeof(buf->data));
switch (size) {
case 1:
@@ -204,22 +202,22 @@ static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset,
goto out;
}
- if (um_pci_send_cmd(dev, &hdr, sizeof(hdr), NULL, 0, data, 8))
+ if (um_pci_send_cmd(dev, &hdr, sizeof(hdr), NULL, 0, buf->data, 8))
goto out;
switch (size) {
case 1:
- ret = data[0];
+ ret = buf->data[0];
break;
case 2:
- ret = le16_to_cpup((void *)data);
+ ret = le16_to_cpup((void *)buf->data);
break;
case 4:
- ret = le32_to_cpup((void *)data);
+ ret = le32_to_cpup((void *)buf->data);
break;
#ifdef CONFIG_64BIT
case 8:
- ret = le64_to_cpup((void *)data);
+ ret = le64_to_cpup((void *)buf->data);
break;
#endif
default: