Commit b6b0012c authored by Quentin Lambert's avatar Quentin Lambert Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Remove unnecessary OOM message 

This patch reduces the kernel size by removing error messages that duplicate
the normal OOM message.

A simplified version of the semantic patch that finds this problem is as
follows: (http://coccinelle.lip6.fr

)

@@
identifier f,print,l;
expression e;
constant char[] c;
@@

e = \(kzalloc\|kmalloc\|devm_kzalloc\|devm_kmalloc\)(...);
if (e == NULL) {
  <+...
-  print(...,c,...);
  ... when any
(
  goto l;
|
  return ...;
)
  ...+> }

Signed-off-by: default avatarQuentin Lambert <lambert.quentin@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d08c028c

drivers/staging/rtl8192e/rtllib_module.c

+3 −7
Original line number Diff line number Diff line
@@ -72,11 +72,8 @@ static inline int rtllib_networks_allocate(struct rtllib_device *ieee) 
	ieee->networks = kzalloc(

		MAX_NETWORK_COUNT * sizeof(struct rtllib_network),

		GFP_KERNEL);

	if (!ieee->networks) {

		printk(KERN_WARNING "%s: Out of memory allocating beacons\n",

		       ieee->dev->name);

	if (!ieee->networks)

		return -ENOMEM;

	}



	return 0;

}
@@ -161,10 +158,9 @@ struct net_device *alloc_rtllib(int sizeof_priv) 
	rtllib_softmac_init(ieee);



	ieee->pHTInfo = kzalloc(sizeof(struct rt_hi_throughput), GFP_KERNEL);

	if (ieee->pHTInfo == NULL) {

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't alloc memory for HTInfo\n");

	if (ieee->pHTInfo == NULL)

		return NULL;

	}



	HTUpdateDefaultSetting(ieee);

	HTInitializeHTInfo(ieee);

	TSInitialize(ieee);

drivers/staging/rtl8192e/rtllib_rx.c

+4 −7
Original line number Diff line number Diff line
@@ -394,10 +394,9 @@ static int is_duplicate_packet(struct rtllib_device *ieee, 
		}

		if (p == &ieee->ibss_mac_hash[index]) {

			entry = kmalloc(sizeof(struct ieee_ibss_seq), GFP_ATOMIC);

			if (!entry) {

				printk(KERN_WARNING "Cannot malloc new mac entry\n");

			if (!entry)

				return 0;

			}



			memcpy(entry->mac, mac, ETH_ALEN);

			entry->seq_num[tid] = seq;

			entry->frag_num[tid] = frag;
@@ -1345,11 +1344,9 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, 
	/* skb: hdr + (possible reassembled) full plaintext payload */

	payload = skb->data + hdrlen;

	rxb = kmalloc(sizeof(struct rtllib_rxb), GFP_ATOMIC);

	if (rxb == NULL) {

		RTLLIB_DEBUG(RTLLIB_DL_ERR,

			     "%s(): kmalloc rxb error\n", __func__);

	if (rxb == NULL)

		goto rx_dropped;

	}



	/* to parse amsdu packets */

	/* qos data packets & reserved bit is 1 */

	if (parse_subframe(ieee, skb, rx_stats, rxb, src, dst) == 0) {