net/caif: Use pr_fmt
Subsystems (2)
PATCH 1/1 net/caif: Use pr_fmt
This patch standardizes caif message logging prefixes.
Add #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ Add missing "\n"s to some logging messages
Convert pr_warning to pr_warn
This changes the logging message prefix from CAIF: to caif:
for all uses but caif_socket.c and chnl_net.c. Those now use their filename without extension.
--- net/caif/caif_dev.c | 22 ++++++++-------- net/caif/caif_socket.c | 19 +++++++-------- net/caif/cfcnfg.c | 49 ++++++++++++++++---------------------- net/caif/cfctrl.c | 59 ++++++++++++++++++++--------------------------- net/caif/cfdbgl.c | 4 ++- net/caif/cfdgml.c | 11 ++++---- net/caif/cffrml.c | 14 ++++++---- net/caif/cfmuxl.c | 14 ++++++---- net/caif/cfpkt_skbuff.c | 48 +++++++++++++++++++------------------- net/caif/cfrfml.c | 12 ++++----- net/caif/cfserl.c | 4 ++- net/caif/cfsrvl.c | 17 +++++-------- net/caif/cfutill.c | 12 ++++---- net/caif/cfveil.c | 11 ++++---- net/caif/cfvidl.c | 6 +++- net/caif/chnl_net.c | 46 ++++++++++++++++-------------------- 16 files changed, 167 insertions(+), 181 deletions(-)
net/caif/caif_dev.c +11 -11
@@ -9,6 +9,8 @@* and Sakari Ailus <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ +#include <linux/version.h> #include <linux/module.h> #include <linux/kernel.h>
@@ -214,7 +216,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,switch (what) {case NETDEV_REGISTER : -pr_info ("CAIF: %s():register %s\n" , __func__, dev->name); +pr_info ("register %s\n" , dev->name); caifd =caif_device_alloc (dev);if (caifd ==NULL )break ;
@@ -225,14 +227,13 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,break ;case NETDEV_UP : -pr_info ("CAIF: %s(): up %s\n" , __func__, dev->name); +pr_info ("up %s\n" , dev->name); caifd =caif_get (dev);if (caifd ==NULL )break ; caifdev =netdev_priv (dev);if (atomic_read (&caifd->state) ==NETDEV_UP ) { -pr_info ("CAIF: %s():%s already up\n" , - __func__, dev->name); +pr_info ("%s already up\n" , dev->name);break ; }atomic_set (&caifd->state, what);
@@ -273,7 +274,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what, caifd =caif_get (dev);if (caifd ==NULL )break ; -pr_info ("CAIF: %s():going down %s\n" , __func__, dev->name); +pr_info ("going down %s\n" , dev->name);if (atomic_read (&caifd->state) ==NETDEV_GOING_DOWN ||atomic_read (&caifd->state) ==NETDEV_DOWN )
@@ -295,11 +296,10 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what, caifd =caif_get (dev);if (caifd ==NULL )break ; -pr_info ("CAIF: %s(): down %s\n" , __func__, dev->name); +pr_info ("down %s\n" , dev->name);if (atomic_read (&caifd->in_use)) -pr_warning ("CAIF: %s(): " -"Unregistering an active CAIF device: %s\n" , - __func__, dev->name); +pr_warn ("Unregistering an active CAIF device: %s\n" , + dev->name);cfcnfg_del_phy_layer (get_caif_conf (), &caifd->layer);dev_put (dev);atomic_set (&caifd->state, what);
@@ -307,7 +307,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,case NETDEV_UNREGISTER : caifd =caif_get (dev); -pr_info ("CAIF: %s(): unregister %s\n" , __func__, dev->name); +pr_info ("unregister %s\n" , dev->name);atomic_set (&caifd->state, what);caif_device_destroy (dev);break ;
@@ -391,7 +391,7 @@ static int __init caif_device_init(void)int result; cfg =cfcnfg_create ();if (!cfg) { -pr_warning ("CAIF: %s(): can't create cfcnfg.\n" , __func__); +pr_warn ("can't create cfcnfg\n" ); goto err_cfcnfg_create_failed; } result =register_pernet_device (&caif_net_ops);
net/caif/caif_socket.c +9 -10
@@ -4,6 +4,8 @@* License terms: GNU General Public License (GPL) version 2 */ +#define pr_fmt (fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ +#include <linux/fs.h> #include <linux/init.h> #include <linux/module.h>
@@ -157,8 +159,8 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)if (atomic_read (&sk->sk_rmem_alloc) + skb->truesize >= (unsigned )sk->sk_rcvbuf &&rx_flow_is_on (cf_sk)) { -trace_printk ("CAIF: %s():" -" sending flow OFF (queue len = %d %d)\n" , +trace_printk ("CAIF: %s(): " +"sending flow OFF (queue len = %d %d)\n" , __func__,atomic_read (&cf_sk->sk.sk_rmem_alloc),sk_rcvbuf_lowwater (cf_sk));
@@ -172,8 +174,8 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)return err;if (!sk_rmem_schedule (sk, skb->truesize) &&rx_flow_is_on (cf_sk)) {set_rx_flow_off (cf_sk); -trace_printk ("CAIF: %s():" -" sending flow OFF due to rmem_schedule\n" , +trace_printk ("CAIF: %s(): " +"sending flow OFF due to rmem_schedule\n" , __func__);dbfs_atomic_inc (&cnt.num_rx_flow_off);caif_flow_ctrl (sk,CAIF_MODEMCMD_FLOW_OFF_REQ );
@@ -275,8 +277,7 @@ static void caif_ctrl_cb(struct cflayer *layr,break ;default : -pr_debug ("CAIF: %s(): Unexpected flow command %d\n" , - __func__, flow); +pr_debug ("Unexpected flow command %d\n" , flow); } }
@@ -536,8 +537,7 @@ static int transmit_skb(struct sk_buff *skb, struct caifsock *cf_sk,/* Slight paranoia, probably not needed. */ if (unlikely (loopcnt++ >1000 )) { -pr_warning ("CAIF: %s(): transmit retries failed," -" error = %d\n" , __func__, ret); +pr_warn ("transmit retries failed, error = %d\n" , ret);break ; }
@@ -902,8 +902,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr, cf_sk->maxframe = dev->mtu - (headroom + tailroom);dev_put (dev);if (cf_sk->maxframe <1 ) { -pr_warning ("CAIF: %s(): CAIF Interface MTU too small (%d)\n" , - __func__, dev->mtu); +pr_warn ("CAIF Interface MTU too small (%d)\n" , dev->mtu); err = -ENODEV ; goto out; }
net/caif/cfcnfg.c +21 -28
146 lines not on this page · raw message
net/caif/cfctrl.c +25 -34
186 lines not on this page · raw message
net/caif/cfdbgl.c +3 -1
@@ -4,6 +4,8 @@* License terms: GNU General Public License (GPL) version 2 */ +#define pr_fmt (fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ +#include <linux/stddef.h> #include <linux/slab.h> #include <net/caif/caif_layer.h>
@@ -17,7 +19,7 @@ struct cflayer *cfdbgl_create(u8 channel_id, struct dev_info *dev_info) {struct cfsrvl *dbg =kmalloc (sizeof (struct cfsrvl ),GFP_ATOMIC );if (!dbg) { -pr_warning ("CAIF: %s(): Out of memory\n" , __func__); +pr_warn ("Out of memory\n" );return NULL ; }caif_assert (offsetof(struct cfsrvl , layer) ==0 );
net/caif/cfdgml.c +6 -5
@@ -4,6 +4,8 @@* License terms: GNU General Public License (GPL) version 2 */ +#define pr_fmt (fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ +#include <linux/stddef.h> #include <linux/spinlock.h> #include <linux/slab.h>
@@ -26,7 +28,7 @@ struct cflayer *cfdgml_create(u8 channel_id, struct dev_info *dev_info) {struct cfsrvl *dgm =kmalloc (sizeof (struct cfsrvl ),GFP_ATOMIC );if (!dgm) { -pr_warning ("CAIF: %s(): Out of memory\n" , __func__); +pr_warn ("Out of memory\n" );return NULL ; }caif_assert (offsetof(struct cfsrvl , layer) ==0 );
@@ -49,14 +51,14 @@ static int cfdgml_receive(struct cflayer *layr, struct cfpkt *pkt)caif_assert (layr->ctrlcmd !=NULL );if (cfpkt_extr_head (pkt, &cmd,1 ) <0 ) { -pr_err ("CAIF: %s(): Packet is erroneous!\n" , __func__); +pr_err ("Packet is erroneous!\n" );cfpkt_destroy (pkt);return -EPROTO ; }if ((cmd &DGM_CMD_BIT ) ==0 ) {if (cfpkt_extr_head (pkt, &dgmhdr,3 ) <0 ) { -pr_err ("CAIF: %s(): Packet is erroneous!\n" , __func__); +pr_err ("Packet is erroneous!\n" );cfpkt_destroy (pkt);return -EPROTO ; }
@@ -75,8 +77,7 @@ static int cfdgml_receive(struct cflayer *layr, struct cfpkt *pkt)return 0 ;default :cfpkt_destroy (pkt); -pr_info ("CAIF: %s(): Unknown datagram control %d (0x%x)\n" , - __func__, cmd, cmd); +pr_info ("Unknown datagram control %d (0x%x)\n" , cmd, cmd);return -EPROTO ; } }
net/caif/cffrml.c +8 -6
@@ -6,6 +6,8 @@* License terms: GNU General Public License (GPL) version 2 */ +#define pr_fmt (fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ +#include <linux/stddef.h> #include <linux/spinlock.h> #include <linux/slab.h>
@@ -32,7 +34,7 @@ struct cflayer *cffrml_create(u16 phyid, bool use_fcs) {struct cffrml *this =kmalloc (sizeof (struct cffrml ),GFP_ATOMIC );if (!this) { -pr_warning ("CAIF: %s(): Out of memory\n" , __func__); +pr_warn ("Out of memory\n" );return NULL ; }caif_assert (offsetof(struct cffrml , layer) ==0 );
@@ -83,7 +85,7 @@ static int cffrml_receive(struct cflayer *layr, struct cfpkt *pkt)if (cfpkt_setlen (pkt, len) <0 ) { ++cffrml_rcv_error; -pr_err ("CAIF: %s():Framing length error (%d)\n" , __func__, len); +pr_err ("Framing length error (%d)\n" , len);cfpkt_destroy (pkt);return -EPROTO ; }
@@ -99,14 +101,14 @@ static int cffrml_receive(struct cflayer *layr, struct cfpkt *pkt)cfpkt_add_trail (pkt, &tmp,2 ); ++cffrml_rcv_error; ++cffrml_rcv_checsum_error; -pr_info ("CAIF: %s(): Frame checksum error " -"(0x%x != 0x%x)\n" , __func__, hdrchks, pktchks); +pr_info ("Frame checksum error (0x%x != 0x%x)\n" , + hdrchks, pktchks);return -EILSEQ ; } }if (cfpkt_erroneous (pkt)) { ++cffrml_rcv_error; -pr_err ("CAIF: %s(): Packet is erroneous!\n" , __func__); +pr_err ("Packet is erroneous!\n" );cfpkt_destroy (pkt);return -EPROTO ; }
@@ -132,7 +134,7 @@ static int cffrml_transmit(struct cflayer *layr, struct cfpkt *pkt)cfpkt_add_head (pkt, &tmp,2 );cfpkt_info (pkt)->hdr_len +=2 ;if (cfpkt_erroneous (pkt)) { -pr_err ("CAIF: %s(): Packet is erroneous!\n" , __func__); +pr_err ("Packet is erroneous!\n" );return -EPROTO ; } ret = layr->dn->transmit (layr->dn, pkt);
net/caif/cfmuxl.c +8 -6
@@ -3,6 +3,9 @@* Author: Sjur Brendeland/[email protected] * License terms: GNU General Public License (GPL) version 2 */ + +#define pr_fmt (fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ +#include <linux/stddef.h> #include <linux/spinlock.h> #include <linux/slab.h>
@@ -190,7 +193,7 @@ static int cfmuxl_receive(struct cflayer *layr, struct cfpkt *pkt)u8 id;struct cflayer *up;if (cfpkt_extr_head (pkt, &id,1 ) <0 ) { -pr_err ("CAIF: %s(): erroneous Caif Packet\n" , __func__); +pr_err ("erroneous Caif Packet\n" );cfpkt_destroy (pkt);return -EPROTO ; }
@@ -199,8 +202,8 @@ static int cfmuxl_receive(struct cflayer *layr, struct cfpkt *pkt) up =get_up (muxl, id);spin_unlock (&muxl->receive_lock);if (up ==NULL ) { -pr_info ("CAIF: %s():Received data on unknown link ID = %d " -"(0x%x) up == NULL" , __func__, id, id); +pr_info ("Received data on unknown link ID = %d (0x%x) up == NULL" , + id, id);cfpkt_destroy (pkt);/* * Don't return ERROR, since modem misbehaves and sends out
@@ -223,9 +226,8 @@ static int cfmuxl_transmit(struct cflayer *layr, struct cfpkt *pkt)struct caif_payload_info *info =cfpkt_info (pkt); dn =get_dn (muxl,cfpkt_info (pkt)->dev_info);if (dn ==NULL ) { -pr_warning ("CAIF: %s(): Send data on unknown phy " -"ID = %d (0x%x)\n" , - __func__, info->dev_info->id, info->dev_info->id); +pr_warn ("Send data on unknown phy ID = %d (0x%x)\n" , + info->dev_info->id, info->dev_info->id);return -ENOTCONN ; } info->hdr_len +=1 ;
net/caif/cfpkt_skbuff.c +24 -24
147 lines not on this page · raw message
net/caif/cfrfml.c +5 -7
@@ -4,6 +4,8 @@* License terms: GNU General Public License (GPL) version 2 */ +#define pr_fmt (fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ +#include <linux/stddef.h> #include <linux/spinlock.h> #include <linux/slab.h>
@@ -48,7 +50,7 @@ struct cflayer *cfrfml_create(u8 channel_id, struct dev_info *dev_info,kzalloc (sizeof (struct cfrfml ),GFP_ATOMIC );if (!this) { -pr_warning ("CAIF: %s(): Out of memory\n" , __func__); +pr_warn ("Out of memory\n" );return NULL ; }
@@ -178,9 +180,7 @@ out:cfpkt_destroy (rfml->incomplete_frm); rfml->incomplete_frm =NULL ; -pr_info ("CAIF: %s(): " -"Connection error %d triggered on RFM link\n" , - __func__, err); +pr_info ("Connection error %d triggered on RFM link\n" , err);/* Trigger connection error upon failure.*/ layr->up->ctrlcmd(layr->up, CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND,
@@ -280,9 +280,7 @@ static int cfrfml_transmit(struct cflayer *layr, struct cfpkt *pkt) out:if (err !=0 ) { -pr_info ("CAIF: %s(): " -"Connection error %d triggered on RFM link\n" , - __func__, err); +pr_info ("Connection error %d triggered on RFM link\n" , err);/* Trigger connection error upon failure.*/ layr->up->ctrlcmd(layr->up, CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND,
net/caif/cfserl.c +3 -1
@@ -4,6 +4,8 @@* License terms: GNU General Public License (GPL) version 2 */ +#define pr_fmt (fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ +#include <linux/stddef.h> #include <linux/spinlock.h> #include <linux/slab.h>
@@ -34,7 +36,7 @@ struct cflayer *cfserl_create(int type, int instance, bool use_stx) {struct cfserl *this =kmalloc (sizeof (struct cfserl ),GFP_ATOMIC );if (!this) { -pr_warning ("CAIF: %s(): Out of memory\n" , __func__); +pr_warn ("Out of memory\n" );return NULL ; }caif_assert (offsetof(struct cfserl , layer) ==0 );
net/caif/cfsrvl.c +7 -10
@@ -4,6 +4,8 @@* License terms: GNU General Public License (GPL) version 2 */ +#define pr_fmt (fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ +#include <linux/kernel.h> #include <linux/types.h> #include <linux/errno.h>
@@ -79,8 +81,7 @@ static void cfservl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, layr->up->ctrlcmd (layr->up, ctrl, phyid);break ;default : -pr_warning ("CAIF: %s(): " -"Unexpected ctrl in cfsrvl (%d)\n" , __func__, ctrl); +pr_warn ("Unexpected ctrl in cfsrvl (%d)\n" , ctrl);/* We have both modem and phy flow on, send flow on */ layr->up->ctrlcmd (layr->up, ctrl, phyid); service->phy_flow_on = true;
@@ -107,14 +108,12 @@ static int cfservl_modemcmd(struct cflayer *layr, enum caif_modemcmd ctrl)u8 flow_on =SRVL_FLOW_ON ; pkt =cfpkt_create (SRVL_CTRL_PKT_SIZE );if (!pkt) { -pr_warning ("CAIF: %s(): Out of memory\n" , - __func__); +pr_warn ("Out of memory\n" );return -ENOMEM ; }if (cfpkt_add_head (pkt, &flow_on,1 ) <0 ) { -pr_err ("CAIF: %s(): Packet is erroneous!\n" , - __func__); +pr_err ("Packet is erroneous!\n" );cfpkt_destroy (pkt);return -EPROTO ; }
@@ -131,14 +130,12 @@ static int cfservl_modemcmd(struct cflayer *layr, enum caif_modemcmd ctrl)u8 flow_off =SRVL_FLOW_OFF ; pkt =cfpkt_create (SRVL_CTRL_PKT_SIZE );if (!pkt) { -pr_warning ("CAIF: %s(): Out of memory\n" , - __func__); +pr_warn ("Out of memory\n" );return -ENOMEM ; }if (cfpkt_add_head (pkt, &flow_off,1 ) <0 ) { -pr_err ("CAIF: %s(): Packet is erroneous!\n" , - __func__); +pr_err ("Packet is erroneous!\n" );cfpkt_destroy (pkt);return -EPROTO ; }
net/caif/cfutill.c +6 -6
@@ -4,6 +4,8 @@* License terms: GNU General Public License (GPL) version 2 */ +#define pr_fmt (fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ +#include <linux/kernel.h> #include <linux/types.h> #include <linux/slab.h>
@@ -26,7 +28,7 @@ struct cflayer *cfutill_create(u8 channel_id, struct dev_info *dev_info) {struct cfsrvl *util =kmalloc (sizeof (struct cfsrvl ),GFP_ATOMIC );if (!util) { -pr_warning ("CAIF: %s(): Out of memory\n" , __func__); +pr_warn ("Out of memory\n" );return NULL ; }caif_assert (offsetof(struct cfsrvl , layer) ==0 );
@@ -47,7 +49,7 @@ static int cfutill_receive(struct cflayer *layr, struct cfpkt *pkt)caif_assert (layr->up->receive !=NULL );caif_assert (layr->up->ctrlcmd !=NULL );if (cfpkt_extr_head (pkt, &cmd,1 ) <0 ) { -pr_err ("CAIF: %s(): Packet is erroneous!\n" , __func__); +pr_err ("Packet is erroneous!\n" );cfpkt_destroy (pkt);return -EPROTO ; }
@@ -64,16 +66,14 @@ static int cfutill_receive(struct cflayer *layr, struct cfpkt *pkt)cfpkt_destroy (pkt);return 0 ;case UTIL_REMOTE_SHUTDOWN :/* Remote Shutdown Request */ -pr_err ("CAIF: %s(): REMOTE SHUTDOWN REQUEST RECEIVED\n" , - __func__); +pr_err ("REMOTE SHUTDOWN REQUEST RECEIVED\n" ); layr->ctrlcmd (layr,CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND ,0 ); service->open = false;cfpkt_destroy (pkt);return 0 ;default :cfpkt_destroy (pkt); -pr_warning ("CAIF: %s(): Unknown service control %d (0x%x)\n" , - __func__, cmd, cmd); +pr_warn ("Unknown service control %d (0x%x)\n" , cmd, cmd);return -EPROTO ; } }
net/caif/cfveil.c +6 -5
@@ -4,6 +4,8 @@* License terms: GNU General Public License (GPL) version 2 */ +#define pr_fmt (fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ +#include <linux/stddef.h> #include <linux/slab.h> #include <net/caif/caif_layer.h>
@@ -25,7 +27,7 @@ struct cflayer *cfvei_create(u8 channel_id, struct dev_info *dev_info) {struct cfsrvl *vei =kmalloc (sizeof (struct cfsrvl ),GFP_ATOMIC );if (!vei) { -pr_warning ("CAIF: %s(): Out of memory\n" , __func__); +pr_warn ("Out of memory\n" );return NULL ; }caif_assert (offsetof(struct cfsrvl , layer) ==0 );
@@ -47,7 +49,7 @@ static int cfvei_receive(struct cflayer *layr, struct cfpkt *pkt)if (cfpkt_extr_head (pkt, &cmd,1 ) <0 ) { -pr_err ("CAIF: %s(): Packet is erroneous!\n" , __func__); +pr_err ("Packet is erroneous!\n" );cfpkt_destroy (pkt);return -EPROTO ; }
@@ -67,8 +69,7 @@ static int cfvei_receive(struct cflayer *layr, struct cfpkt *pkt)cfpkt_destroy (pkt);return 0 ;default :/* SET RS232 PIN */ -pr_warning ("CAIF: %s():Unknown VEI control packet %d (0x%x)!\n" , - __func__, cmd, cmd); +pr_warn ("Unknown VEI control packet %d (0x%x)!\n" , cmd, cmd);cfpkt_destroy (pkt);return -EPROTO ; }
@@ -86,7 +87,7 @@ static int cfvei_transmit(struct cflayer *layr, struct cfpkt *pkt)caif_assert (layr->dn->transmit !=NULL );if (cfpkt_add_head (pkt, &tmp,1 ) <0 ) { -pr_err ("CAIF: %s(): Packet is erroneous!\n" , __func__); +pr_err ("Packet is erroneous!\n" );return -EPROTO ; }
net/caif/cfvidl.c +4 -2
@@ -4,6 +4,8 @@* License terms: GNU General Public License (GPL) version 2 */ +#define pr_fmt (fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ +#include <linux/kernel.h> #include <linux/types.h> #include <linux/slab.h>
@@ -21,7 +23,7 @@ struct cflayer *cfvidl_create(u8 channel_id, struct dev_info *dev_info) {struct cfsrvl *vid =kmalloc (sizeof (struct cfsrvl ),GFP_ATOMIC );if (!vid) { -pr_warning ("CAIF: %s(): Out of memory\n" , __func__); +pr_warn ("Out of memory\n" );return NULL ; }caif_assert (offsetof(struct cfsrvl , layer) ==0 );
@@ -38,7 +40,7 @@ static int cfvidl_receive(struct cflayer *layr, struct cfpkt *pkt) {u32 videoheader;if (cfpkt_extr_head (pkt, &videoheader,4 ) <0 ) { -pr_err ("CAIF: %s(): Packet is erroneous!\n" , __func__); +pr_err ("Packet is erroneous!\n" );cfpkt_destroy (pkt);return -EPROTO ; }
net/caif/chnl_net.c +21 -25
136 lines not on this page · raw message
PATCH 1/1 net/caifcaif_dev.c: Use netdev_<level>
Convert pr_<level>("%s" ..., (struct netdev *)->name ...) to netdev_<level>((struct netdev *), ...)
--- net/caif/caif_dev.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
net/caif/caif_dev.c +8 -8
@@ -216,7 +216,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,switch (what) {case NETDEV_REGISTER : -pr_info ("register %s\n" , dev->name); +netdev_info (dev,"register\n" ); caifd =caif_device_alloc (dev);if (caifd ==NULL )break ;
@@ -227,13 +227,13 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,break ;case NETDEV_UP : -pr_info ("up %s\n" , dev->name); +netdev_info (dev,"up\n" ); caifd =caif_get (dev);if (caifd ==NULL )break ; caifdev =netdev_priv (dev);if (atomic_read (&caifd->state) ==NETDEV_UP ) { -pr_info ("%s already up\n" , dev->name); +netdev_info (dev,"already up\n" );break ; }atomic_set (&caifd->state, what);
@@ -274,7 +274,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what, caifd =caif_get (dev);if (caifd ==NULL )break ; -pr_info ("going down %s\n" , dev->name); +netdev_info (dev,"going down\n" );if (atomic_read (&caifd->state) ==NETDEV_GOING_DOWN ||atomic_read (&caifd->state) ==NETDEV_DOWN )
@@ -296,10 +296,10 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what, caifd =caif_get (dev);if (caifd ==NULL )break ; -pr_info ("down %s\n" , dev->name); +netdev_info (dev,"down\n" );if (atomic_read (&caifd->in_use)) -pr_warn ("Unregistering an active CAIF device: %s\n" , - dev->name); +netdev_warn (dev, +"Unregistering an active CAIF device\n" );cfcnfg_del_phy_layer (get_caif_conf (), &caifd->layer);dev_put (dev);atomic_set (&caifd->state, what);
@@ -307,7 +307,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,case NETDEV_UNREGISTER : caifd =caif_get (dev); -pr_info ("unregister %s\n" , dev->name); +netdev_info (dev,"unregister\n" );atomic_set (&caifd->state, what);caif_device_destroy (dev);break ;
Re: [PATCH net-next] net/caifcaif_dev.c: Use netdev_<level>
From: Joe Perches <[email protected]>
Date: Mon, 06 Sep 2010 01:08:09 -0700
Quoted 4 lines
Convert pr_<level>("%s" ..., (struct netdev *)->name ...) to netdev_<level>((struct netdev *), ...)
Signed-off-by Joe Perches <[email protected]>
Applied.
From: Joe Perches <[email protected]>
Date: Mon, 06 Sep 2010 00:31:11 -0700
Quoted 11 lines
This patch standardizes caif message logging prefixes.
Add #define
pr_fmt(fmt)KBUILD_MODNAME":%s(): " fmt,__func__Add missing "\n"s to some logging messages
Convertpr_warningtopr_warnThis changes the logging message prefix from CAIF: to caif:
for all uses butcaif_socket.candchnl_net.c. Those now use their filename without extension.Signed-off-by Joe Perches <[email protected]>
Applied.