From patchwork Tue Apr 12 18:04:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nutan Shinde X-Patchwork-Id: 8813581 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9F2FA9F39A for ; Tue, 12 Apr 2016 18:04:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E751A20361 for ; Tue, 12 Apr 2016 18:04:52 +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 39D7320320 for ; Tue, 12 Apr 2016 18:04:52 +0000 (UTC) Received: from localhost ([::1]:54623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aq2gF-00089I-92 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Apr 2016 14:04:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aq2g7-00085H-De for qemu-devel@nongnu.org; Tue, 12 Apr 2016 14:04:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aq2g3-0000uO-D2 for qemu-devel@nongnu.org; Tue, 12 Apr 2016 14:04:43 -0400 Received: from mail-pa0-x242.google.com ([2607:f8b0:400e:c03::242]:33403) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aq2g3-0000uI-6H for qemu-devel@nongnu.org; Tue, 12 Apr 2016 14:04:39 -0400 Received: by mail-pa0-x242.google.com with SMTP id vv3so1869636pab.0 for ; Tue, 12 Apr 2016 11:04:39 -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=Fm1ViyF9DmZe+lrD6XVrXTVX6R921qkr9dcNHqcvIvzIJfBHfbCZb0ylwLVyQFiaq6 3LCQbJCncNXk0TnitMfE2XiPMGbQ0I4aRUup1gIwyMcPx5m1mmgy89oikXwf98b7VC02 Km5S2FYH/4pqQDe81BBVAUpozanBjIc+nEVAWU8cHUzhHr0C2N/RrjMbwwZVYgz22j/V SWdM+cN62jbWrWbo6GOJ9d5iR7l6sxUotrOHUh0JiLfDpTe11YPiFDVrgan9lRSWcXPz V/bYbGkkTJkB5avprzQEcFVgkNA/HECyB49TY8Xv/VHGCReRxLSEBhTY+aoOSVGSehsh 6uvA== 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=PYQDQ3wC4oPZLGi3dKJxhLQ/K3Eb6PeVK9SSB3AtWml1wpluiWmw4APjg5CHJ/LREp IRNS4GGRlXBqEPjR5o9/KI7LtvfLB1+lRQmkM9+az77wah62DJpM76Q2QHZuyWtYJGcX E4xt5J8v2/jyrZlGq7cOEI2BmmeYnMYxAT4G11EoLypGga+D2Wh7fmguLIN+RwtDMgTO uvjvcpG3xCMaS0Tah0a8BT4lnpyCe9rGRpFbs/RnInD02BwXvStEvKMgkiPWbhPx/3oz NRCnVMGta1i8UtEcPyRr19/+R+6MyNtubTFlyiydOJ8rSQlfzxm5FfkKfqvRVAQ7X7x7 ZqsA== X-Gm-Message-State: AOPr4FU1I3vbgxTR4yf6oQBACqCtC4U4TDMlLMWp+1AN/Ga5ihHdCc2tRDm+JgW1+yNp9g== X-Received: by 10.66.79.162 with SMTP id k2mr6428249pax.121.1460484278180; Tue, 12 Apr 2016 11:04:38 -0700 (PDT) Received: from localhost.localdomain ([103.51.73.179]) by smtp.gmail.com with ESMTPSA id 19sm45160285pfp.66.2016.04.12.11.04.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Apr 2016 11:04:37 -0700 (PDT) From: Nutan Shinde To: qemu-devel@nongnu.org, nutanshinde1992@gmail.com Date: Tue, 12 Apr 2016 23:34:12 +0530 Message-Id: <1460484253-5422-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::242 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);