]> Git Repo - qemu.git/commitdiff
oss: Remove unused error handling of qemu_set_fd_handler
authorFam Zheng <[email protected]>
Thu, 4 Jun 2015 06:45:21 +0000 (14:45 +0800)
committerStefan Hajnoczi <[email protected]>
Fri, 12 Jun 2015 12:26:21 +0000 (13:26 +0100)
The function cannot fail, so the check is superfluous.

Signed-off-by: Fam Zheng <[email protected]>
Message-id: 1433400324[email protected]
Signed-off-by: Stefan Hajnoczi <[email protected]>
audio/ossaudio.c

index 4db2ca65bf917b6276d7f6ddbc13f22badfbf091..b9c6b30ca160503d95423ccbe9d34c310ff4403c 100644 (file)
@@ -138,18 +138,18 @@ static void oss_helper_poll_in (void *opaque)
     audio_run ("oss_poll_in");
 }
 
-static int oss_poll_out (HWVoiceOut *hw)
+static void oss_poll_out (HWVoiceOut *hw)
 {
     OSSVoiceOut *oss = (OSSVoiceOut *) hw;
 
-    return qemu_set_fd_handler (oss->fd, NULL, oss_helper_poll_out, NULL);
+    qemu_set_fd_handler (oss->fd, NULL, oss_helper_poll_out, NULL);
 }
 
-static int oss_poll_in (HWVoiceIn *hw)
+static void oss_poll_in (HWVoiceIn *hw)
 {
     OSSVoiceIn *oss = (OSSVoiceIn *) hw;
 
-    return qemu_set_fd_handler (oss->fd, oss_helper_poll_in, NULL, NULL);
+    qemu_set_fd_handler (oss->fd, oss_helper_poll_in, NULL, NULL);
 }
 
 static int oss_write (SWVoiceOut *sw, void *buf, int len)
@@ -634,7 +634,8 @@ static int oss_ctl_out (HWVoiceOut *hw, int cmd, ...)
             va_end (ap);
 
             ldebug ("enabling voice\n");
-            if (poll_mode && oss_poll_out (hw)) {
+            if (poll_mode) {
+                oss_poll_out (hw);
                 poll_mode = 0;
             }
             hw->poll_mode = poll_mode;
@@ -828,7 +829,8 @@ static int oss_ctl_in (HWVoiceIn *hw, int cmd, ...)
             poll_mode = va_arg (ap, int);
             va_end (ap);
 
-            if (poll_mode && oss_poll_in (hw)) {
+            if (poll_mode) {
+                oss_poll_in (hw);
                 poll_mode = 0;
             }
             hw->poll_mode = poll_mode;
This page took 0.028694 seconds and 4 git commands to generate.