Skip to content

Commit

Permalink
ssi: Convert legacy SSI_BUS -> BUS casts
Browse files Browse the repository at this point in the history
Remove two legacy ->qbus style casts from TYPE_SSI_BUS to TYPE_BUS in
ssi.c.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
[AF: Convert one missing ->qbus and rename parent field]
Signed-off-by: Andreas Färber <afaerber@suse.de>
  • Loading branch information
pete128 authored and afaerber committed Mar 12, 2014
1 parent 1a7d9ee commit d43269d
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions hw/ssi/ssi.c
Expand Up @@ -15,7 +15,7 @@
#include "hw/ssi.h"

struct SSIBus {
BusState qbus;
BusState parent_obj;
};

#define TYPE_SSI_BUS "SSI"
Expand Down Expand Up @@ -88,7 +88,7 @@ static const TypeInfo ssi_slave_info = {

DeviceState *ssi_create_slave_no_init(SSIBus *bus, const char *name)
{
return qdev_create(&bus->qbus, name);
return qdev_create(BUS(bus), name);
}

DeviceState *ssi_create_slave(SSIBus *bus, const char *name)
Expand All @@ -108,11 +108,12 @@ SSIBus *ssi_create_bus(DeviceState *parent, const char *name)

uint32_t ssi_transfer(SSIBus *bus, uint32_t val)
{
BusState *b = BUS(bus);
BusChild *kid;
SSISlaveClass *ssc;
uint32_t r = 0;

QTAILQ_FOREACH(kid, &bus->qbus.children, sibling) {
QTAILQ_FOREACH(kid, &b->children, sibling) {
SSISlave *slave = SSI_SLAVE(kid->child);
ssc = SSI_SLAVE_GET_CLASS(slave);
r |= ssc->transfer_raw(slave, val);
Expand Down Expand Up @@ -156,7 +157,7 @@ static int ssi_auto_connect_slave(Object *child, void *opaque)
}

cs_line = qdev_get_gpio_in(DEVICE(dev), 0);
qdev_set_parent_bus(DEVICE(dev), &arg->bus->qbus);
qdev_set_parent_bus(DEVICE(dev), BUS(arg->bus));
**arg->cs_linep = cs_line;
(*arg->cs_linep)++;
return 0;
Expand Down

0 comments on commit d43269d

Please sign in to comment.