Skip to contentSkip to conversation

staging: gdm724x: Update logging

PATCH New Joe Perches 1 participant 1 message Jul 24, 2013 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: gdm724x: Update logging

Make the logging prefixes match the module names by adding #define pr_fmt(fmt) KBUILD_MODNAME and converting printks to netdev_<level> when a struct netdevice * is available and and pr_<level> when not.

Remove embedded prefixes.
Add missing terminating newlines.
Remove an unnecessary rx-dropped message. Remove an unnecessary temporary variable.

---
 drivers/staging/gdm724x/gdm_lte.c   | 38 ++++++++++++++++----------------
 drivers/staging/gdm724x/gdm_mux.c   | 41 +++++++++++++++++------------------
 drivers/staging/gdm724x/gdm_tty.c   |  8 ++++---
 drivers/staging/gdm724x/gdm_usb.c   | 43 ++++++++++++++++++++-----------------
 drivers/staging/gdm724x/netlink_k.c | 12 ++++++-----
 5 files changed, 73 insertions(+), 69 deletions(-)
drivers/staging/gdm724x/gdm_lte.c +18 -20
index 357474a..0c33634 100644
@@ -11,6 +11,8 @@
  * GNU General Public License for more details.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/version.h>
 #include <linux/etherdevice.h>
 #include <linux/ip.h>
@@ -103,7 +105,6 @@ static int gdm_lte_rx(struct sk_buff *skb, struct nic *nic, int nic_type)
 
 	ret = netif_rx_ni(skb);
 	if (ret == NET_RX_DROP) {
-		printk(KERN_ERR "glte: rx - dropped\n");
 		nic->stats.rx_dropped++;
 	} else {
 		nic->stats.rx_packets++;
@@ -416,7 +417,7 @@ static int gdm_lte_tx(struct sk_buff *skb, struct net_device *dev)
 
 	nic_type = gdm_lte_tx_nic_type(dev, skb);
 	if (nic_type == 0) {
-		printk(KERN_ERR "glte: tx - invalid nic_type\n");
+		netdev_err(dev, "tx - invalid nic_type\n");
 		return -1;
 	}
 
@@ -504,7 +505,7 @@ static void get_dev_endian(struct data_t *data, struct net_device *dev)
 
 	ret = copy_to_user(data->buf, gdm_dev_endian(nic), sizeof(struct dev_endian_t));
 	if (ret)
-		printk(KERN_INFO "glte: state - failed to copy\n");
+		netdev_info(dev, "state - failed to copy\n");
 }
 
 static int gdm_lte_ioctl_get_data(struct wm_req_t *req, struct net_device *dev)
@@ -517,7 +518,7 @@ static int gdm_lte_ioctl_get_data(struct wm_req_t *req, struct net_device *dev)
 		get_dev_endian(&req->data, dev);
 		break;
 	default:
-		printk(KERN_ERR "glte: ioctl - unknown type %d\n", id);
+		netdev_err(dev, "ioctl - unknown type %d\n", id);
 		break;
 	}
 	return 0;
@@ -562,7 +563,7 @@ int gdm_lte_event_init(void)
 		return 0;
 	}
 
-	printk(KERN_ERR "glte: event init failed\n");
+	pr_err("event init failed\n");
 	return -1;
 }
 
@@ -654,7 +655,7 @@ static void gdm_lte_netif_rx(struct net_device *dev, char *buf, int len, int fla
 			eth.h_proto = htons(ETH_P_IPV6);
 			vlan_eth.h_vlan_encapsulated_proto = htons(ETH_P_IPV6);
 		} else {
-			printk(KERN_ERR "glte: Unknown IP version %d\n", ip_version);
+			netdev_err(dev, "Unknown IP version %d\n", ip_version);
 			return;
 		}
 	}
@@ -700,11 +701,11 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len)
 		nic_type = gdm_dev32_to_cpu(phy_dev->get_endian(phy_dev->priv_dev), sdu->nic_type);
 
 		if (cmd_evt != LTE_RX_SDU) {
-			printk(KERN_ERR "glte: rx sdu wrong hci %04x\n", cmd_evt);
+			pr_err("rx sdu wrong hci %04x\n", cmd_evt);
 			return;
 		}
 		if (hci_len < 12) {
-			printk(KERN_ERR "glte: rx sdu invalid len %d\n", hci_len);
+			pr_err("rx sdu invalid len %d\n", hci_len);
 			return;
 		}
 
@@ -713,7 +714,7 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len)
 			dev = phy_dev->dev[index];
 			gdm_lte_netif_rx(dev, (char *)sdu->data, (int)(hci_len-12), nic_type);
 		} else {
-			printk(KERN_ERR "glte: rx sdu invalid nic_type : %x\n", nic_type);
+			pr_err("rx sdu invalid nic_type :%x\n", nic_type);
 		}
 
 		data += ((hci_len+3) & 0xfffc) + HCI_HEADER_SIZE;
@@ -730,12 +731,11 @@ static void gdm_lte_pdn_table(struct net_device *dev, char *buf, int len)
 		nic->pdn_table.dft_eps_id = gdm_dev32_to_cpu(gdm_dev_endian(nic), pdn_table->dft_eps_id);
 		nic->pdn_table.nic_type = gdm_dev32_to_cpu(gdm_dev_endian(nic), pdn_table->nic_type);
 
