diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2015-01-25 08:36:27 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-26 07:56:58 -0500 |
commit | a55bdf1ec5945050bfce9c3b2c3d8b70e8fd01a1 (patch) | |
tree | 58ba676f57162e6edb9e007e34d1b89fed2c46ce /sound/core | |
parent | 1f2fb110259afef478d65051c149ed04bd94c655 (diff) |
ALSA: seq: remove unused callback_all field
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/seq/seq_clientmgr.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_ports.c | 7 | ||||
-rw-r--r-- | sound/core/seq/seq_ports.h | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 808918ad2938..29182f56bfb7 100644 --- 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, | |||
1279 | port->owner = callback->owner; | 1279 | port->owner = callback->owner; |
1280 | port->private_data = callback->private_data; | 1280 | port->private_data = callback->private_data; |
1281 | port->private_free = callback->private_free; | 1281 | port->private_free = callback->private_free; |
1282 | port->callback_all = callback->callback_all; | ||
1283 | port->event_input = callback->event_input; | 1282 | port->event_input = callback->event_input; |
1284 | port->c_src.open = callback->subscribe; | 1283 | port->c_src.open = callback->subscribe; |
1285 | port->c_src.close = callback->unsubscribe; | 1284 | port->c_src.close = callback->unsubscribe; |
diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c index 52b279b7b030..46ff593f618d 100644 --- 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, | |||
411 | * invoked. | 411 | * invoked. |
412 | * This feature is useful if these callbacks are associated with | 412 | * This feature is useful if these callbacks are associated with |
413 | * initialization or termination of devices (see seq_midi.c). | 413 | * initialization or termination of devices (see seq_midi.c). |
414 | * | ||
415 | * If callback_all option is set, the callback function is invoked | ||
416 | * at each connection/disconnection. | ||
417 | */ | 414 | */ |
418 | 415 | ||
419 | static int subscribe_port(struct snd_seq_client *client, | 416 | static int subscribe_port(struct snd_seq_client *client, |
@@ -427,7 +424,7 @@ static int subscribe_port(struct snd_seq_client *client, | |||
427 | if (!try_module_get(port->owner)) | 424 | if (!try_module_get(port->owner)) |
428 | return -EFAULT; | 425 | return -EFAULT; |
429 | grp->count++; | 426 | grp->count++; |
430 | if (grp->open && (port->callback_all || grp->count == 1)) { | 427 | if (grp->open && grp->count == 1) { |
431 | err = grp->open(port->private_data, info); | 428 | err = grp->open(port->private_data, info); |
432 | if (err < 0) { | 429 | if (err < 0) { |
433 | module_put(port->owner); | 430 | module_put(port->owner); |
@@ -452,7 +449,7 @@ static int unsubscribe_port(struct snd_seq_client *client, | |||
452 | if (! grp->count) | 449 | if (! grp->count) |
453 | return -EINVAL; | 450 | return -EINVAL; |
454 | grp->count--; | 451 | grp->count--; |
455 | if (grp->close && (port->callback_all || grp->count == 0)) | 452 | if (grp->close && grp->count == 0) |
456 | err = grp->close(port->private_data, info); | 453 | err = grp->close(port->private_data, info); |
457 | if (send_ack && client->type == USER_CLIENT) | 454 | if (send_ack && client->type == USER_CLIENT) |
458 | snd_seq_client_notify_subscription(port->addr.client, port->addr.port, | 455 | 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 9d7117118ba4..26bd71f36c41 100644 --- a/sound/core/seq/seq_ports.h +++ b/sound/core/seq/seq_ports.h | |||
@@ -73,7 +73,6 @@ struct snd_seq_client_port { | |||
73 | int atomic, int hop); | 73 | int atomic, int hop); |
74 | void (*private_free)(void *private_data); | 74 | void (*private_free)(void *private_data); |
75 | void *private_data; | 75 | void *private_data; |
76 | unsigned int callback_all : 1; | ||
77 | unsigned int closing : 1; | 76 | unsigned int closing : 1; |
78 | unsigned int timestamping: 1; | 77 | unsigned int timestamping: 1; |
79 | unsigned int time_real: 1; | 78 | unsigned int time_real: 1; |