Commit 83e8ad69 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[ALSA] seq: remove struct snd_seq_client_callback 



The fields of struct snd_seq_client_callback either aren't used or are
always set to the same value, so we can get rid of it altogether.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
parent 255bd169

include/sound/seq_kernel.h

+1 −11
Original line number Diff line number Diff line
@@ -60,15 +60,6 @@ typedef union snd_seq_timestamp snd_seq_timestamp_t; 
/* max size of event size */

#define SNDRV_SEQ_MAX_EVENT_LEN		0x3fffffff



/* call-backs for kernel client */



struct snd_seq_client_callback {

	void *private_data;

	unsigned allow_input: 1,

		 allow_output: 1;

	/*...*/

};



/* call-backs for kernel port */

struct snd_seq_port_callback {

	struct module *owner;
@@ -84,8 +75,7 @@ struct snd_seq_port_callback { 
};



/* interface for kernel client */

int snd_seq_create_kernel_client(struct snd_card *card, int client_index,

				 struct snd_seq_client_callback *callback);

int snd_seq_create_kernel_client(struct snd_card *card, int client_index);

int snd_seq_delete_kernel_client(int client);

int snd_seq_kernel_client_enqueue(int client, struct snd_seq_event *ev, int atomic, int hop);

int snd_seq_kernel_client_dispatch(int client, struct snd_seq_event *ev, int atomic, int hop);

sound/core/seq/oss/seq_oss_init.c

+1 −8
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ int __init 
snd_seq_oss_create_client(void)

{

	int rc;

	struct snd_seq_client_callback callback;

	struct snd_seq_client_info *info;

	struct snd_seq_port_info *port;

	struct snd_seq_port_callback port_callback;
@@ -78,13 +77,7 @@ snd_seq_oss_create_client(void) 
	}



	/* create ALSA client */

	memset(&callback, 0, sizeof(callback));



	callback.private_data = NULL;

	callback.allow_input = 1;

	callback.allow_output = 1;



	rc = snd_seq_create_kernel_client(NULL, SNDRV_SEQ_CLIENT_OSS, &callback);

	rc = snd_seq_create_kernel_client(NULL, SNDRV_SEQ_CLIENT_OSS);

	if (rc < 0)

		goto __error;

sound/core/seq/seq_clientmgr.c

+3 −6
Original line number Diff line number Diff line
@@ -2212,15 +2212,12 @@ static long snd_seq_ioctl(struct file *file, unsigned int cmd, unsigned long arg 




/* exported to kernel modules */

int snd_seq_create_kernel_client(struct snd_card *card, int client_index,

				 struct snd_seq_client_callback *callback)

int snd_seq_create_kernel_client(struct snd_card *card, int client_index)

{

	struct snd_seq_client *client;



	snd_assert(! in_interrupt(), return -EBUSY);



	if (callback == NULL)

		return -EINVAL;

	if (card && client_index > 3)

		return -EINVAL;

	if (card == NULL && client_index > 63)
@@ -2244,8 +2241,8 @@ int snd_seq_create_kernel_client(struct snd_card *card, int client_index, 
	}

	usage_alloc(&client_usage, 1);



	client->accept_input = callback->allow_output;

	client->accept_output = callback->allow_input;

	client->accept_input = 1;

	client->accept_output = 1;

		

	sprintf(client->name, "Client-%d", client->number);

sound/core/seq/seq_clientmgr.h

+0 −2
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ struct snd_seq_client *snd_seq_client_use_ptr(int clientid); 
int snd_seq_dispatch_event(struct snd_seq_event_cell *cell, int atomic, int hop);



/* exported to other modules */

int snd_seq_register_kernel_client(struct snd_seq_client_callback *callback, void *private_data);

int snd_seq_unregister_kernel_client(int client);

int snd_seq_kernel_client_enqueue(int client, struct snd_seq_event *ev, int atomic, int hop);

int snd_seq_kernel_client_enqueue_blocking(int client, struct snd_seq_event * ev,

					   struct file *file, int atomic, int hop);

sound/core/seq/seq_dummy.c

+1 −5
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ create_port(int idx, int type) 
static int __init

register_client(void)

{

	struct snd_seq_client_callback cb;

	struct snd_seq_client_info cinfo;

	struct snd_seq_dummy_port *rec1, *rec2;

	int i;
@@ -204,10 +203,7 @@ register_client(void) 
	}



	/* create client */

	memset(&cb, 0, sizeof(cb));

	cb.allow_input = 1;

	cb.allow_output = 1;

	my_client = snd_seq_create_kernel_client(NULL, SNDRV_SEQ_CLIENT_DUMMY, &cb);

	my_client = snd_seq_create_kernel_client(NULL, SNDRV_SEQ_CLIENT_DUMMY);

	if (my_client < 0)

		return my_client;