openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

oss: Remove unused error handling of qemu_set_fd_handler 

The function cannot fail, so the check is superfluous.

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-id: 1433400324-7358-11-git-send-email-famz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Fam Zheng 2015-06-04 14:45:21 +08:00 committed by Stefan Hajnoczi
parent be93f21627
commit b027a538c6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
audio/ossaudio.c
View File

@ -138,18 +138,18 @@ static void oss_helper_poll_in (void *opaque)
audio_run ("oss_poll_in"); audio_run ("oss_poll_in");
} }
static int oss_poll_out (HWVoiceOut *hw) static void oss_poll_out (HWVoiceOut *hw)
{ {
OSSVoiceOut *oss = (OSSVoiceOut *) 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; 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) 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); va_end (ap);
ldebug ("enabling voice\n"); ldebug ("enabling voice\n");
if (poll_mode && oss_poll_out (hw)) { if (poll_mode) {
oss_poll_out (hw);
poll_mode = 0; poll_mode = 0;
} }
hw->poll_mode = poll_mode; hw->poll_mode = poll_mode;
@ -828,7 +829,8 @@ static int oss_ctl_in (HWVoiceIn *hw, int cmd, ...)
poll_mode = va_arg (ap, int); poll_mode = va_arg (ap, int);
va_end (ap); va_end (ap);
if (poll_mode && oss_poll_in (hw)) { if (poll_mode) {
oss_poll_in (hw);
poll_mode = 0; poll_mode = 0;
} }
hw->poll_mode = poll_mode; hw->poll_mode = poll_mode;