pwm: make PWM_POLARITY_INVERTED flag optional

[karo-tx-linux.git] / drivers / nfc / nfcwilink.c

diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
index ec9dbf4fad83a02a9c6bb108011a5eaa33ba27ef..71308645593f638a2879df4348f1349f0e031ce4 100644 (file)
--- a/drivers/nfc/nfcwilink.c
+++ b/drivers/nfc/nfcwilink.c
@@ -149,8 +149,8 @@ static int nfcwilink_get_bts_file_name(struct nfcwilink *drv, char *file_name)
        skb = nfcwilink_skb_alloc(sizeof(struct nci_vs_nfcc_info_cmd),
                                        GFP_KERNEL);
        if (!skb) {
-               nfc_dev_err(&drv->pdev->dev,
-                               "no memory for nci_vs_nfcc_info_cmd");
+               nfc_err(&drv->pdev->dev,
+                       "no memory for nci_vs_nfcc_info_cmd\n");
                return -ENOMEM;
        }
 
@@ -171,7 +171,7 @@ static int nfcwilink_get_bts_file_name(struct nfcwilink *drv, char *file_name)
        dev_dbg(&drv->pdev->dev, "wait_for_completion_timeout returned %ld\n",
                comp_ret);
        if (comp_ret == 0) {
-               dev_err(&drv->pdev->dev,
+               nfc_err(&drv->pdev->dev,
                        "timeout on wait_for_completion_timeout\n");
                return -ETIMEDOUT;
        }
@@ -180,8 +180,7 @@ static int nfcwilink_get_bts_file_name(struct nfcwilink *drv, char *file_name)
                drv->nfcc_info.plen, drv->nfcc_info.status);
 
        if ((drv->nfcc_info.plen != 5) || (drv->nfcc_info.status != 0)) {
-               nfc_dev_err(&drv->pdev->dev,
-                               "invalid nci_vs_nfcc_info_rsp");
+               nfc_err(&drv->pdev->dev, "invalid nci_vs_nfcc_info_rsp\n");
                return -EINVAL;
        }
 
@@ -192,7 +191,7 @@ static int nfcwilink_get_bts_file_name(struct nfcwilink *drv, char *file_name)
                        drv->nfcc_info.sw_ver_z,
                        drv->nfcc_info.patch_id);
 
-       nfc_dev_info(&drv->pdev->dev, "nfcwilink FW file name: %s", file_name);
+       nfc_info(&drv->pdev->dev, "nfcwilink FW file name: %s\n", file_name);
 
        return 0;
 }
