Merge branch 'x86/microcode' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[firefly-linux-kernel-4.4.55.git] / drivers / nfc / pn533.c

diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index 31a5b3b53b2a0280d4090ba5a186642b1678fb00..f0f6763d67aefcf73dc7b87e118ebb42bef649f6 100644 (file)
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -219,7 +219,7 @@ struct pn533_poll_modulations {
        u8 len;
 };
 
-const struct pn533_poll_modulations poll_mod[] = {
+static const struct pn533_poll_modulations poll_mod[] = {
        [PN533_POLL_MOD_106KBPS_A] = {
                .data = {
                        .maxtg = 1,
@@ -485,7 +485,7 @@ static u8 pn533_get_cmd_code(void *frame)
        return PN533_FRAME_CMD(f);
 }
 
-struct pn533_frame_ops pn533_std_frame_ops = {
+static struct pn533_frame_ops pn533_std_frame_ops = {
        .tx_frame_init = pn533_tx_frame_init,
        .tx_frame_finish = pn533_tx_frame_finish,
        .tx_update_payload_len = pn533_tx_update_payload_len,
@@ -532,7 +532,6 @@ static void pn533_recv_response(struct urb *urb)
                            urb->status);
                dev->wq_in_error = urb->status;
                goto sched_wq;
-               break;
        case -ESHUTDOWN:
        default:
                nfc_dev_err(&dev->interface->dev,
@@ -589,7 +588,6 @@ static void pn533_recv_ack(struct urb *urb)
                            urb->status);
                dev->wq_in_error = urb->status;
                goto sched_wq;
-               break;
        case -ESHUTDOWN:
        default:
                nfc_dev_err(&dev->interface->dev,
@@ -743,7 +741,7 @@ static int __pn533_send_async(struct pn533 *dev, u8 cmd_code,
 
        nfc_dev_dbg(&dev->interface->dev, "Sending command 0x%x", cmd_code);
 
-       arg = kzalloc(sizeof(arg), GFP_KERNEL);
+       arg = kzalloc(sizeof(*arg), GFP_KERNEL);
        if (!arg)
                return -ENOMEM;
 
@@ -863,7 +861,7 @@ static int pn533_send_cmd_direct_async(struct pn533 *dev, u8 cmd_code,
        if (!resp)
                return -ENOMEM;
 
-       arg = kzalloc(sizeof(arg), GFP_KERNEL);
+       arg = kzalloc(sizeof(*arg), GFP_KERNEL);
        if (!arg) {
                dev_kfree_skb(resp);
                return -ENOMEM;
@@ -1380,7 +1378,7 @@ static struct sk_buff *pn533_alloc_poll_tg_frame(struct pn533 *dev)
                return NULL;
 
        /* DEP support only */
-       *skb_put(skb, 1) |= PN533_INIT_TARGET_DEP;
+       *skb_put(skb, 1) = PN533_INIT_TARGET_DEP;
 
        /* MIFARE params */
        memcpy(skb_put(skb, 6), mifare_params, 6);
@@ -1724,9 +1722,10 @@ static int pn533_activate_target_nfcdep(struct pn533 *dev)
 
        rsp = (struct pn533_cmd_activate_response *)resp->data;
        rc = rsp->status & PN533_CMD_RET_MASK;
-       if (rc != PN533_CMD_RET_SUCCESS)
+       if (rc != PN533_CMD_RET_SUCCESS) {
                dev_kfree_skb(resp);
                return -EIO;
+       }
 
        /* ATR_RES general bytes are located at offset 16 */
        gt_len = resp->len - 16;