From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XorE2-0001yD-CF for qemu-devel@nongnu.org; Thu, 13 Nov 2014 05:02:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XorDw-0007fO-PX for qemu-devel@nongnu.org; Thu, 13 Nov 2014 05:02:02 -0500 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:39260 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XorDw-0007f9-Jp for qemu-devel@nongnu.org; Thu, 13 Nov 2014 05:01:56 -0500 References: <1415751963-4081-1-git-send-email-greg.bellows@linaro.org> <1415751963-4081-2-git-send-email-greg.bellows@linaro.org> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1415751963-4081-2-git-send-email-greg.bellows@linaro.org> Date: Thu, 13 Nov 2014 10:01:56 +0000 Message-ID: <87tx23h10r.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v1 01/15] android-console: Fix goldfish audio misnaming List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Greg Bellows Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, christoffer.dall@linaro.org Greg Bellows 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 > --- > 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); -- Alex Bennée