Skip to content

L
linux
Commit 91e60eb6 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files
Options

s390/iucv: do not use arrays as argument 

The iucv code uses arrays as arguments. Even though this does not
really cause a problem, it could be misleading, since the compiler
turns array arguments into just a pointer argument. To be more
precise this patch changes the array arguments into pointers.
Signed-off-by: default avatarUrsula Braun <ursula.braun@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d7def2a
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 46 deletions
drivers/s390/char/monreader.c
View file @ 91e60eb6
...@@ -229,7 +229,7 @@ static struct mon_msg *mon_next_message(struct mon_private *monpriv) ...@@ -229,7 +229,7 @@ static struct mon_msg *mon_next_message(struct mon_private *monpriv)
/****************************************************************************** /******************************************************************************
* IUCV handler * * IUCV handler *
*****************************************************************************/ *****************************************************************************/
static void mon_iucv_path_complete(struct iucv_path *path, u8 ipuser[16]) static void mon_iucv_path_complete(struct iucv_path *path, u8 *ipuser)
{ {
struct mon_private *monpriv = path->private; struct mon_private *monpriv = path->private;
...@@ -237,7 +237,7 @@ static void mon_iucv_path_complete(struct iucv_path *path, u8 ipuser[16]) ...@@ -237,7 +237,7 @@ static void mon_iucv_path_complete(struct iucv_path *path, u8 ipuser[16])
wake_up(&mon_conn_wait_queue); wake_up(&mon_conn_wait_queue);
} }
static void mon_iucv_path_severed(struct iucv_path *path, u8 ipuser[16]) static void mon_iucv_path_severed(struct iucv_path *path, u8 *ipuser)
{ {
struct mon_private *monpriv = path->private; struct mon_private *monpriv = path->private;
......
drivers/s390/char/vmlogrdr.c
View file @ 91e60eb6
...@@ -99,8 +99,8 @@ static const struct file_operations vmlogrdr_fops = { ...@@ -99,8 +99,8 @@ static const struct file_operations vmlogrdr_fops = {
}; };
static void vmlogrdr_iucv_path_complete(struct iucv_path *, u8 ipuser[16]); static void vmlogrdr_iucv_path_complete(struct iucv_path *, u8 *ipuser);
static void vmlogrdr_iucv_path_severed(struct iucv_path *, u8 ipuser[16]); static void vmlogrdr_iucv_path_severed(struct iucv_path *, u8 *ipuser);
static void vmlogrdr_iucv_message_pending(struct iucv_path *, static void vmlogrdr_iucv_message_pending(struct iucv_path *,
struct iucv_message *); struct iucv_message *);
...@@ -160,7 +160,7 @@ static struct cdev *vmlogrdr_cdev = NULL; ...@@ -160,7 +160,7 @@ static struct cdev *vmlogrdr_cdev = NULL;
static int recording_class_AB; static int recording_class_AB;
static void vmlogrdr_iucv_path_complete(struct iucv_path *path, u8 ipuser[16]) static void vmlogrdr_iucv_path_complete(struct iucv_path *path, u8 *ipuser)
{ {
struct vmlogrdr_priv_t * logptr = path->private; struct vmlogrdr_priv_t * logptr = path->private;
...@@ -171,7 +171,7 @@ static void vmlogrdr_iucv_path_complete(struct iucv_path *path, u8 ipuser[16]) ...@@ -171,7 +171,7 @@ static void vmlogrdr_iucv_path_complete(struct iucv_path *path, u8 ipuser[16])
} }
static void vmlogrdr_iucv_path_severed(struct iucv_path *path, u8 ipuser[16]) static void vmlogrdr_iucv_path_severed(struct iucv_path *path, u8 *ipuser)
{ {
struct vmlogrdr_priv_t * logptr = path->private; struct vmlogrdr_priv_t * logptr = path->private;
u8 reason = (u8) ipuser[8]; u8 reason = (u8) ipuser[8];
......
drivers/s390/net/netiucv.c
View file @ 91e60eb6
...@@ -149,12 +149,11 @@ static struct device_driver netiucv_driver = { ...@@ -149,12 +149,11 @@ static struct device_driver netiucv_driver = {
.pm = &netiucv_pm_ops, .pm = &netiucv_pm_ops,
}; };
static int netiucv_callback_connreq(struct iucv_path *, static int netiucv_callback_connreq(struct iucv_path *, u8 *, u8 *);
u8 ipvmid[8], u8 ipuser[16]); static void netiucv_callback_connack(struct iucv_path *, u8 *);
static void netiucv_callback_connack(struct iucv_path *, u8 ipuser[16]); static void netiucv_callback_connrej(struct iucv_path *, u8 *);
static void netiucv_callback_connrej(struct iucv_path *, u8 ipuser[16]); static void netiucv_callback_connsusp(struct iucv_path *, u8 *);
static void netiucv_callback_connsusp(struct iucv_path *, u8 ipuser[16]); static void netiucv_callback_connres(struct iucv_path *, u8 *);
static void netiucv_callback_connres(struct iucv_path *, u8 ipuser[16]);
static void netiucv_callback_rx(struct iucv_path *, struct iucv_message *); static void netiucv_callback_rx(struct iucv_path *, struct iucv_message *);
static void netiucv_callback_txdone(struct iucv_path *, struct iucv_message *); static void netiucv_callback_txdone(struct iucv_path *, struct iucv_message *);
...@@ -556,8 +555,8 @@ static void netiucv_callback_connack(struct iucv_path *path, u8 ipuser[16]) ...@@ -556,8 +555,8 @@ static void netiucv_callback_connack(struct iucv_path *path, u8 ipuser[16])
fsm_event(conn->fsm, CONN_EVENT_CONN_ACK, conn); fsm_event(conn->fsm, CONN_EVENT_CONN_ACK, conn);
} }
static int netiucv_callback_connreq(struct iucv_path *path, static int netiucv_callback_connreq(struct iucv_path *path, u8 *ipvmid,
u8 ipvmid[8], u8 ipuser[16]) u8 *ipuser)
{ {
struct iucv_connection *conn = path->private; struct iucv_connection *conn = path->private;
struct iucv_event ev; struct iucv_event ev;
...@@ -587,21 +586,21 @@ static int netiucv_callback_connreq(struct iucv_path *path, ...@@ -587,21 +586,21 @@ static int netiucv_callback_connreq(struct iucv_path *path,
return rc; return rc;
} }
static void netiucv_callback_connrej(struct iucv_path *path, u8 ipuser[16]) static void netiucv_callback_connrej(struct iucv_path *path, u8 *ipuser)
{ {
struct iucv_connection *conn = path->private; struct iucv_connection *conn = path->private;
fsm_event(conn->fsm, CONN_EVENT_CONN_REJ, conn); fsm_event(conn->fsm, CONN_EVENT_CONN_REJ, conn);
} }
static void netiucv_callback_connsusp(struct iucv_path *path, u8 ipuser[16]) static void netiucv_callback_connsusp(struct iucv_path *path, u8 *ipuser)
{ {
struct iucv_connection *conn = path->private; struct iucv_connection *conn = path->private;
fsm_event(conn->fsm, CONN_EVENT_CONN_SUS, conn); fsm_event(conn->fsm, CONN_EVENT_CONN_SUS, conn);
} }
static void netiucv_callback_connres(struct iucv_path *path, u8 ipuser[16]) static void netiucv_callback_connres(struct iucv_path *path, u8 *ipuser)
{ {
struct iucv_connection *conn = path->private; struct iucv_connection *conn = path->private;
......
drivers/s390/net/smsgiucv.c
View file @ 91e60eb6
...@@ -49,7 +49,7 @@ static DEFINE_SPINLOCK(smsg_list_lock); ...@@ -49,7 +49,7 @@ static DEFINE_SPINLOCK(smsg_list_lock);
static LIST_HEAD(smsg_list); static LIST_HEAD(smsg_list);
static int iucv_path_connected; static int iucv_path_connected;
static int smsg_path_pending(struct iucv_path *, u8 ipvmid[8], u8 ipuser[16]); static int smsg_path_pending(struct iucv_path *, u8 *, u8 *);
static void smsg_message_pending(struct iucv_path *, struct iucv_message *); static void smsg_message_pending(struct iucv_path *, struct iucv_message *);
static struct iucv_handler smsg_handler = { static struct iucv_handler smsg_handler = {
...@@ -57,8 +57,7 @@ static struct iucv_handler smsg_handler = { ...@@ -57,8 +57,7 @@ static struct iucv_handler smsg_handler = {
.message_pending = smsg_message_pending, .message_pending = smsg_message_pending,
}; };
static int smsg_path_pending(struct iucv_path *path, u8 ipvmid[8], static int smsg_path_pending(struct iucv_path *path, u8 *ipvmid, u8 *ipuser)
u8 ipuser[16])
{ {
if (strncmp(ipvmid, "*MSG ", 8) != 0) if (strncmp(ipvmid, "*MSG ", 8) != 0)
return -EINVAL; return -EINVAL;
......
drivers/tty/hvc/hvc_iucv.c
View file @ 91e60eb6
...@@ -88,8 +88,8 @@ struct iucv_tty_buffer { ...@@ -88,8 +88,8 @@ struct iucv_tty_buffer {
}; };
/* IUCV callback handler */ /* IUCV callback handler */
static int hvc_iucv_path_pending(struct iucv_path *, u8[8], u8[16]); static int hvc_iucv_path_pending(struct iucv_path *, u8 *, u8 *);
static void hvc_iucv_path_severed(struct iucv_path *, u8[16]); static void hvc_iucv_path_severed(struct iucv_path *, u8 *);
static void hvc_iucv_msg_pending(struct iucv_path *, struct iucv_message *); static void hvc_iucv_msg_pending(struct iucv_path *, struct iucv_message *);
static void hvc_iucv_msg_complete(struct iucv_path *, struct iucv_message *); static void hvc_iucv_msg_complete(struct iucv_path *, struct iucv_message *);
...@@ -782,8 +782,8 @@ static int hvc_iucv_filter_connreq(u8 ipvmid[8]) ...@@ -782,8 +782,8 @@ static int hvc_iucv_filter_connreq(u8 ipvmid[8])
* *
* Locking: struct hvc_iucv_private->lock * Locking: struct hvc_iucv_private->lock
*/ */
static int hvc_iucv_path_pending(struct iucv_path *path, static int hvc_iucv_path_pending(struct iucv_path *path, u8 *ipvmid,
u8 ipvmid[8], u8 ipuser[16]) u8 *ipuser)
{ {
struct hvc_iucv_private *priv, *tmp; struct hvc_iucv_private *priv, *tmp;
u8 wildcard[9] = "lnxhvc "; u8 wildcard[9] = "lnxhvc ";
...@@ -881,7 +881,7 @@ static int hvc_iucv_path_pending(struct iucv_path *path, ...@@ -881,7 +881,7 @@ static int hvc_iucv_path_pending(struct iucv_path *path,
* *
* Locking: struct hvc_iucv_private->lock * Locking: struct hvc_iucv_private->lock
*/ */
static void hvc_iucv_path_severed(struct iucv_path *path, u8 ipuser[16]) static void hvc_iucv_path_severed(struct iucv_path *path, u8 *ipuser)
{ {
struct hvc_iucv_private *priv = path->private; struct hvc_iucv_private *priv = path->private;
......
include/net/iucv/iucv.h
View file @ 91e60eb6
...@@ -141,14 +141,14 @@ struct iucv_handler { ...@@ -141,14 +141,14 @@ struct iucv_handler {
* called is the order of the registration of the iucv handlers * called is the order of the registration of the iucv handlers
* to the base code. * to the base code.
*/ */
int (*path_pending)(struct iucv_path *, u8 ipvmid[8], u8 ipuser[16]); int (*path_pending)(struct iucv_path *, u8 *ipvmid, u8 *ipuser);
/* /*
* The path_complete function is called after an iucv interrupt * The path_complete function is called after an iucv interrupt
* type 0x02 has been received for a path that has been established * type 0x02 has been received for a path that has been established
* for this handler with iucv_path_connect and got accepted by the * for this handler with iucv_path_connect and got accepted by the
* peer with iucv_path_accept. * peer with iucv_path_accept.
*/ */
void (*path_complete)(struct iucv_path *, u8 ipuser[16]); void (*path_complete)(struct iucv_path *, u8 *ipuser);
/* /*
* The path_severed function is called after an iucv interrupt * The path_severed function is called after an iucv interrupt
* type 0x03 has been received. The communication peer shutdown * type 0x03 has been received. The communication peer shutdown
...@@ -156,20 +156,20 @@ struct iucv_handler { ...@@ -156,20 +156,20 @@ struct iucv_handler {
* remaining messages can be received until a iucv_path_sever * remaining messages can be received until a iucv_path_sever
* shuts down the other end of the path as well. * shuts down the other end of the path as well.
*/ */
void (*path_severed)(struct iucv_path *, u8 ipuser[16]); void (*path_severed)(struct iucv_path *, u8 *ipuser);
/* /*
* The path_quiesced function is called after an icuv interrupt * The path_quiesced function is called after an icuv interrupt
* type 0x04 has been received. The communication peer has quiesced * type 0x04 has been received. The communication peer has quiesced
* the path. Delivery of messages is stopped until iucv_path_resume * the path. Delivery of messages is stopped until iucv_path_resume
* has been called. * has been called.
*/ */
void (*path_quiesced)(struct iucv_path *, u8 ipuser[16]); void (*path_quiesced)(struct iucv_path *, u8 *ipuser);
/* /*
* The path_resumed function is called after an icuv interrupt * The path_resumed function is called after an icuv interrupt
* type 0x05 has been received. The communication peer has resumed * type 0x05 has been received. The communication peer has resumed
* the path. * the path.
*/ */
void (*path_resumed)(struct iucv_path *, u8 ipuser[16]); void (*path_resumed)(struct iucv_path *, u8 *ipuser);
/* /*
* The message_pending function is called after an icuv interrupt * The message_pending function is called after an icuv interrupt
* type 0x06 or type 0x07 has been received. A new message is * type 0x06 or type 0x07 has been received. A new message is
...@@ -256,7 +256,7 @@ static inline void iucv_path_free(struct iucv_path *path) ...@@ -256,7 +256,7 @@ static inline void iucv_path_free(struct iucv_path *path)
* Returns the result of the CP IUCV call. * Returns the result of the CP IUCV call.
*/ */
int iucv_path_accept(struct iucv_path *path, struct iucv_handler *handler, int iucv_path_accept(struct iucv_path *path, struct iucv_handler *handler,
u8 userdata[16], void *private); u8 *userdata, void *private);
/** /**
* iucv_path_connect * iucv_path_connect
...@@ -274,7 +274,7 @@ int iucv_path_accept(struct iucv_path *path, struct iucv_handler *handler, ...@@ -274,7 +274,7 @@ int iucv_path_accept(struct iucv_path *path, struct iucv_handler *handler,
* Returns the result of the CP IUCV call. * Returns the result of the CP IUCV call.
*/ */
int iucv_path_connect(struct iucv_path *path, struct iucv_handler *handler, int iucv_path_connect(struct iucv_path *path, struct iucv_handler *handler,
u8 userid[8], u8 system[8], u8 userdata[16], u8 *userid, u8 *system, u8 *userdata,
void *private); void *private);
/** /**
...@@ -287,7 +287,7 @@ int iucv_path_connect(struct iucv_path *path, struct iucv_handler *handler, ...@@ -287,7 +287,7 @@ int iucv_path_connect(struct iucv_path *path, struct iucv_handler *handler,
* *
* Returns the result from the CP IUCV call. * Returns the result from the CP IUCV call.
*/ */
int iucv_path_quiesce(struct iucv_path *path, u8 userdata[16]); int iucv_path_quiesce(struct iucv_path *path, u8 *userdata);
/** /**
* iucv_path_resume: * iucv_path_resume:
...@@ -299,7 +299,7 @@ int iucv_path_quiesce(struct iucv_path *path, u8 userdata[16]); ...@@ -299,7 +299,7 @@ int iucv_path_quiesce(struct iucv_path *path, u8 userdata[16]);
* *
* Returns the result from the CP IUCV call. * Returns the result from the CP IUCV call.
*/ */
int iucv_path_resume(struct iucv_path *path, u8 userdata[16]); int iucv_path_resume(struct iucv_path *path, u8 *userdata);
/** /**
* iucv_path_sever * iucv_path_sever
...@@ -310,7 +310,7 @@ int iucv_path_resume(struct iucv_path *path, u8 userdata[16]); ...@@ -310,7 +310,7 @@ int iucv_path_resume(struct iucv_path *path, u8 userdata[16]);
* *
* Returns the result from the CP IUCV call. * Returns the result from the CP IUCV call.
*/ */
int iucv_path_sever(struct iucv_path *path, u8 userdata[16]); int iucv_path_sever(struct iucv_path *path, u8 *userdata);
/** /**
* iucv_message_purge * iucv_message_purge
......
net/iucv/af_iucv.c
View file @ 91e60eb6
...@@ -95,11 +95,10 @@ static void afiucv_hs_callback_txnotify(struct sk_buff *, enum iucv_tx_notify); ...@@ -95,11 +95,10 @@ static void afiucv_hs_callback_txnotify(struct sk_buff *, enum iucv_tx_notify);
/* Call Back functions */ /* Call Back functions */
static void iucv_callback_rx(struct iucv_path *, struct iucv_message *); static void iucv_callback_rx(struct iucv_path *, struct iucv_message *);
static void iucv_callback_txdone(struct iucv_path *, struct iucv_message *); static void iucv_callback_txdone(struct iucv_path *, struct iucv_message *);
static void iucv_callback_connack(struct iucv_path *, u8 ipuser[16]); static void iucv_callback_connack(struct iucv_path *, u8 *);
static int iucv_callback_connreq(struct iucv_path *, u8 ipvmid[8], static int iucv_callback_connreq(struct iucv_path *, u8 *, u8 *);
u8 ipuser[16]); static void iucv_callback_connrej(struct iucv_path *, u8 *);
static void iucv_callback_connrej(struct iucv_path *, u8 ipuser[16]); static void iucv_callback_shutdown(struct iucv_path *, u8 *);
static void iucv_callback_shutdown(struct iucv_path *, u8 ipuser[16]);
static struct iucv_sock_list iucv_sk_list = { static struct iucv_sock_list iucv_sk_list = {
.lock = __RW_LOCK_UNLOCKED(iucv_sk_list.lock), .lock = __RW_LOCK_UNLOCKED(iucv_sk_list.lock),
......
net/iucv/iucv.c
View file @ 91e60eb6
...@@ -713,7 +713,7 @@ static struct notifier_block __refdata iucv_cpu_notifier = { ...@@ -713,7 +713,7 @@ static struct notifier_block __refdata iucv_cpu_notifier = {
* *
* Sever an iucv path to free up the pathid. Used internally. * Sever an iucv path to free up the pathid. Used internally.
*/ */
static int iucv_sever_pathid(u16 pathid, u8 userdata[16]) static int iucv_sever_pathid(u16 pathid, u8 *userdata)
{ {
union iucv_param *parm; union iucv_param *parm;
...@@ -876,7 +876,7 @@ static struct notifier_block iucv_reboot_notifier = { ...@@ -876,7 +876,7 @@ static struct notifier_block iucv_reboot_notifier = {
* Returns the result of the CP IUCV call. * Returns the result of the CP IUCV call.
*/ */
int iucv_path_accept(struct iucv_path *path, struct iucv_handler *handler, int iucv_path_accept(struct iucv_path *path, struct iucv_handler *handler,
u8 userdata[16], void *private) u8 *userdata, void *private)
{ {
union iucv_param *parm; union iucv_param *parm;
int rc; int rc;
...@@ -923,7 +923,7 @@ EXPORT_SYMBOL(iucv_path_accept); ...@@ -923,7 +923,7 @@ EXPORT_SYMBOL(iucv_path_accept);
* Returns the result of the CP IUCV call. * Returns the result of the CP IUCV call.
*/ */
int iucv_path_connect(struct iucv_path *path, struct iucv_handler *handler, int iucv_path_connect(struct iucv_path *path, struct iucv_handler *handler,
u8 userid[8], u8 system[8], u8 userdata[16], u8 *userid, u8 *system, u8 *userdata,
void *private) void *private)
{ {
union iucv_param *parm; union iucv_param *parm;
...@@ -985,7 +985,7 @@ EXPORT_SYMBOL(iucv_path_connect); ...@@ -985,7 +985,7 @@ EXPORT_SYMBOL(iucv_path_connect);
* *
* Returns the result from the CP IUCV call. * Returns the result from the CP IUCV call.
*/ */
int iucv_path_quiesce(struct iucv_path *path, u8 userdata[16]) int iucv_path_quiesce(struct iucv_path *path, u8 *userdata)
{ {
union iucv_param *parm; union iucv_param *parm;
int rc; int rc;
...@@ -1017,7 +1017,7 @@ EXPORT_SYMBOL(iucv_path_quiesce); ...@@ -1017,7 +1017,7 @@ EXPORT_SYMBOL(iucv_path_quiesce);
* *
* Returns the result from the CP IUCV call. * Returns the result from the CP IUCV call.
*/ */
int iucv_path_resume(struct iucv_path *path, u8 userdata[16]) int iucv_path_resume(struct iucv_path *path, u8 *userdata)
{ {
union iucv_param *parm; union iucv_param *parm;
int rc; int rc;
...@@ -1047,7 +1047,7 @@ int iucv_path_resume(struct iucv_path *path, u8 userdata[16]) ...@@ -1047,7 +1047,7 @@ int iucv_path_resume(struct iucv_path *path, u8 userdata[16])
* *
* Returns the result from the CP IUCV call. * Returns the result from the CP IUCV call.
*/ */
int iucv_path_sever(struct iucv_path *path, u8 userdata[16]) int iucv_path_sever(struct iucv_path *path, u8 *userdata)
{ {
int rc; int rc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7