All of lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Cc: alsa-devel@alsa-project.org, clemens@ladisch.de
Subject: Re: [PATCH 02/39] ALSA: seq: apply shorter name for file	local functions
Date: Mon, 08 Aug 2016 08:56:24 +0200	[thread overview]
Message-ID: <s5hzionoijr.wl-tiwai@suse.de> (raw)
In-Reply-To: <1470563355-18368-3-git-send-email-o-takashi@sakamocchi.jp>

On Sun, 07 Aug 2016 11:48:38 +0200,
Takashi Sakamoto wrote:
> 
> Exported symbols should have 'snd_' prefix to avoid name conflict, while
> file local symbols have no need to have. Shorter names are generally
> preferable due to '80 characters in a line' rule.

I don't think such renames give much benefit unless it dramatically
improves the readability.


thanks,

Takashi

> 
> This commit renames some local functions.
> 
> Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
> ---
>  sound/core/seq/seq_clientmgr.c | 180 +++++++++++++++++++++--------------------
>  sound/core/seq/seq_compat.c    |  19 ++---
>  2 files changed, 101 insertions(+), 98 deletions(-)
> 
> diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
> index 42be1e5..1331103 100644
> --- a/sound/core/seq/seq_clientmgr.c
> +++ b/sound/core/seq/seq_clientmgr.c
> @@ -1130,7 +1130,8 @@ static unsigned int snd_seq_poll(struct file *file, poll_table * wait)
>  
>  
>  /* SYSTEM_INFO ioctl() */
> -static int snd_seq_ioctl_system_info(struct snd_seq_client *client, void __user *arg)
> +static int seq_ioctl_system_info(struct snd_seq_client *client,
> +				 void __user *arg)
>  {
>  	struct snd_seq_system_info info;
>  
> @@ -1150,7 +1151,8 @@ static int snd_seq_ioctl_system_info(struct snd_seq_client *client, void __user
>  
>  
>  /* RUNNING_MODE ioctl() */
> -static int snd_seq_ioctl_running_mode(struct snd_seq_client *client, void __user *arg)
> +static int seq_ioctl_running_mode(struct snd_seq_client *client,
> +				  void __user *arg)
>  {
>  	struct snd_seq_running_info info;
>  	struct snd_seq_client *cptr;
> @@ -1213,8 +1215,8 @@ static void get_client_info(struct snd_seq_client *cptr,
>  	memset(info->reserved, 0, sizeof(info->reserved));
>  }
>  
> -static int snd_seq_ioctl_get_client_info(struct snd_seq_client *client,
> -					 void __user *arg)
> +static int seq_ioctl_get_client_info(struct snd_seq_client *client,
> +				     void __user *arg)
>  {
>  	struct snd_seq_client *cptr;
>  	struct snd_seq_client_info client_info;
> @@ -1237,8 +1239,8 @@ static int snd_seq_ioctl_get_client_info(struct snd_seq_client *client,
>  
>  
>  /* CLIENT_INFO ioctl() */
> -static int snd_seq_ioctl_set_client_info(struct snd_seq_client *client,
> -					 void __user *arg)
> +static int seq_ioctl_set_client_info(struct snd_seq_client *client,
> +				     void __user *arg)
>  {
>  	struct snd_seq_client_info client_info;
>  
> @@ -1267,8 +1269,8 @@ static int snd_seq_ioctl_set_client_info(struct snd_seq_client *client,
>  /* 
>   * CREATE PORT ioctl() 
>   */
> -static int snd_seq_ioctl_create_port(struct snd_seq_client *client,
> -				     void __user *arg)
> +static int seq_ioctl_create_port(struct snd_seq_client *client,
> +				 void __user *arg)
>  {
>  	struct snd_seq_client_port *port;
>  	struct snd_seq_port_info info;
> @@ -1317,8 +1319,8 @@ static int snd_seq_ioctl_create_port(struct snd_seq_client *client,
>  /* 
>   * DELETE PORT ioctl() 
>   */
> -static int snd_seq_ioctl_delete_port(struct snd_seq_client *client,
> -				     void __user *arg)
> +static int seq_ioctl_delete_port(struct snd_seq_client *client,
> +				 void __user *arg)
>  {
>  	struct snd_seq_port_info info;
>  	int err;
> @@ -1341,8 +1343,8 @@ static int snd_seq_ioctl_delete_port(struct snd_seq_client *client,
>  /* 
>   * GET_PORT_INFO ioctl() (on any client) 
>   */
> -static int snd_seq_ioctl_get_port_info(struct snd_seq_client *client,
> -				       void __user *arg)
> +static int seq_ioctl_get_port_info(struct snd_seq_client *client,
> +				   void __user *arg)
>  {
>  	struct snd_seq_client *cptr;
>  	struct snd_seq_client_port *port;
> @@ -1374,8 +1376,8 @@ static int snd_seq_ioctl_get_port_info(struct snd_seq_client *client,
>  /* 
>   * SET_PORT_INFO ioctl() (only ports on this/own client) 
>   */
> -static int snd_seq_ioctl_set_port_info(struct snd_seq_client *client,
> -				       void __user *arg)
> +static int seq_ioctl_set_port_info(struct snd_seq_client *client,
> +				   void __user *arg)
>  {
>  	struct snd_seq_client_port *port;
>  	struct snd_seq_port_info info;
> @@ -1452,8 +1454,8 @@ int snd_seq_client_notify_subscription(int client, int port,
>  /* 
>   * add to port's subscription list IOCTL interface 
>   */
> -static int snd_seq_ioctl_subscribe_port(struct snd_seq_client *client,
> -					void __user *arg)
> +static int seq_ioctl_subscribe_port(struct snd_seq_client *client,
> +				    void __user *arg)
>  {
>  	int result = -EINVAL;
>  	struct snd_seq_client *receiver = NULL, *sender = NULL;
> @@ -1497,8 +1499,8 @@ static int snd_seq_ioctl_subscribe_port(struct snd_seq_client *client,
>  /* 
>   * remove from port's subscription list 
>   */
> -static int snd_seq_ioctl_unsubscribe_port(struct snd_seq_client *client,
> -					  void __user *arg)
> +static int seq_ioctl_unsubscribe_port(struct snd_seq_client *client,
> +				      void __user *arg)
>  {
>  	int result = -ENXIO;
>  	struct snd_seq_client *receiver = NULL, *sender = NULL;
> @@ -1539,8 +1541,8 @@ static int snd_seq_ioctl_unsubscribe_port(struct snd_seq_client *client,
>  
>  
>  /* CREATE_QUEUE ioctl() */
> -static int snd_seq_ioctl_create_queue(struct snd_seq_client *client,
> -				      void __user *arg)
> +static int seq_ioctl_create_queue(struct snd_seq_client *client,
> +				  void __user *arg)
>  {
>  	struct snd_seq_queue_info info;
>  	int result;
> @@ -1574,8 +1576,8 @@ static int snd_seq_ioctl_create_queue(struct snd_seq_client *client,
>  }
>  
>  /* DELETE_QUEUE ioctl() */
> -static int snd_seq_ioctl_delete_queue(struct snd_seq_client *client,
> -				      void __user *arg)
> +static int seq_ioctl_delete_queue(struct snd_seq_client *client,
> +				  void __user *arg)
>  {
>  	struct snd_seq_queue_info info;
>  
> @@ -1586,8 +1588,8 @@ static int snd_seq_ioctl_delete_queue(struct snd_seq_client *client,
>  }
>  
>  /* GET_QUEUE_INFO ioctl() */
> -static int snd_seq_ioctl_get_queue_info(struct snd_seq_client *client,
> -					void __user *arg)
> +static int seq_ioctl_get_queue_info(struct snd_seq_client *client,
> +				    void __user *arg)
>  {
>  	struct snd_seq_queue_info info;
>  	struct snd_seq_queue *q;
> @@ -1613,8 +1615,8 @@ static int snd_seq_ioctl_get_queue_info(struct snd_seq_client *client,
>  }
>  
>  /* SET_QUEUE_INFO ioctl() */
> -static int snd_seq_ioctl_set_queue_info(struct snd_seq_client *client,
> -					void __user *arg)
> +static int seq_ioctl_set_queue_info(struct snd_seq_client *client,
> +				    void __user *arg)
>  {
>  	struct snd_seq_queue_info info;
>  	struct snd_seq_queue *q;
> @@ -1649,7 +1651,8 @@ static int snd_seq_ioctl_set_queue_info(struct snd_seq_client *client,
>  }
>  
>  /* GET_NAMED_QUEUE ioctl() */
> -static int snd_seq_ioctl_get_named_queue(struct snd_seq_client *client, void __user *arg)
> +static int seq_ioctl_get_named_queue(struct snd_seq_client *client,
> +				     void __user *arg)
>  {
>  	struct snd_seq_queue_info info;
>  	struct snd_seq_queue *q;
> @@ -1672,8 +1675,8 @@ static int snd_seq_ioctl_get_named_queue(struct snd_seq_client *client, void __u
>  }
>  
>  /* GET_QUEUE_STATUS ioctl() */
> -static int snd_seq_ioctl_get_queue_status(struct snd_seq_client *client,
> -					  void __user *arg)
> +static int seq_ioctl_get_queue_status(struct snd_seq_client *client,
> +				      void __user *arg)
>  {
>  	struct snd_seq_queue_status status;
>  	struct snd_seq_queue *queue;
> @@ -1706,8 +1709,8 @@ static int snd_seq_ioctl_get_queue_status(struct snd_seq_client *client,
>  
>  
>  /* GET_QUEUE_TEMPO ioctl() */
> -static int snd_seq_ioctl_get_queue_tempo(struct snd_seq_client *client,
> -					 void __user *arg)
> +static int seq_ioctl_get_queue_tempo(struct snd_seq_client *client,
> +				     void __user *arg)
>  {
>  	struct snd_seq_queue_tempo tempo;
>  	struct snd_seq_queue *queue;
> @@ -1746,8 +1749,8 @@ int snd_seq_set_queue_tempo(int client, struct snd_seq_queue_tempo *tempo)
>  
>  EXPORT_SYMBOL(snd_seq_set_queue_tempo);
>  
> -static int snd_seq_ioctl_set_queue_tempo(struct snd_seq_client *client,
> -					 void __user *arg)
> +static int seq_ioctl_set_queue_tempo(struct snd_seq_client *client,
> +				     void __user *arg)
>  {
>  	int result;
>  	struct snd_seq_queue_tempo tempo;
> @@ -1761,8 +1764,8 @@ static int snd_seq_ioctl_set_queue_tempo(struct snd_seq_client *client,
>  
>  
>  /* GET_QUEUE_TIMER ioctl() */
> -static int snd_seq_ioctl_get_queue_timer(struct snd_seq_client *client,
> -					 void __user *arg)
> +static int seq_ioctl_get_queue_timer(struct snd_seq_client *client,
> +				     void __user *arg)
>  {
>  	struct snd_seq_queue_timer timer;
>  	struct snd_seq_queue *queue;
> @@ -1798,8 +1801,8 @@ static int snd_seq_ioctl_get_queue_timer(struct snd_seq_client *client,
>  
>  
>  /* SET_QUEUE_TIMER ioctl() */
> -static int snd_seq_ioctl_set_queue_timer(struct snd_seq_client *client,
> -					 void __user *arg)
> +static int seq_ioctl_set_queue_timer(struct snd_seq_client *client,
> +				     void __user *arg)
>  {
>  	int result = 0;
>  	struct snd_seq_queue_timer timer;
> @@ -1840,8 +1843,8 @@ static int snd_seq_ioctl_set_queue_timer(struct snd_seq_client *client,
>  
>  
>  /* GET_QUEUE_CLIENT ioctl() */
> -static int snd_seq_ioctl_get_queue_client(struct snd_seq_client *client,
> -					  void __user *arg)
> +static int seq_ioctl_get_queue_client(struct snd_seq_client *client,
> +				      void __user *arg)
>  {
>  	struct snd_seq_queue_client info;
>  	int used;
> @@ -1862,8 +1865,8 @@ static int snd_seq_ioctl_get_queue_client(struct snd_seq_client *client,
>  
>  
>  /* SET_QUEUE_CLIENT ioctl() */
> -static int snd_seq_ioctl_set_queue_client(struct snd_seq_client *client,
> -					  void __user *arg)
> +static int seq_ioctl_set_queue_client(struct snd_seq_client *client,
> +				      void __user *arg)
>  {
>  	int err;
>  	struct snd_seq_queue_client info;
> @@ -1877,13 +1880,13 @@ static int snd_seq_ioctl_set_queue_client(struct snd_seq_client *client,
>  			return err;
>  	}
>  
> -	return snd_seq_ioctl_get_queue_client(client, arg);
> +	return seq_ioctl_get_queue_client(client, arg);
>  }
>  
>  
>  /* GET_CLIENT_POOL ioctl() */
> -static int snd_seq_ioctl_get_client_pool(struct snd_seq_client *client,
> -					 void __user *arg)
> +static int seq_ioctl_get_client_pool(struct snd_seq_client *client,
> +				     void __user *arg)
>  {
>  	struct snd_seq_client_pool info;
>  	struct snd_seq_client *cptr;
> @@ -1917,8 +1920,8 @@ static int snd_seq_ioctl_get_client_pool(struct snd_seq_client *client,
>  }
>  
>  /* SET_CLIENT_POOL ioctl() */
> -static int snd_seq_ioctl_set_client_pool(struct snd_seq_client *client,
> -					 void __user *arg)
> +static int seq_ioctl_set_client_pool(struct snd_seq_client *client,
> +				     void __user *arg)
>  {
>  	struct snd_seq_client_pool info;
>  	int rc;
> @@ -1957,13 +1960,13 @@ static int snd_seq_ioctl_set_client_pool(struct snd_seq_client *client,
>  		client->pool->room  = info.output_room;
>  	}
>  
> -	return snd_seq_ioctl_get_client_pool(client, arg);
> +	return seq_ioctl_get_client_pool(client, arg);
>  }
>  
>  
>  /* REMOVE_EVENTS ioctl() */
> -static int snd_seq_ioctl_remove_events(struct snd_seq_client *client,
> -				       void __user *arg)
> +static int seq_ioctl_remove_events(struct snd_seq_client *client,
> +				   void __user *arg)
>  {
>  	struct snd_seq_remove_events info;
>  
> @@ -1992,8 +1995,8 @@ static int snd_seq_ioctl_remove_events(struct snd_seq_client *client,
>  /*
>   * get subscription info
>   */
> -static int snd_seq_ioctl_get_subscription(struct snd_seq_client *client,
> -					  void __user *arg)
> +static int seq_ioctl_get_subscription(struct snd_seq_client *client,
> +				      void __user *arg)
>  {
>  	int result;
>  	struct snd_seq_client *sender = NULL;
> @@ -2032,8 +2035,7 @@ static int snd_seq_ioctl_get_subscription(struct snd_seq_client *client,
>  /*
>   * get subscription info - check only its presence
>   */
> -static int snd_seq_ioctl_query_subs(struct snd_seq_client *client,
> -				    void __user *arg)
> +static int seq_ioctl_query_subs(struct snd_seq_client *client, void __user *arg)
>  {
>  	int result = -ENXIO;
>  	struct snd_seq_client *cptr = NULL;
> @@ -2102,8 +2104,8 @@ static int snd_seq_ioctl_query_subs(struct snd_seq_client *client,
>  /*
>   * query next client
>   */
> -static int snd_seq_ioctl_query_next_client(struct snd_seq_client *client,
> -					   void __user *arg)
> +static int seq_ioctl_query_next_client(struct snd_seq_client *client,
> +				       void __user *arg)
>  {
>  	struct snd_seq_client *cptr = NULL;
>  	struct snd_seq_client_info info;
> @@ -2134,8 +2136,8 @@ static int snd_seq_ioctl_query_next_client(struct snd_seq_client *client,
>  /* 
>   * query next port
>   */
> -static int snd_seq_ioctl_query_next_port(struct snd_seq_client *client,
> -					 void __user *arg)
> +static int seq_ioctl_query_next_port(struct snd_seq_client *client,
> +				     void __user *arg)
>  {
>  	struct snd_seq_client *cptr;
>  	struct snd_seq_client_port *port = NULL;
> @@ -2172,39 +2174,39 @@ static const struct seq_ioctl_table {
>  	unsigned int cmd;
>  	int (*func)(struct snd_seq_client *client, void __user * arg);
>  } ioctl_tables[] = {
> -	{ SNDRV_SEQ_IOCTL_SYSTEM_INFO, snd_seq_ioctl_system_info },
> -	{ SNDRV_SEQ_IOCTL_RUNNING_MODE, snd_seq_ioctl_running_mode },
> -	{ SNDRV_SEQ_IOCTL_GET_CLIENT_INFO, snd_seq_ioctl_get_client_info },
> -	{ SNDRV_SEQ_IOCTL_SET_CLIENT_INFO, snd_seq_ioctl_set_client_info },
> -	{ SNDRV_SEQ_IOCTL_CREATE_PORT, snd_seq_ioctl_create_port },
> -	{ SNDRV_SEQ_IOCTL_DELETE_PORT, snd_seq_ioctl_delete_port },
> -	{ SNDRV_SEQ_IOCTL_GET_PORT_INFO, snd_seq_ioctl_get_port_info },
> -	{ SNDRV_SEQ_IOCTL_SET_PORT_INFO, snd_seq_ioctl_set_port_info },
> -	{ SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT, snd_seq_ioctl_subscribe_port },
> -	{ SNDRV_SEQ_IOCTL_UNSUBSCRIBE_PORT, snd_seq_ioctl_unsubscribe_port },
> -	{ SNDRV_SEQ_IOCTL_CREATE_QUEUE, snd_seq_ioctl_create_queue },
> -	{ SNDRV_SEQ_IOCTL_DELETE_QUEUE, snd_seq_ioctl_delete_queue },
> -	{ SNDRV_SEQ_IOCTL_GET_QUEUE_INFO, snd_seq_ioctl_get_queue_info },
> -	{ SNDRV_SEQ_IOCTL_SET_QUEUE_INFO, snd_seq_ioctl_set_queue_info },
> -	{ SNDRV_SEQ_IOCTL_GET_NAMED_QUEUE, snd_seq_ioctl_get_named_queue },
> -	{ SNDRV_SEQ_IOCTL_GET_QUEUE_STATUS, snd_seq_ioctl_get_queue_status },
> -	{ SNDRV_SEQ_IOCTL_GET_QUEUE_TEMPO, snd_seq_ioctl_get_queue_tempo },
> -	{ SNDRV_SEQ_IOCTL_SET_QUEUE_TEMPO, snd_seq_ioctl_set_queue_tempo },
> -	{ SNDRV_SEQ_IOCTL_GET_QUEUE_TIMER, snd_seq_ioctl_get_queue_timer },
> -	{ SNDRV_SEQ_IOCTL_SET_QUEUE_TIMER, snd_seq_ioctl_set_queue_timer },
> -	{ SNDRV_SEQ_IOCTL_GET_QUEUE_CLIENT, snd_seq_ioctl_get_queue_client },
> -	{ SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT, snd_seq_ioctl_set_queue_client },
> -	{ SNDRV_SEQ_IOCTL_GET_CLIENT_POOL, snd_seq_ioctl_get_client_pool },
> -	{ SNDRV_SEQ_IOCTL_SET_CLIENT_POOL, snd_seq_ioctl_set_client_pool },
> -	{ SNDRV_SEQ_IOCTL_GET_SUBSCRIPTION, snd_seq_ioctl_get_subscription },
> -	{ SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT, snd_seq_ioctl_query_next_client },
> -	{ SNDRV_SEQ_IOCTL_QUERY_NEXT_PORT, snd_seq_ioctl_query_next_port },
> -	{ SNDRV_SEQ_IOCTL_REMOVE_EVENTS, snd_seq_ioctl_remove_events },
> -	{ SNDRV_SEQ_IOCTL_QUERY_SUBS, snd_seq_ioctl_query_subs },
> +	{ SNDRV_SEQ_IOCTL_SYSTEM_INFO, seq_ioctl_system_info },
> +	{ SNDRV_SEQ_IOCTL_RUNNING_MODE, seq_ioctl_running_mode },
> +	{ SNDRV_SEQ_IOCTL_GET_CLIENT_INFO, seq_ioctl_get_client_info },
> +	{ SNDRV_SEQ_IOCTL_SET_CLIENT_INFO, seq_ioctl_set_client_info },
> +	{ SNDRV_SEQ_IOCTL_CREATE_PORT, seq_ioctl_create_port },
> +	{ SNDRV_SEQ_IOCTL_DELETE_PORT, seq_ioctl_delete_port },
> +	{ SNDRV_SEQ_IOCTL_GET_PORT_INFO, seq_ioctl_get_port_info },
> +	{ SNDRV_SEQ_IOCTL_SET_PORT_INFO, seq_ioctl_set_port_info },
> +	{ SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT, seq_ioctl_subscribe_port },
> +	{ SNDRV_SEQ_IOCTL_UNSUBSCRIBE_PORT, seq_ioctl_unsubscribe_port },
> +	{ SNDRV_SEQ_IOCTL_CREATE_QUEUE, seq_ioctl_create_queue },
> +	{ SNDRV_SEQ_IOCTL_DELETE_QUEUE, seq_ioctl_delete_queue },
> +	{ SNDRV_SEQ_IOCTL_GET_QUEUE_INFO, seq_ioctl_get_queue_info },
> +	{ SNDRV_SEQ_IOCTL_SET_QUEUE_INFO, seq_ioctl_set_queue_info },
> +	{ SNDRV_SEQ_IOCTL_GET_NAMED_QUEUE, seq_ioctl_get_named_queue },
> +	{ SNDRV_SEQ_IOCTL_GET_QUEUE_STATUS, seq_ioctl_get_queue_status },
> +	{ SNDRV_SEQ_IOCTL_GET_QUEUE_TEMPO, seq_ioctl_get_queue_tempo },
> +	{ SNDRV_SEQ_IOCTL_SET_QUEUE_TEMPO, seq_ioctl_set_queue_tempo },
> +	{ SNDRV_SEQ_IOCTL_GET_QUEUE_TIMER, seq_ioctl_get_queue_timer },
> +	{ SNDRV_SEQ_IOCTL_SET_QUEUE_TIMER, seq_ioctl_set_queue_timer },
> +	{ SNDRV_SEQ_IOCTL_GET_QUEUE_CLIENT, seq_ioctl_get_queue_client },
> +	{ SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT, seq_ioctl_set_queue_client },
> +	{ SNDRV_SEQ_IOCTL_GET_CLIENT_POOL, seq_ioctl_get_client_pool },
> +	{ SNDRV_SEQ_IOCTL_SET_CLIENT_POOL, seq_ioctl_set_client_pool },
> +	{ SNDRV_SEQ_IOCTL_GET_SUBSCRIPTION, seq_ioctl_get_subscription },
> +	{ SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT, seq_ioctl_query_next_client },
> +	{ SNDRV_SEQ_IOCTL_QUERY_NEXT_PORT, seq_ioctl_query_next_port },
> +	{ SNDRV_SEQ_IOCTL_REMOVE_EVENTS, seq_ioctl_remove_events },
> +	{ SNDRV_SEQ_IOCTL_QUERY_SUBS, seq_ioctl_query_subs },
>  	{ 0, NULL },
>  };
>  
> -static int snd_seq_do_ioctl(struct snd_seq_client *client, unsigned int cmd,
> +static int seq_do_ioctl(struct snd_seq_client *client, unsigned int cmd,
>  			    void __user *arg)
>  {
>  	const struct seq_ioctl_table *p;
> @@ -2237,7 +2239,7 @@ static long snd_seq_ioctl(struct file *file, unsigned int cmd, unsigned long arg
>  	if (snd_BUG_ON(!client))
>  		return -ENXIO;
>  		
> -	return snd_seq_do_ioctl(client, cmd, (void __user *) arg);
> +	return seq_do_ioctl(client, cmd, (void __user *) arg);
>  }
>  
>  #ifdef CONFIG_COMPAT
> @@ -2437,7 +2439,7 @@ int snd_seq_kernel_client_ctl(int clientid, unsigned int cmd, void *arg)
>  	if (client == NULL)
>  		return -ENXIO;
>  	fs = snd_enter_user();
> -	result = snd_seq_do_ioctl(client, cmd, (void __force __user *)arg);
> +	result = seq_do_ioctl(client, cmd, (void __force __user *)arg);
>  	snd_leave_user(fs);
>  	return result;
>  }
> diff --git a/sound/core/seq/seq_compat.c b/sound/core/seq/seq_compat.c
> index 6517590..70d3ddb 100644
> --- a/sound/core/seq/seq_compat.c
> +++ b/sound/core/seq/seq_compat.c
> @@ -42,8 +42,9 @@ struct snd_seq_port_info32 {
>  	char reserved[59];		/* for future use */
>  };
>  
> -static int snd_seq_call_port_info_ioctl(struct snd_seq_client *client, unsigned int cmd,
> -					struct snd_seq_port_info32 __user *data32)
> +static int seq_call_port_info_ioctl(struct snd_seq_client *client,
> +				    unsigned int cmd,
> +				    struct snd_seq_port_info32 __user *data32)
>  {
>  	int err = -EFAULT;
>  	struct snd_seq_port_info *data;
> @@ -60,7 +61,7 @@ static int snd_seq_call_port_info_ioctl(struct snd_seq_client *client, unsigned
>  	data->kernel = NULL;
>  
>  	fs = snd_enter_user();
> -	err = snd_seq_do_ioctl(client, cmd, data);
> +	err = seq_do_ioctl(client, cmd, data);
>  	snd_leave_user(fs);
>  	if (err < 0)
>  		goto error;
> @@ -123,17 +124,17 @@ static long snd_seq_ioctl_compat(struct file *file, unsigned int cmd, unsigned l
>  	case SNDRV_SEQ_IOCTL_GET_SUBSCRIPTION:
>  	case SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT:
>  	case SNDRV_SEQ_IOCTL_RUNNING_MODE:
> -		return snd_seq_do_ioctl(client, cmd, argp);
> +		return seq_do_ioctl(client, cmd, argp);
>  	case SNDRV_SEQ_IOCTL_CREATE_PORT32:
> -		return snd_seq_call_port_info_ioctl(client, SNDRV_SEQ_IOCTL_CREATE_PORT, argp);
> +		return seq_call_port_info_ioctl(client, SNDRV_SEQ_IOCTL_CREATE_PORT, argp);
>  	case SNDRV_SEQ_IOCTL_DELETE_PORT32:
> -		return snd_seq_call_port_info_ioctl(client, SNDRV_SEQ_IOCTL_DELETE_PORT, argp);
> +		return seq_call_port_info_ioctl(client, SNDRV_SEQ_IOCTL_DELETE_PORT, argp);
>  	case SNDRV_SEQ_IOCTL_GET_PORT_INFO32:
> -		return snd_seq_call_port_info_ioctl(client, SNDRV_SEQ_IOCTL_GET_PORT_INFO, argp);
> +		return seq_call_port_info_ioctl(client, SNDRV_SEQ_IOCTL_GET_PORT_INFO, argp);
>  	case SNDRV_SEQ_IOCTL_SET_PORT_INFO32:
> -		return snd_seq_call_port_info_ioctl(client, SNDRV_SEQ_IOCTL_SET_PORT_INFO, argp);
> +		return seq_call_port_info_ioctl(client, SNDRV_SEQ_IOCTL_SET_PORT_INFO, argp);
>  	case SNDRV_SEQ_IOCTL_QUERY_NEXT_PORT32:
> -		return snd_seq_call_port_info_ioctl(client, SNDRV_SEQ_IOCTL_QUERY_NEXT_PORT, argp);
> +		return seq_call_port_info_ioctl(client, SNDRV_SEQ_IOCTL_QUERY_NEXT_PORT, argp);
>  	}
>  	return -ENOIOCTLCMD;
>  }
> -- 
> 2.7.4
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> 

  reply	other threads:[~2016-08-08  6:56 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-07  9:48 [PATCH 00/39] seq: obsolete change of address limit Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 01/39] ALSA: seq: add const qualifier to table of functions for ioctl Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 02/39] ALSA: seq: apply shorter name for file local functions Takashi Sakamoto
2016-08-08  6:56   ` Takashi Iwai [this message]
2016-08-07  9:48 ` [PATCH 03/39] ALSA: seq: fulfill callback entry for ioctl Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 04/39] ALSA: seq: copy ioctl data from user space to kernel stack Takashi Sakamoto
2016-08-07 10:15   ` Clemens Ladisch
2016-08-07 14:26     ` Takashi Sakamoto
2016-08-08  7:10       ` Takashi Iwai
2016-08-08 13:46         ` Takashi Sakamoto
2016-08-08 14:58           ` Takashi Iwai
2016-08-07  9:48 ` [PATCH 05/39] ALSA: seq: add documentation for snd_seq_kernel_client_ctl Takashi Sakamoto
2016-08-08  6:58   ` Takashi Iwai
2016-08-07  9:48 ` [PATCH 06/39] ALSA: seq: obsolete address mode in compatibility layer Takashi Sakamoto
2016-08-08  7:09   ` Takashi Iwai
2016-08-08 12:19     ` Takashi Sakamoto
2016-08-08 14:59       ` Takashi Iwai
2016-08-09 12:04         ` Takashi Sakamoto
2016-08-09 12:15           ` Takashi Iwai
2016-08-09 12:32             ` Takashi Sakamoto
2016-08-09 12:58               ` Takashi Iwai
2016-08-07  9:48 ` [PATCH 07/39] ALSA: seq: obsolete change of address limit in in-kernel path for ioctl Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 08/39] ALSA: seq: obsolete address limit helper Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 09/39] ALSA: seq: optimize pversion function to new design Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 10/39] ALSA: seq: optimize client_id " Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 11/39] ALSA: seq: optimize system_info " Takashi Sakamoto
2016-08-08  7:04   ` Takashi Iwai
2016-08-08  7:50     ` Takashi Iwai
2016-08-08 12:22       ` Takashi Sakamoto
2016-08-08 15:18         ` Takashi Iwai
2016-08-08  8:37     ` Takashi Sakamoto
2016-08-08 15:07       ` Takashi Iwai
2016-08-09 12:15         ` Takashi Sakamoto
2016-08-09 12:24           ` Takashi Iwai
2016-08-09 13:01             ` Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 12/39] ALSA: seq: optimize running mode " Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 13/39] ALSA: seq: optimize client_info " Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 14/39] ALSA: seq: optimize set_client_info " Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 15/39] ALSA: seq: optimize create_port " Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 16/39] ALSA: seq: optimize delete_port " Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 17/39] ALSA: seq: optimize get_port_info " Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 18/39] ALSA: seq: optimize seq_port_info " Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 19/39] ALSA: seq: optimize subscribe_port " Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 20/39] ALSA: seq: optimize unsubscribe_port " Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 21/39] ALSA: seq: optimize create_queue " Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 22/39] ALSA: seq: optimize delete_queue " Takashi Sakamoto
2016-08-07  9:48 ` [PATCH 23/39] ALSA: seq: optimize get_queue_info " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 24/39] ALSA: seq: optimize seq_queue_info " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 25/39] ALSA: seq: optimize get_named_queue " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 26/39] ALSA: seq: optimize get_queue_status " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 27/39] ALSA: seq: optimize get_queue_tempo " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 28/39] ALSA: seq: optimize set_queue_tempo " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 29/39] ALSA: seq: optimize get_queue_timer " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 30/39] ALSA: seq: optimize seq_queue_timer " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 31/39] ALSA: seq: optimize get_queue_client " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 32/39] ALSA: seq: optimize set_queue_client " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 33/39] ALSA: seq: optimize get_client_pool " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 34/39] ALSA: seq: optimize seq_client_pool " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 35/39] ALSA: seq: optimize remove_events " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 36/39] ALSA: seq: optimize get_subscription " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 37/39] ALSA: seq: optimize query_subs " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 38/39] ALSA: seq: optimize query_next_client " Takashi Sakamoto
2016-08-07  9:49 ` [PATCH 39/39] ALSA: seq: optimize query_next_port " Takashi Sakamoto

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=s5hzionoijr.wl-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=clemens@ladisch.de \
    --cc=o-takashi@sakamocchi.jp \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.