提交 a55bdf1e 编写于 作者: C Clemens Ladisch 提交者: Takashi Iwai

ALSA: seq: remove unused callback_all field

Signed-off-by: NClemens Ladisch <clemens@ladisch.de>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 1f2fb110
...@@ -64,7 +64,6 @@ struct snd_seq_port_callback { ...@@ -64,7 +64,6 @@ struct snd_seq_port_callback {
int (*unuse)(void *private_data, struct snd_seq_port_subscribe *info); 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); int (*event_input)(struct snd_seq_event *ev, int direct, void *private_data, int atomic, int hop);
void (*private_free)(void *private_data); void (*private_free)(void *private_data);
unsigned int callback_all; /* call subscribe callbacks at each connection/disconnection */
/*...*/ /*...*/
}; };
......
...@@ -1279,7 +1279,6 @@ static int snd_seq_ioctl_create_port(struct snd_seq_client *client, ...@@ -1279,7 +1279,6 @@ static int snd_seq_ioctl_create_port(struct snd_seq_client *client,
port->owner = callback->owner; port->owner = callback->owner;
port->private_data = callback->private_data; port->private_data = callback->private_data;
port->private_free = callback->private_free; port->private_free = callback->private_free;
port->callback_all = callback->callback_all;
port->event_input = callback->event_input; port->event_input = callback->event_input;
port->c_src.open = callback->subscribe; port->c_src.open = callback->subscribe;
port->c_src.close = callback->unsubscribe; port->c_src.close = callback->unsubscribe;
......
...@@ -411,9 +411,6 @@ int snd_seq_get_port_info(struct snd_seq_client_port * port, ...@@ -411,9 +411,6 @@ int snd_seq_get_port_info(struct snd_seq_client_port * port,
* invoked. * invoked.
* This feature is useful if these callbacks are associated with * This feature is useful if these callbacks are associated with
* initialization or termination of devices (see seq_midi.c). * 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, static int subscribe_port(struct snd_seq_client *client,
...@@ -427,7 +424,7 @@ 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)) if (!try_module_get(port->owner))
return -EFAULT; return -EFAULT;
grp->count++; grp->count++;
if (grp->open && (port->callback_all || grp->count == 1)) { if (grp->open && grp->count == 1) {
err = grp->open(port->private_data, info); err = grp->open(port->private_data, info);
if (err < 0) { if (err < 0) {
module_put(port->owner); module_put(port->owner);
...@@ -452,7 +449,7 @@ static int unsubscribe_port(struct snd_seq_client *client, ...@@ -452,7 +449,7 @@ static int unsubscribe_port(struct snd_seq_client *client,
if (! grp->count) if (! grp->count)
return -EINVAL; return -EINVAL;
grp->count--; grp->count--;
if (grp->close && (port->callback_all || grp->count == 0)) if (grp->close && grp->count == 0)
err = grp->close(port->private_data, info); err = grp->close(port->private_data, info);
if (send_ack && client->type == USER_CLIENT) if (send_ack && client->type == USER_CLIENT)
snd_seq_client_notify_subscription(port->addr.client, port->addr.port, snd_seq_client_notify_subscription(port->addr.client, port->addr.port,
......
...@@ -73,7 +73,6 @@ struct snd_seq_client_port { ...@@ -73,7 +73,6 @@ struct snd_seq_client_port {
int atomic, int hop); int atomic, int hop);
void (*private_free)(void *private_data); void (*private_free)(void *private_data);
void *private_data; void *private_data;
unsigned int callback_all : 1;
unsigned int closing : 1; unsigned int closing : 1;
unsigned int timestamping: 1; unsigned int timestamping: 1;
unsigned int time_real: 1; unsigned int time_real: 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册