[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next v1 6/6] block/m25p80: Remove FROM_SSI_SLAVE
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH qom-next v1 6/6] block/m25p80: Remove FROM_SSI_SLAVE usages |
Date: |
Tue, 11 Feb 2014 16:30:45 -0800 |
Signed-off-by: Peter Crosthwaite <address@hidden>
---
hw/block/m25p80.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index 02a1544..bdbb139 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -545,7 +545,7 @@ static void decode_new_cmd(Flash *s, uint32_t value)
static int m25p80_cs(SSISlave *ss, bool select)
{
- Flash *s = FROM_SSI_SLAVE(Flash, ss);
+ Flash *s = M25P80(ss);
if (select) {
s->len = 0;
@@ -561,7 +561,7 @@ static int m25p80_cs(SSISlave *ss, bool select)
static uint32_t m25p80_transfer8(SSISlave *ss, uint32_t tx)
{
- Flash *s = FROM_SSI_SLAVE(Flash, ss);
+ Flash *s = M25P80(ss);
uint32_t r = 0;
switch (s->state) {
@@ -610,7 +610,7 @@ static uint32_t m25p80_transfer8(SSISlave *ss, uint32_t tx)
static int m25p80_init(SSISlave *ss)
{
DriveInfo *dinfo;
- Flash *s = FROM_SSI_SLAVE(Flash, ss);
+ Flash *s = M25P80(ss);
M25P80Class *mc = M25P80_GET_CLASS(s);
s->pi = mc->pi;
--
1.8.5.4
- [Qemu-devel] [PATCH qom-next v1 0/6] SSI QOM cleanups, Peter Crosthwaite, 2014/02/11
- [Qemu-devel] [PATCH qom-next v1 1/6] ssi: Convert legacy casts from SSI_SLAVE->DEVICE, Peter Crosthwaite, 2014/02/11
- [Qemu-devel] [PATCH qom-next v1 2/6] ssi: Remove legacy SSI_BUS->BUS cast, Peter Crosthwaite, 2014/02/11
- [Qemu-devel] [PATCH qom-next v1 3/6] misc: max111x: Create abstract max111x class, Peter Crosthwaite, 2014/02/11
- [Qemu-devel] [PATCH qom-next v1 4/6] misc: max111x: QOM casting sweep, Peter Crosthwaite, 2014/02/11
- [Qemu-devel] [PATCH qom-next v1 5/6] ssi: Remove SSI_SLAVE_FROM_QDEV macro, Peter Crosthwaite, 2014/02/11
- [Qemu-devel] [PATCH qom-next v1 6/6] block/m25p80: Remove FROM_SSI_SLAVE usages,
Peter Crosthwaite <=
- Re: [Qemu-devel] [PATCH qom-next v1 0/6] SSI QOM cleanups, Peter Crosthwaite, 2014/02/25