Commit 08c53aee authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'nfc-printk-cleanup' 



Krzysztof Kozlowski says:

====================
nfc: minor printk cleanup

Changes since v1:
1. Remove unused variable in pn533 (reported by kbuild).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9eb4c320 d1c624eb

drivers/nfc/fdp/i2c.c

+0 −1
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ static int fdp_nci_i2c_probe(struct i2c_client *client) 
		return r;

	}



	dev_dbg(dev, "I2C driver loaded\n");

	return 0;

}

drivers/nfc/microread/mei.c

+1 −3
Original line number Diff line number Diff line
@@ -26,10 +26,8 @@ static int microread_mei_probe(struct mei_cl_device *cldev, 
	pr_info("Probing NFC microread\n");



	phy = nfc_mei_phy_alloc(cldev);

	if (!phy) {

		pr_err("Cannot allocate memory for microread mei phy.\n");

	if (!phy)

		return -ENOMEM;

	}



	r = microread_probe(phy, &mei_phy_ops, LLC_NOP_NAME,

			    MEI_NFC_HEADER_SIZE, 0, MEI_NFC_MAX_HCI_PAYLOAD,

drivers/nfc/nfcmrvl/fw_dnld.c

+1 −3
Original line number Diff line number Diff line
@@ -76,10 +76,8 @@ static struct sk_buff *alloc_lc_skb(struct nfcmrvl_private *priv, uint8_t plen) 
	struct nci_data_hdr *hdr;



	skb = nci_skb_alloc(priv->ndev, (NCI_DATA_HDR_SIZE + plen), GFP_KERNEL);

	if (!skb) {

		pr_err("no memory for data\n");

	if (!skb)

		return NULL;

	}



	hdr = skb_put(skb, NCI_DATA_HDR_SIZE);

	hdr->conn_id = NCI_CORE_LC_CONNID_PROP_FW_DL;

drivers/nfc/pn533/i2c.c

+0 −4
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ static int pn533_i2c_read(struct pn533_i2c_phy *phy, struct sk_buff **skb) 
static irqreturn_t pn533_i2c_irq_thread_fn(int irq, void *data)

{

	struct pn533_i2c_phy *phy = data;

	struct i2c_client *client;

	struct sk_buff *skb = NULL;

	int r;
@@ -137,9 +136,6 @@ static irqreturn_t pn533_i2c_irq_thread_fn(int irq, void *data) 
		return IRQ_NONE;

	}



	client = phy->i2c_dev;

	dev_dbg(&client->dev, "IRQ\n");



	if (phy->hard_fault != 0)

		return IRQ_HANDLED;

drivers/nfc/pn533/pn533.c

+1 −3
Original line number Diff line number Diff line
@@ -1235,8 +1235,6 @@ static void pn533_listen_mode_timer(struct timer_list *t) 
{

	struct pn533 *dev = from_timer(dev, t, listen_timer);



	dev_dbg(dev->dev, "Listen mode timeout\n");



	dev->cancel_listen = 1;



	pn533_poll_next_mod(dev);
@@ -2173,7 +2171,7 @@ void pn533_recv_frame(struct pn533 *dev, struct sk_buff *skb, int status) 
	}



	if (skb == NULL) {

		pr_err("NULL Frame -> link is dead\n");

		dev_err(dev->dev, "NULL Frame -> link is dead\n");

		goto sched_wq;

	}