Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b31fa5ba authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

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.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a0ece285

net/caif/caif_dev.c

+11 −11
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
 *  and Sakari Ailus <sakari.ailus@nokia.com>

 */



#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
Original line number Diff line number Diff line
@@ -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>
@@ -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
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 
 * Author:	Sjur Brendeland/sjur.brandeland@stericsson.com

 * License terms: GNU General Public License (GPL) version 2

 */



#define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__



#include <linux/kernel.h>

#include <linux/stddef.h>

#include <linux/slab.h>
@@ -78,7 +81,7 @@ struct cfcnfg *cfcnfg_create(void) 
	/* Initiate this layer */

	this = kzalloc(sizeof(struct cfcnfg), GFP_ATOMIC);

	if (!this) {

		pr_warning("CAIF: %s(): Out of memory\n", __func__);

		pr_warn("Out of memory\n");

		return NULL;

	}

	this->mux = cfmuxl_create();
@@ -106,7 +109,7 @@ struct cfcnfg *cfcnfg_create(void) 
	layer_set_up(this->ctrl, this);

	return this;

out_of_mem:

	pr_warning("CAIF: %s(): Out of memory\n", __func__);

	pr_warn("Out of memory\n");

	kfree(this->mux);

	kfree(this->ctrl);

	kfree(this);
@@ -194,7 +197,7 @@ int cfcnfg_disconn_adapt_layer(struct cfcnfg *cnfg, struct cflayer *adap_layer) 
	caif_assert(adap_layer != NULL);

	channel_id = adap_layer->id;

	if (adap_layer->dn == NULL || channel_id == 0) {

		pr_err("CAIF: %s():adap_layer->id is 0\n", __func__);

		pr_err("adap_layer->id is 0\n");

		ret = -ENOTCONN;

		goto end;

	}
@@ -204,9 +207,8 @@ int cfcnfg_disconn_adapt_layer(struct cfcnfg *cnfg, struct cflayer *adap_layer) 
	layer_set_up(servl, NULL);

	ret = cfctrl_linkdown_req(cnfg->ctrl, channel_id, adap_layer);

	if (servl == NULL) {

		pr_err("CAIF: %s(): PROTOCOL ERROR "

		       "- Error removing service_layer Channel_Id(%d)",

			__func__, channel_id);

		pr_err("PROTOCOL ERROR - Error removing service_layer Channel_Id(%d)",

		       channel_id);

		ret = -EINVAL;

		goto end;

	}
@@ -216,18 +218,14 @@ int cfcnfg_disconn_adapt_layer(struct cfcnfg *cnfg, struct cflayer *adap_layer) 


		phyinfo = cfcnfg_get_phyinfo(cnfg, phyid);

		if (phyinfo == NULL) {

			pr_warning("CAIF: %s(): "

				"No interface to send disconnect to\n",

				__func__);

			pr_warn("No interface to send disconnect to\n");

			ret = -ENODEV;

			goto end;

		}

		if (phyinfo->id != phyid ||

			phyinfo->phy_layer->id != phyid ||

			phyinfo->frm_layer->id != phyid) {

			pr_err("CAIF: %s(): "

				"Inconsistency in phy registration\n",

				__func__);

			pr_err("Inconsistency in phy registration\n");

			ret = -EINVAL;

			goto end;

		}
