ALSA: seq: remove unused callback_all field

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/seq_kernel.h b/include/sound/seq_kernel.h
index ab8ddd9328ac7eb61362a6b2d7c2739fda1896c4..f1c8e94524b822e8d0aa1c13f942db56cf06c5c5 100644 (file)
--- a/include/sound/seq_kernel.h
+++ b/include/sound/seq_kernel.h
@@ -64,7 +64,6 @@ struct snd_seq_port_callback {
        int (*unuse)(void *private_data, struct snd_seq_port_subscribe *info);
        int (*event_input)(struct snd_seq_event *ev, int direct, void *private_data, int atomic, int hop);
        void (*private_free)(void *private_data);
-       unsigned int callback_all;      /* call subscribe callbacks at each connection/disconnection */
        /*...*/
 };
 

diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index 808918ad29385cddc1dcd1e5d14033566c03dc87..29182f56bfb70307c8e6d88e46984771e1824c96 100644 (file)
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -1279,7 +1279,6 @@ static int snd_seq_ioctl_create_port(struct snd_seq_client *client,
                                port->owner = callback->owner;
                        port->private_data = callback->private_data;
                        port->private_free = callback->private_free;
-                       port->callback_all = callback->callback_all;
                        port->event_input = callback->event_input;
                        port->c_src.open = callback->subscribe;
                        port->c_src.close = callback->unsubscribe;

diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c
index 52b279b7b030264e9135564fad27df81d65b4095..46ff593f618dc0b75ea66f886e051c035f2aebad 100644 (file)
--- a/sound/core/seq/seq_ports.c
+++ b/sound/core/seq/seq_ports.c
@@ -411,9 +411,6 @@ int snd_seq_get_port_info(struct snd_seq_client_port * port,
  * invoked.
  * This feature is useful if these callbacks are associated with
  * initialization or termination of devices (see seq_midi.c).
- *
- * If callback_all option is set, the callback function is invoked
- * at each connection/disconnection. 
  */
 
 static int subscribe_port(struct snd_seq_client *client,
@@ -427,7 +424,7 @@ static int subscribe_port(struct snd_seq_client *client,
        if (!try_module_get(port->owner))
                return -EFAULT;
        grp->count++;
-       if (grp->open && (port->callback_all || grp->count == 1)) {
+       if (grp->open && grp->count == 1) {
                err = grp->open(port->private_data, info);
                if (err < 0) {
                        module_put(port->owner);
@@ -452,7 +449,7 @@ static int unsubscribe_port(struct snd_seq_client *client,
        if (! grp->count)
                return -EINVAL;
        grp->count--;
-       if (grp->close && (port->callback_all || grp->count == 0))
+       if (grp->close && grp->count == 0)
                err = grp->close(port->private_data, info);
        if (send_ack && client->type == USER_CLIENT)
                snd_seq_client_notify_subscription(port->addr.client, port->addr.port,

diff --git a/sound/core/seq/seq_ports.h b/sound/core/seq/seq_ports.h
index 9d7117118ba481a9b25aef7d757730cc48d8139f..26bd71f36c41d1961d3be970d0264e6aef06483d 100644 (file)
--- a/sound/core/seq/seq_ports.h
+++ b/sound/core/seq/seq_ports.h
@@ -73,7 +73,6 @@ struct snd_seq_client_port {
                           int atomic, int hop);
        void (*private_free)(void *private_data);
        void *private_data;
-       unsigned int callback_all : 1;
        unsigned int closing : 1;
        unsigned int timestamping: 1;
        unsigned int time_real: 1;