From patchwork Tue Apr 12 18:10:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nutan Shinde X-Patchwork-Id: 8813711 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8D8E0C0553 for ; Tue, 12 Apr 2016 18:10:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B90C520173 for ; Tue, 12 Apr 2016 18:10:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CD281201BB for ; Tue, 12 Apr 2016 18:10:25 +0000 (UTC) Received: from localhost ([::1]:54728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aq2ld-0008EX-2D for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Apr 2016 14:10:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aq2lU-0008Ce-9L for qemu-devel@nongnu.org; Tue, 12 Apr 2016 14:10:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aq2lT-0002nT-2E for qemu-devel@nongnu.org; Tue, 12 Apr 2016 14:10:16 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:35987) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aq2lS-0002mh-PC for qemu-devel@nongnu.org; Tue, 12 Apr 2016 14:10:15 -0400 Received: by mail-wm0-x242.google.com with SMTP id l6so7528277wml.3 for ; Tue, 12 Apr 2016 11:10:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to; bh=gZkVrKDZDNmvwTydrgc9nsNpX0ayKhGF0av2625VNXk=; b=POxJlTPVIT1xyH/edjnMH7CUjfdYPf059EqZSyb+YlGzwsmvfIzBzl1Cb8z7SrC/Cu vMUH4O7jqroxdiSq5uhx4P9Z1iDSlH5brQjnYBko8q1k2Rk58yJHVPDUPl4NWlmSGTXC Pr+kqmmkmELxgELgiOO63vJakPSE9U8fOxUHehlcZ8X1RBB0WNqkBvrcLZRCeLlKgnwi YBqKxjm20IO4njJV76Nwv7cOZQ8uq8ISlEm8xTQ5ezxfAMC2jBO0uZhnuEoHG0+bTRCs Fobpq8sr/OP/6uAtLZaNAWV5yCdLcpCwVdsZSIkrrJ/ikIlnPnHGRFZzq4+paiVkGAE8 S6yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to; bh=gZkVrKDZDNmvwTydrgc9nsNpX0ayKhGF0av2625VNXk=; b=ItdnTeLZqt/qA32tqEReoLDpX19ezTLpdrx6NQn0gHX03O9k92JnBsJKjm1a24E9Px /uMeCltisqqMFPnnlsqpJPGK+wQe5JmHrAbnSOB9BNKWk1dc48z0SokLxTqj4E4v6Vky 1Bo1A6Q/ueTZa2YKJBWK10SLPMru2YeIimM/Nwr2d3jcINL1wqId5qxYLlruq0WBI+ff do4lHnkInANf9NHPOb2mFPGo8VWbtXkfAfcE8EOq79tme/69OWFC2KE0KxXb+LTOL7+R Q5C5l2FXhOz3/51x3610yExnp5sUWh2UVnvM//4lULfSzle9rDcMCPykQH5dY1faxjCY WY0g== X-Gm-Message-State: AOPr4FWoNLhX3NnC+1TMqHdUof9yuxj4gh60xepu7j+e+VwSPFDSODmudandmCWmeExPurp8/D6LRKEq/tgu2A== MIME-Version: 1.0 X-Received: by 10.194.21.131 with SMTP id v3mr5204443wje.132.1460484614078; Tue, 12 Apr 2016 11:10:14 -0700 (PDT) Received: by 10.194.38.101 with HTTP; Tue, 12 Apr 2016 11:10:14 -0700 (PDT) In-Reply-To: <1460484494-5630-1-git-send-email-nutanshinde1992@gmail.com> References: <1460484494-5630-1-git-send-email-nutanshinde1992@gmail.com> Date: Tue, 12 Apr 2016 23:40:14 +0530 Message-ID: From: Nutan Shinde To: QEMU Developers , kraxel@redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] Fwd: [PATCH v2 1/5] Change return type of functions that are named *_exit or *_exitfn in hw/ from int to void X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, HTML_MESSAGE, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This changes is required because the return type of exit(error) function is not used. This patch only has changes for files in hw/audio package. Signed-off-by: Nutan Shinde --- hw/audio/hda-codec.c | 3 +-- hw/audio/intel-hda.c | 3 +-- hw/audio/intel-hda.h | 2 +- include/hw/qdev-core.h | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) -- 1.9.1 diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index 52d4640..5402cd1 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -520,7 +520,7 @@ static int hda_audio_init(HDACodecDevice *hda, const struct desc_codec *desc) return 0; } -static int hda_audio_exit(HDACodecDevice *hda) +static void hda_audio_exit(HDACodecDevice *hda) { HDAAudioState *a = HDA_AUDIO(hda); HDAAudioStream *st; @@ -539,7 +539,6 @@ static int hda_audio_exit(HDACodecDevice *hda) } } AUD_remove_card(&a->card); - return 0; } static int hda_audio_post_load(void *opaque, int version) diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index d372d4a..404cfcf 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -66,7 +66,7 @@ static int hda_codec_dev_init(DeviceState *qdev) return cdc->init(dev); } -static int hda_codec_dev_exit(DeviceState *qdev) +static void hda_codec_dev_exit(DeviceState *qdev) { HDACodecDevice *dev = DO_UPCAST(HDACodecDevice, qdev, qdev); HDACodecDeviceClass *cdc = HDA_CODEC_DEVICE_GET_CLASS(dev); @@ -74,7 +74,6 @@ static int hda_codec_dev_exit(DeviceState *qdev) if (cdc->exit) { cdc->exit(dev); } - return 0; } HDACodecDevice *hda_codec_find(HDACodecBus *bus, uint32_t cad) diff --git a/hw/audio/intel-hda.h b/hw/audio/intel-hda.h index d784bcf..53b78da 100644 --- a/hw/audio/intel-hda.h +++ b/hw/audio/intel-hda.h @@ -38,7 +38,7 @@ typedef struct HDACodecDeviceClass DeviceClass parent_class; int (*init)(HDACodecDevice *dev); - int (*exit)(HDACodecDevice *dev); + void (*exit)(HDACodecDevice *dev); void (*command)(HDACodecDevice *dev, uint32_t nid, uint32_t data); void (*stream)(HDACodecDevice *dev, uint32_t stnr, bool running, bool output); } HDACodecDeviceClass; diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 1ce02b2..0b635bd 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -30,7 +30,7 @@ typedef enum DeviceCategory { } DeviceCategory; typedef int (*qdev_initfn)(DeviceState *dev); -typedef int (*qdev_event)(DeviceState *dev); +typedef void (*qdev_event)(DeviceState *dev); typedef void (*qdev_resetfn)(DeviceState *dev); typedef void (*DeviceRealize)(DeviceState *dev, Error **errp); typedef void (*DeviceUnrealize)(DeviceState *dev, Error **errp);