@@ -276,21 +274,20 @@ int cfcnfg_add_adaptation_layer(struct cfcnfg *cnfg, 
{

	struct cflayer *frml;

	if (adap_layer == NULL) {

		pr_err("CAIF: %s(): adap_layer is zero", __func__);

		pr_err("adap_layer is zero\n");

		return -EINVAL;

	}

	if (adap_layer->receive == NULL) {

		pr_err("CAIF: %s(): adap_layer->receive is NULL", __func__);

		pr_err("adap_layer->receive is NULL\n");

		return -EINVAL;

	}

	if (adap_layer->ctrlcmd == NULL) {

		pr_err("CAIF: %s(): adap_layer->ctrlcmd == NULL", __func__);

		pr_err("adap_layer->ctrlcmd == NULL\n");

		return -EINVAL;

	}

	frml = cnfg->phy_layers[param->phyid].frm_layer;

	if (frml == NULL) {

		pr_err("CAIF: %s(): Specified PHY type does not exist!",

			__func__);

		pr_err("Specified PHY type does not exist!\n");

		return -ENODEV;

	}

	caif_assert(param->phyid == cnfg->phy_layers[param->phyid].id);
@@ -330,9 +327,7 @@ cfcnfg_linkup_rsp(struct cflayer *layer, u8 channel_id, enum cfctrl_srv serv, 
	struct net_device *netdev;



	if (adapt_layer == NULL) {

		pr_debug("CAIF: %s(): link setup response "

				"but no client exist, send linkdown back\n",

				__func__);

		pr_debug("link setup response but no client exist, send linkdown back\n");

		cfctrl_linkdown_req(cnfg->ctrl, channel_id, NULL);

		return;

	}
@@ -374,13 +369,11 @@ cfcnfg_linkup_rsp(struct cflayer *layer, u8 channel_id, enum cfctrl_srv serv, 
		servicel = cfdbgl_create(channel_id, &phyinfo->dev_info);

		break;

	default:

		pr_err("CAIF: %s(): Protocol error. "

			"Link setup response - unknown channel type\n",

			__func__);

		pr_err("Protocol error. Link setup response - unknown channel type\n");

		return;

	}

	if (!servicel) {

		pr_warning("CAIF: %s(): Out of memory\n", __func__);

		pr_warn("Out of memory\n");

		return;

	}

	layer_set_dn(servicel, cnfg->mux);
@@ -418,7 +411,7 @@ cfcnfg_add_phy_layer(struct cfcnfg *cnfg, enum cfcnfg_phy_type phy_type, 
		}

	}

	if (*phyid == 0) {

		pr_err("CAIF: %s(): No Available PHY ID\n", __func__);

		pr_err("No Available PHY ID\n");

		return;

	}
@@ -427,7 +420,7 @@ cfcnfg_add_phy_layer(struct cfcnfg *cnfg, enum cfcnfg_phy_type phy_type, 
		phy_driver =

		    cfserl_create(CFPHYTYPE_FRAG, *phyid, stx);

		if (!phy_driver) {

			pr_warning("CAIF: %s(): Out of memory\n", __func__);

			pr_warn("Out of memory\n");

			return;

		}
@@ -436,7 +429,7 @@ cfcnfg_add_phy_layer(struct cfcnfg *cnfg, enum cfcnfg_phy_type phy_type, 
		phy_driver = NULL;

		break;

	default:

		pr_err("CAIF: %s(): %d", __func__, phy_type);

		pr_err("%d\n", phy_type);

		return;

		break;

	}
@@ -455,7 +448,7 @@ cfcnfg_add_phy_layer(struct cfcnfg *cnfg, enum cfcnfg_phy_type phy_type, 
	phy_layer->type = phy_type;

	frml = cffrml_create(*phyid, fcs);

	if (!frml) {

		pr_warning("CAIF: %s(): Out of memory\n", __func__);

		pr_warn("Out of memory\n");

		return;

	}

	cnfg->phy_layers[*phyid].frm_layer = frml;

net/caif/cfctrl.c

+25 −34
Original line number Diff line number Diff line
@@ -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>
@@ -36,7 +38,7 @@ struct cflayer *cfctrl_create(void) 
	struct cfctrl *this =

		kmalloc(sizeof(struct cfctrl), 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 cfctrl, serv.layer) == 0);
@@ -132,9 +134,7 @@ struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl, 
	list_for_each_entry_safe(p, tmp, &ctrl->list, list) {

		if (cfctrl_req_eq(req, p)) {

			if (p != first)

				pr_warning("CAIF: %s(): Requests are not "

					"received in order\n",

					__func__);

				pr_warn("Requests are not received in order\n");



			atomic_set(&ctrl->rsp_seq_no,

					 p->sequence_no);
@@ -177,7 +177,7 @@ void cfctrl_enum_req(struct cflayer *layer, u8 physlinkid) 
	int ret;

	struct cfpkt *pkt = cfpkt_create(CFPKT_CTRL_PKT_LEN);

	if (!pkt) {

		pr_warning("CAIF: %s(): Out of memory\n", __func__);

		pr_warn("Out of memory\n");

		return;

	}

	caif_assert(offsetof(struct cfctrl, serv.layer) == 0);
@@ -189,8 +189,7 @@ void cfctrl_enum_req(struct cflayer *layer, u8 physlinkid) 
	ret =

	    cfctrl->serv.layer.dn->transmit(cfctrl->serv.layer.dn, pkt);

	if (ret < 0) {

		pr_err("CAIF: %s(): Could not transmit enum message\n",

			__func__);

		pr_err("Could not transmit enum message\n");

		cfpkt_destroy(pkt);

	}

}
@@ -208,7 +207,7 @@ int cfctrl_linkup_request(struct cflayer *layer, 
	char utility_name[16];

	struct cfpkt *pkt = cfpkt_create(CFPKT_CTRL_PKT_LEN);

	if (!pkt) {

		pr_warning("CAIF: %s(): Out of memory\n", __func__);

		pr_warn("Out of memory\n");

		return -ENOMEM;

	}

	cfpkt_addbdy(pkt, CFCTRL_CMD_LINK_SETUP);
@@ -253,13 +252,13 @@ int cfctrl_linkup_request(struct cflayer *layer, 
			       param->u.utility.paramlen);

		break;

	default:

		pr_warning("CAIF: %s():Request setup of bad link type = %d\n",

			   __func__, param->linktype);

		pr_warn("Request setup of bad link type = %d\n",

			param->linktype);

		return -EINVAL;

	}

	req = kzalloc(sizeof(*req), GFP_KERNEL);

	if (!req) {

		pr_warning("CAIF: %s(): Out of memory\n", __func__);

		pr_warn("Out of memory\n");

		return -ENOMEM;

	}

	req->client_layer = user_layer;
@@ -276,8 +275,7 @@ int cfctrl_linkup_request(struct cflayer *layer, 
	ret =

	    cfctrl->serv.layer.dn->transmit(cfctrl->serv.layer.dn, pkt);

	if (ret < 0) {

		pr_err("CAIF: %s(): Could not transmit linksetup request\n",

			__func__);

		pr_err("Could not transmit linksetup request\n");

		cfpkt_destroy(pkt);

		return -ENODEV;

	}
@@ -291,7 +289,7 @@ int cfctrl_linkdown_req(struct cflayer *layer, u8 channelid, 
	struct cfctrl *cfctrl = container_obj(layer);

	struct cfpkt *pkt = cfpkt_create(CFPKT_CTRL_PKT_LEN);

	if (!pkt) {

		pr_warning("CAIF: %s(): Out of memory\n", __func__);

		pr_warn("Out of memory\n");

		return -ENOMEM;

	}

	cfpkt_addbdy(pkt, CFCTRL_CMD_LINK_DESTROY);
@@ -300,8 +298,7 @@ int cfctrl_linkdown_req(struct cflayer *layer, u8 channelid, 
	ret =

	    cfctrl->serv.layer.dn->transmit(cfctrl->serv.layer.dn, pkt);

	if (ret < 0) {

		pr_err("CAIF: %s(): Could not transmit link-down request\n",

			__func__);

		pr_err("Could not transmit link-down request\n");

		cfpkt_destroy(pkt);

	}

	return ret;
@@ -313,7 +310,7 @@ void cfctrl_sleep_req(struct cflayer *layer) 
	struct cfctrl *cfctrl = container_obj(layer);

	struct cfpkt *pkt = cfpkt_create(CFPKT_CTRL_PKT_LEN);

	if (!pkt) {

		pr_warning("CAIF: %s(): Out of memory\n", __func__);

		pr_warn("Out of memory\n");

		return;

	}

	cfpkt_addbdy(pkt, CFCTRL_CMD_SLEEP);
@@ -330,7 +327,7 @@ void cfctrl_wake_req(struct cflayer *layer) 
	struct cfctrl *cfctrl = container_obj(layer);

	struct cfpkt *pkt = cfpkt_create(CFPKT_CTRL_PKT_LEN);

	if (!pkt) {

		pr_warning("CAIF: %s(): Out of memory\n", __func__);

		pr_warn("Out of memory\n");

		return;

	}

	cfpkt_addbdy(pkt, CFCTRL_CMD_WAKE);
@@ -347,7 +344,7 @@ void cfctrl_getstartreason_req(struct cflayer *layer) 
	struct cfctrl *cfctrl = container_obj(layer);

	struct cfpkt *pkt = cfpkt_create(CFPKT_CTRL_PKT_LEN);

	if (!pkt) {

		pr_warning("CAIF: %s(): Out of memory\n", __func__);

		pr_warn("Out of memory\n");

		return;

	}

	cfpkt_addbdy(pkt, CFCTRL_CMD_START_REASON);
@@ -364,12 +361,11 @@ void cfctrl_cancel_req(struct cflayer *layr, struct cflayer *adap_layer) 
	struct cfctrl_request_info *p, *tmp;

	struct cfctrl *ctrl = container_obj(layr);

	spin_lock(&ctrl->info_list_lock);

	pr_warning("CAIF: %s(): enter\n", __func__);

	pr_warn("enter\n");



	list_for_each_entry_safe(p, tmp, &ctrl->list, list) {

		if (p->client_layer == adap_layer) {

			pr_warning("CAIF: %s(): cancel req :%d\n", __func__,

					p->sequence_no);

			pr_warn("cancel req :%d\n", p->sequence_no);

			list_del(&p->list);

			kfree(p);

		}
@@ -520,9 +516,8 @@ static int cfctrl_recv(struct cflayer *layer, struct cfpkt *pkt) 
				cfpkt_extr_head(pkt, &param, len);

				break;

			default:

				pr_warning("CAIF: %s(): Request setup "

					   "- invalid link type (%d)",

					   __func__, serv);

				pr_warn("Request setup - invalid link type (%d)\n",

					serv);

				goto error;

			}
@@ -532,9 +527,7 @@ static int cfctrl_recv(struct cflayer *layer, struct cfpkt *pkt) 


			if (CFCTRL_ERR_BIT == (CFCTRL_ERR_BIT & cmdrsp) ||

				cfpkt_erroneous(pkt)) {

				pr_err("CAIF: %s(): Invalid O/E bit or parse "

				       "error on CAIF control channel",

					__func__);

				pr_err("Invalid O/E bit or parse error on CAIF control channel\n");

				cfctrl->res.reject_rsp(cfctrl->serv.layer.up,

						       0,

						       req ? req->client_layer
@@ -556,8 +549,7 @@ static int cfctrl_recv(struct cflayer *layer, struct cfpkt *pkt) 
		cfctrl->res.linkdestroy_rsp(cfctrl->serv.layer.up, linkid);

		break;

	case CFCTRL_CMD_LINK_ERR:

		pr_err("CAIF: %s(): Frame Error Indication received\n",

			__func__);

		pr_err("Frame Error Indication received\n");

		cfctrl->res.linkerror_ind();

		break;

	case CFCTRL_CMD_ENUM:
@@ -576,7 +568,7 @@ static int cfctrl_recv(struct cflayer *layer, struct cfpkt *pkt) 
		cfctrl->res.radioset_rsp();

		break;

	default:

		pr_err("CAIF: %s(): Unrecognized Control Frame\n", __func__);

		pr_err("Unrecognized Control Frame\n");

		goto error;

		break;

	}
@@ -595,8 +587,7 @@ static void cfctrl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, 
	case CAIF_CTRLCMD_FLOW_OFF_IND:

		spin_lock(&this->info_list_lock);

		if (!list_empty(&this->list)) {

			pr_debug("CAIF: %s(): Received flow off in "

				   "control layer", __func__);

			pr_debug("Received flow off in control layer\n");

		}

		spin_unlock(&this->info_list_lock);

		break;
@@ -620,7 +611,7 @@ static int handle_loop(struct cfctrl *ctrl, int cmd, struct cfpkt *pkt) 
			if (!ctrl->loop_linkused[linkid])

				goto found;

		spin_unlock(&ctrl->loop_linkid_lock);

		pr_err("CAIF: %s(): Out of link-ids\n", __func__);

		pr_err("Out of link-ids\n");

		return -EINVAL;

found:

		if (!ctrl->loop_linkused[linkid])

net/caif/cfdbgl.c

+3 −1
Original line number Diff line number Diff line
@@ -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);