Get rid of pulse_poll_revents()

pulse_poll_revents() has no real purpose, so let's remove it.

diff --git a/pulse/ctl_pulse.c b/pulse/ctl_pulse.c
index daffd3be490975a3dceb15bf0fb1d71d679d75dc..aa8c2844d6decb4b7b81626a0e4bb47157fba20e 100644 (file)
--- a/pulse/ctl_pulse.c
+++ b/pulse/ctl_pulse.c
@@ -554,16 +554,11 @@ static int pulse_ctl_poll_revents(snd_ctl_ext_t * ext, struct pollfd *pfd,
 
        pa_threaded_mainloop_lock(ctl->p->mainloop);
 
-       err = pulse_poll_revents(ctl->p, pfd, nfds, revents);
-       if (err < 0)
-               goto finish;
-
        *revents = 0;
 
        if (ctl->updated)
                *revents |= POLLIN;
 
-      finish:
        pa_threaded_mainloop_unlock(ctl->p->mainloop);
 
        return err;

diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c
index 188641c864374b08cae6dd2f2a23477cbcc4f291..8d823b5c111b67766224bbc9940102f79f88ee1e 100644 (file)
--- a/pulse/pcm_pulse.c
+++ b/pulse/pcm_pulse.c
@@ -458,10 +458,6 @@ static int pulse_pcm_poll_revents(snd_pcm_ioplug_t * io,
 
        pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-       err = pulse_poll_revents(pcm->p, pfd, nfds, revents);
-       if (err < 0)
-               goto finish;
-
        *revents = 0;
 
        /*
@@ -479,7 +475,6 @@ static int pulse_pcm_poll_revents(snd_pcm_ioplug_t * io,
                        *revents |= POLLIN;
        }
 
-      finish:
        pa_threaded_mainloop_unlock(pcm->p->mainloop);
 
        return err;

diff --git a/pulse/pulse.c b/pulse/pulse.c
index 8e47b6c912af46a71f1b227815acec15bcabccb8..5babceaa5225023d1630a79f48c264a7ca4963ad 100644 (file)
--- a/pulse/pulse.c
+++ b/pulse/pulse.c
@@ -260,11 +260,3 @@ int pulse_poll_descriptors(snd_pulse_t * p, struct pollfd *pfd,
 
        return 1;
 }
-
-int pulse_poll_revents(snd_pulse_t * p, struct pollfd *pfd,
-                      unsigned int nfds, unsigned short *revents)
-{
-       assert(p);
-
-       return 1;
-}

diff --git a/pulse/pulse.h b/pulse/pulse.h
index 9dd51a9912812d04a6ccb048a13f6d0712ac7845..33723da573a4f59fdbbe4bee9f18d93bf4c91e9d 100644 (file)
--- a/pulse/pulse.h
+++ b/pulse/pulse.h
@@ -36,6 +36,7 @@ typedef struct snd_pulse {
                PULSE_STATE_INIT,
                PULSE_STATE_READY,
        } state;
+
 } snd_pulse_t;
 
 int pulse_check_connection(snd_pulse_t * p);
@@ -58,5 +59,3 @@ void pulse_poll_deactivate(snd_pulse_t * p);
 int pulse_poll_descriptors_count(snd_pulse_t * p);
 int pulse_poll_descriptors(snd_pulse_t * p, struct pollfd *pfd,
                           unsigned int space);
-int pulse_poll_revents(snd_pulse_t * p, struct pollfd *pfd,
-                      unsigned int nfds, unsigned short *revents);