From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNqPn-00083E-TV for qemu-devel@nongnu.org; Wed, 12 Mar 2014 17:10:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNqPe-0008Tf-Q5 for qemu-devel@nongnu.org; Wed, 12 Mar 2014 17:10:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45526 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNqPe-0008Sd-JE for qemu-devel@nongnu.org; Wed, 12 Mar 2014 17:10:06 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 12 Mar 2014 22:09:42 +0100 Message-Id: <1394658603-13650-11-git-send-email-afaerber@suse.de> In-Reply-To: <1394658603-13650-1-git-send-email-afaerber@suse.de> References: <1394658603-13650-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL for-2.0-rc0 10/31] block/m25p80: Remove FROM_SSI_SLAVE() usages List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , Kevin Wolf , Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Stefan Hajnoczi From: Peter Crosthwaite Signed-off-by: Peter Crosthwaite [AF: Rename parent field] Signed-off-by: Andreas F=C3=A4rber --- hw/block/m25p80.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 02a1544..e29a738 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -241,7 +241,8 @@ typedef enum { } CMDState; =20 typedef struct Flash { - SSISlave ssidev; + SSISlave parent_obj; + uint32_t r; =20 BlockDriverState *bdrv; @@ -545,7 +546,7 @@ static void decode_new_cmd(Flash *s, uint32_t value) =20 static int m25p80_cs(SSISlave *ss, bool select) { - Flash *s =3D FROM_SSI_SLAVE(Flash, ss); + Flash *s =3D M25P80(ss); =20 if (select) { s->len =3D 0; @@ -561,7 +562,7 @@ static int m25p80_cs(SSISlave *ss, bool select) =20 static uint32_t m25p80_transfer8(SSISlave *ss, uint32_t tx) { - Flash *s =3D FROM_SSI_SLAVE(Flash, ss); + Flash *s =3D M25P80(ss); uint32_t r =3D 0; =20 switch (s->state) { @@ -610,7 +611,7 @@ static uint32_t m25p80_transfer8(SSISlave *ss, uint32= _t tx) static int m25p80_init(SSISlave *ss) { DriveInfo *dinfo; - Flash *s =3D FROM_SSI_SLAVE(Flash, ss); + Flash *s =3D M25P80(ss); M25P80Class *mc =3D M25P80_GET_CLASS(s); =20 s->pi =3D mc->pi; --=20 1.8.4.5