@@ -209,8 +208,8 @@ static int nfcwilink_send_bts_cmd(struct nfcwilink *drv, __u8 *data, int len)
                (len > BTS_FILE_CMD_MAX_LEN) ||
                (hdr->chnl != NFCWILINK_CHNL) ||
                (hdr->opcode != NFCWILINK_OPCODE)) {
-               nfc_dev_err(&drv->pdev->dev,
-                       "ignoring invalid bts cmd, len %d, chnl %d, opcode %d",
+               nfc_err(&drv->pdev->dev,
+                       "ignoring invalid bts cmd, len %d, chnl %d, opcode %d\n",
                        len, hdr->chnl, hdr->opcode);
                return 0;
        }
@@ -221,7 +220,7 @@ static int nfcwilink_send_bts_cmd(struct nfcwilink *drv, __u8 *data, int len)
 
        skb = nfcwilink_skb_alloc(len, GFP_KERNEL);
        if (!skb) {
-               nfc_dev_err(&drv->pdev->dev, "no memory for bts cmd");
+               nfc_err(&drv->pdev->dev, "no memory for bts cmd\n");
                return -ENOMEM;
        }
 
@@ -236,8 +235,8 @@ static int nfcwilink_send_bts_cmd(struct nfcwilink *drv, __u8 *data, int len)
        dev_dbg(&drv->pdev->dev, "wait_for_completion_timeout returned %ld\n",
                comp_ret);
        if (comp_ret == 0) {
-               nfc_dev_err(&drv->pdev->dev,
-                               "timeout on wait_for_completion_timeout");
+               nfc_err(&drv->pdev->dev,
+                       "timeout on wait_for_completion_timeout\n");
                return -ETIMEDOUT;
        }
 
@@ -260,7 +259,7 @@ static int nfcwilink_download_fw(struct nfcwilink *drv)
 
        rc = request_firmware(&fw, file_name, &drv->pdev->dev);
        if (rc) {
-               nfc_dev_err(&drv->pdev->dev, "request_firmware failed %d", rc);
+               nfc_err(&drv->pdev->dev, "request_firmware failed %d\n", rc);
 
                /* if the file is not found, don't exit with failure */
                if (rc == -ENOENT)
@@ -280,7 +279,7 @@ static int nfcwilink_download_fw(struct nfcwilink *drv)
 
        if (__le32_to_cpu(((struct bts_file_hdr *)ptr)->magic) !=
                        BTS_FILE_HDR_MAGIC) {
-               nfc_dev_err(&drv->pdev->dev, "wrong bts magic number");
+               nfc_err(&drv->pdev->dev, "wrong bts magic number\n");
                rc = -EINVAL;
                goto release_fw;
        }
@@ -361,7 +360,7 @@ static long nfcwilink_receive(void *priv_data, struct sk_buff *skb)
        /* Forward skb to NCI core layer */
        rc = nci_recv_frame(drv->ndev, skb);
        if (rc < 0) {
-               nfc_dev_err(&drv->pdev->dev, "nci_recv_frame failed %d", rc);
+               nfc_err(&drv->pdev->dev, "nci_recv_frame failed %d\n", rc);
                return rc;
        }
 
@@ -414,13 +413,12 @@ static int nfcwilink_open(struct nci_dev *ndev)
                                goto clear_exit;
                        } else if (drv->st_register_cb_status != 0) {
                                rc = drv->st_register_cb_status;
-                               nfc_dev_err(&drv->pdev->dev,
-                               "st_register_cb failed %d", rc);
+                               nfc_err(&drv->pdev->dev,
+                                       "st_register_cb failed %d\n", rc);
                                goto clear_exit;
                        }
                } else {
-                       nfc_dev_err(&drv->pdev->dev,
-                               "st_register failed %d", rc);
+                       nfc_err(&drv->pdev->dev, "st_register failed %d\n", rc);
                        goto clear_exit;
                }
        }
@@ -430,8 +428,8 @@ static int nfcwilink_open(struct nci_dev *ndev)
        drv->st_write = nfcwilink_proto.write;
 
        if (nfcwilink_download_fw(drv)) {
-               nfc_dev_err(&drv->pdev->dev, "nfcwilink_download_fw failed %d",
-                               rc);
+               nfc_err(&drv->pdev->dev, "nfcwilink_download_fw failed %d\n",
+                       rc);
                /* open should succeed, even if the FW download failed */
        }
 
@@ -454,7 +452,7 @@ static int nfcwilink_close(struct nci_dev *ndev)
 
        rc = st_unregister(&nfcwilink_proto);
        if (rc)
-               nfc_dev_err(&drv->pdev->dev, "st_unregister failed %d", rc);
+               nfc_err(&drv->pdev->dev, "st_unregister failed %d\n", rc);
 
        drv->st_write = NULL;
 
@@ -485,7 +483,7 @@ static int nfcwilink_send(struct nci_dev *ndev, struct sk_buff *skb)
        len = drv->st_write(skb);
        if (len < 0) {
                kfree_skb(skb);
-               nfc_dev_err(&drv->pdev->dev, "st_write failed %ld", len);
+               nfc_err(&drv->pdev->dev, "st_write failed %ld\n", len);
                return -EFAULT;
        }
 
@@ -523,7 +521,7 @@ static int nfcwilink_probe(struct platform_device *pdev)
                                        NFCWILINK_HDR_LEN,
                                        0);
        if (!drv->ndev) {
-               nfc_dev_err(&pdev->dev, "nci_allocate_device failed");
+               nfc_err(&pdev->dev, "nci_allocate_device failed\n");
                rc = -ENOMEM;
                goto exit;
        }
@@ -533,7 +531,7 @@ static int nfcwilink_probe(struct platform_device *pdev)
 
        rc = nci_register_device(drv->ndev);
        if (rc < 0) {
-               nfc_dev_err(&pdev->dev, "nci_register_device failed %d", rc);
+               nfc_err(&pdev->dev, "nci_register_device failed %d\n", rc);
                goto free_dev_exit;
        }
 
@@ -561,8 +559,6 @@ static int nfcwilink_remove(struct platform_device *pdev)
        nci_unregister_device(ndev);
        nci_free_device(ndev);
 
-       dev_set_drvdata(&pdev->dev, NULL);
-
        return 0;
 }