From patchwork Tue Apr 12 18:07:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nutan Shinde X-Patchwork-Id: 8813601 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 0F404C0554 for ; Tue, 12 Apr 2016 18:07:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 51EB320320 for ; Tue, 12 Apr 2016 18:07:53 +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 587C32013A for ; Tue, 12 Apr 2016 18:07:52 +0000 (UTC) Received: from localhost ([::1]:54689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aq2j9-0004gw-N9 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Apr 2016 14:07:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aq2j1-0004cm-7n for qemu-devel@nongnu.org; Tue, 12 Apr 2016 14:07:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aq2iw-0001gC-CX for qemu-devel@nongnu.org; Tue, 12 Apr 2016 14:07:43 -0400 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]:36039) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aq2iw-0001fV-68 for qemu-devel@nongnu.org; Tue, 12 Apr 2016 14:07:38 -0400 Received: by mail-pa0-x241.google.com with SMTP id k3so1875961pav.3 for ; Tue, 12 Apr 2016 11:07:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=RSM8p3SF1NCUDX+aQRHFLcOXNEtFipnUa1YsQMPhYRA=; b=F5O5ny7j3W+hDMUrqULw/aXEoVYYwacLLgssDBfI89xtO2lU1qxfI2uzt4tcpZGeCq YDX81UM4Jfl4WREm2kva2OWlnAAw5wZAtNxKAYZ9zsn99+G1lneKEGkI8k9snVOaieaw SkKo45wKFWLH9dD55EUBGXwIuQ2AvcUWiNV91Nz4HWdjDI960KrhJLFkAFq4SpDk3wGJ x4+UDJ6esHf1n8Y74QRnt2wm5fTpRF9eQ/ukfygAxgK5BWsh19ffmPl24a6lBTm/NIOR KOJLQB7EN6tgJWsvPAYb+FbyLe0I66edpfGMzDGKSpqKRCH4zokha87ZVsxEBJ+QK5Eq ukJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=RSM8p3SF1NCUDX+aQRHFLcOXNEtFipnUa1YsQMPhYRA=; b=Prelg7m64bsQfUVKw18c8nshClkaQhaTk0eDV4GtlFEu4K5yQJHeuYOij1nr789nid Glno67E2bh3s0g6D7DRKdFF0FUyCS+uplbAtnZtr3RJIJTjdh8NRZQiCfCaTBZItbArZ fyEVLV68nUaq4T58a6BVHLKUFp9ME2bo6+Uv4Kkt8NQ7uM8x7EzL73i4irBXaCopGbGt 8XM/lmystkgJQjRfrine+e83l9k2uy9QXLsqxZwxgjl4n9GVT408jCrbc3bX1MLI9u+n /erzCdMw8FTRVolitOvJ/KCinegwDe8x9fSfVVUC+h2ISCOyEz+p3CQ+l5c7BPOMNGPF c/VQ== X-Gm-Message-State: AOPr4FV68cB+IM4FVrLKM++IB8hbGED7cIUXm2zZqW3/c+VQlSG9d4HgzMFh/ohDgdidaA== X-Received: by 10.66.148.232 with SMTP id tv8mr6453110pab.21.1460484457477; Tue, 12 Apr 2016 11:07:37 -0700 (PDT) Received: from localhost.localdomain ([103.51.73.179]) by smtp.gmail.com with ESMTPSA id bk8sm45269868pac.3.2016.04.12.11.07.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Apr 2016 11:07:36 -0700 (PDT) From: Nutan Shinde To: qemu-devel@nongnu.org, nutanshinde1992@gmail.com Date: Tue, 12 Apr 2016 23:37:26 +0530 Message-Id: <1460484447-5583-1-git-send-email-nutanshinde1992@gmail.com> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c03::241 Subject: [Qemu-devel] [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: , Cc: kraxel@redhat.com 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, 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(-) 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);