| Message ID | 1415751963-4081-2-git-send-email-greg.bellows@linaro.org |
|---|---|
| State | New |
| Headers | show |
Greg Bellows <greg.bellows@linaro.org> writes: > Replaced goldfish_audio misnaming to goldfish_battery where appropriate in > goldfish_battery.c Ahh good 'ole copy pasta bugs ;-) This will probably be worth squash merging when we clean-up the tree. > > Signed-off-by: Greg Bellows <greg.bellows@linaro.org> > --- > hw/misc/goldfish_battery.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/misc/goldfish_battery.c b/hw/misc/goldfish_battery.c > index 03847d6..89fd05d 100644 > --- a/hw/misc/goldfish_battery.c > +++ b/hw/misc/goldfish_battery.c > @@ -121,7 +121,7 @@ static void goldfish_battery_write(void *opaque, hwaddr offset, uint64_t val, > break; > > default: > - error_report ("goldfish_audio_write: Bad offset " TARGET_FMT_plx, > + error_report("goldfish_battery_write: Bad offset " TARGET_FMT_plx, > offset); > } > } > @@ -161,16 +161,16 @@ static void goldfish_battery_class_init(ObjectClass *klass, void *data) > dc->desc = "goldfish battery"; > } > > -static const TypeInfo goldfish_audio_info = { > +static const TypeInfo goldfish_battery_info = { > .name = TYPE_GOLDFISH_BATTERY, > .parent = TYPE_SYS_BUS_DEVICE, > .instance_size = sizeof(struct goldfish_battery_state), > .class_init = goldfish_battery_class_init, > }; > > -static void goldfish_audio_register(void) > +static void goldfish_battery_register(void) > { > - type_register_static(&goldfish_audio_info); > + type_register_static(&goldfish_battery_info); > } > > -type_init(goldfish_audio_register); > +type_init(goldfish_battery_register);
diff --git a/hw/misc/goldfish_battery.c b/hw/misc/goldfish_battery.c index 03847d6..89fd05d 100644 --- a/hw/misc/goldfish_battery.c +++ b/hw/misc/goldfish_battery.c @@ -121,7 +121,7 @@ static void goldfish_battery_write(void *opaque, hwaddr offset, uint64_t val, break; default: - error_report ("goldfish_audio_write: Bad offset " TARGET_FMT_plx, + error_report("goldfish_battery_write: Bad offset " TARGET_FMT_plx, offset); } } @@ -161,16 +161,16 @@ static void goldfish_battery_class_init(ObjectClass *klass, void *data) dc->desc = "goldfish battery"; } -static const TypeInfo goldfish_audio_info = { +static const TypeInfo goldfish_battery_info = { .name = TYPE_GOLDFISH_BATTERY, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(struct goldfish_battery_state), .class_init = goldfish_battery_class_init, }; -static void goldfish_audio_register(void) +static void goldfish_battery_register(void) { - type_register_static(&goldfish_audio_info); + type_register_static(&goldfish_battery_info); } -type_init(goldfish_audio_register); +type_init(goldfish_battery_register);
Replaced goldfish_audio misnaming to goldfish_battery where appropriate in goldfish_battery.c Signed-off-by: Greg Bellows <greg.bellows@linaro.org> --- hw/misc/goldfish_battery.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)