-		printk(KERN_INFO "glte: pdn %s activated, nic_type=0x%x\n",
-		       dev->name, nic->pdn_table.nic_type);
+		netdev_info(dev, "pdn activated, nic_type=0x%x\n",
+			    nic->pdn_table.nic_type);
 	} else {
 		memset(&nic->pdn_table, 0x00, sizeof(struct pdn_table));
-		printk(KERN_INFO "glte: pdn %s deactivated\n",
-		       dev->name);
+		netdev_info(dev, "pdn deactivated\n");
 	}
 }
 
@@ -771,11 +771,9 @@ static int gdm_lte_receive_pkt(struct phy_dev *phy_dev, char *buf, int len)
 		gdm_lte_multi_sdu_pkt(phy_dev, buf, len);
 		break;
 	case LTE_LINK_ON_OFF_INDICATION:
-		{
-			struct hci_connect_ind *connect_ind = (struct hci_connect_ind *)buf;
-			printk(KERN_INFO "glte: link %s\n",
-			       connect_ind->connect ? "on" : "off");
-		}
+		netdev_info(dev, "link %s\n",
+			    ((struct hci_connect_ind *)buf)->connect
+			    ? "on" : "off");
 		break;
 	case LTE_PDN_TABLE_IND:
 		pdn_table = (struct hci_pdn_table_ind *)buf;
@@ -841,7 +839,7 @@ static void validate_mac_address(u8 *mac_address)
 {
 	/* if zero address or multicast bit set, restore the default value */
 	if (is_zero_ether_addr(mac_address) || (mac_address[0] & 0x01)) {
-		printk(KERN_ERR "glte: MAC invalid, restoring default\n");
+		pr_err("MAC invalid, restoring default\n");
 		memcpy(mac_address, gdm_lte_macaddr, 6);
 	}
 }
@@ -863,7 +861,7 @@ int register_lte_device(struct phy_dev *phy_dev, struct device *dev, u8 *mac_add
 		/* Allocate netdev */
 		net = alloc_netdev(sizeof(struct nic), pdn_dev_name, ether_setup);
 		if (net == NULL) {
-			printk(KERN_ERR "glte: alloc_netdev failed\n");
+			pr_err("alloc_netdev failed\n");
 			ret = -ENOMEM;
 			goto err;
 		}
drivers/staging/gdm724x/gdm_mux.c +20 -21

141 lines not on this page · raw message

drivers/staging/gdm724x/gdm_tty.c +5 -3
index a19c14f..357daa8 100644
@@ -11,6 +11,8 @@
  * GNU General Public License for more details.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -76,7 +78,7 @@ static int gdm_tty_open(struct tty_struct *tty, struct file *filp)
 	}
 
 	if (!tty_str) {
-		printk(KERN_INFO "glte: no tty device\n");
+		pr_info("no tty device\n");
 		mutex_unlock(&open_mutex);
 		return -ENODEV;
 	}
@@ -100,7 +102,7 @@ static void gdm_tty_close(struct tty_struct *tty, struct file *filp)
 	int i;
 
 	if (!tty_str) {
-		printk(KERN_INFO "glte: tty device already close\n");
+		pr_info("tty device already closed\n");
 		return;
 	}
 
@@ -326,7 +328,7 @@ int register_lte_tty_driver(void)
 	for (i = 0; i < TTY_MAX_COUNT; i++) {
 		tty_driver = alloc_tty_driver(GDM_TTY_MINOR);
 		if (!tty_driver) {
-			printk(KERN_ERR "glte: alloc_tty_driver fail\n");
+			pr_err("alloc_tty_driver fail\n");
 			return -ENOMEM;
 		}
 
drivers/staging/gdm724x/gdm_usb.c +23 -20

163 lines not on this page · raw message

drivers/staging/gdm724x/netlink_k.c +7 -5
index 9819bf0..90004a7 100644
@@ -11,6 +11,8 @@
  * GNU General Public License for more details.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/version.h>
 #include <linux/export.h>
 #include <linux/etherdevice.h>
@@ -48,19 +50,19 @@ static void netlink_rcv_cb(struct sk_buff *skb)
 	int ifindex;
 
 	if (!rcv_cb) {
-		printk(KERN_ERR "glte: nl cb - unregistered\n");
+		pr_err("nl cb - unregistered\n");
 		return;
 	}
 
 	if (skb->len < NLMSG_SPACE(0)) {
-		printk(KERN_ERR "glte: nl cb - invalid skb length\n");
+		pr_err("nl cb - invalid skb length\n");
 		return;
 	}
 
 	nlh = (struct nlmsghdr *)skb->data;
 
 	if (skb->len < nlh->nlmsg_len || nlh->nlmsg_len > ND_MAX_MSG_LEN) {
-		printk(KERN_ERR "glte: nl cb - invalid length (%d,%d)\n",
+		pr_err("nl cb - invalid length (%d,%d)\n",
 		       skb->len, nlh->nlmsg_len);
 		return;
 	}
@@ -74,7 +76,7 @@ static void netlink_rcv_cb(struct sk_buff *skb)
 		rcv_cb(dev, nlh->nlmsg_type, msg, mlen);
 		dev_put(dev);
 	} else {
-		printk(KERN_ERR "glte: nl cb - dev (%d) not found\n", ifindex);
+		pr_err("nl cb - dev (%d) not found\n", ifindex);
 	}
 }
 
@@ -152,7 +154,7 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 		return len;
 
 	if (ret != -ESRCH)
-		printk(KERN_ERR "glte: nl broadcast g=%d, t=%d, l=%d, r=%d\n",
+		pr_err("nl broadcast g=%d, t=%d, l=%d, r=%d\n",
 		       group, type, len, ret);
 	else if (netlink_has_listeners(sock, group+1))
 		return -EAGAIN;