libertas: Remove function entry/exit debugging

[karo-tx-linux.git] / drivers / net / wireless / marvell / libertas / if_spi.c

diff --git a/drivers/net/wireless/marvell/libertas/if_spi.c b/drivers/net/wireless/marvell/libertas/if_spi.c
index 7b4955cc38db3d9b19376d0fde19c1ada14139f9..e9aec6cb110546521e46836085114f07605e7cfe 100644 (file)
--- a/drivers/net/wireless/marvell/libertas/if_spi.c
+++ b/drivers/net/wireless/marvell/libertas/if_spi.c
@@ -466,8 +466,6 @@ static int if_spi_prog_helper_firmware(struct if_spi_card *card,
        const u8 *fw;
        u8 temp[HELPER_FW_LOAD_CHUNK_SZ];
 
-       lbs_deb_enter(LBS_DEB_SPI);
-
        err = spu_set_interrupt_mode(card, 1, 0);
        if (err)
                goto out;
@@ -533,7 +531,7 @@ static int if_spi_prog_helper_firmware(struct if_spi_card *card,
 out:
        if (err)
                pr_err("failed to load helper firmware (err=%d)\n", err);
-       lbs_deb_leave_args(LBS_DEB_SPI, "err %d", err);
+
        return err;
 }
 
@@ -588,8 +586,6 @@ static int if_spi_prog_main_firmware(struct if_spi_card *card,
        const u8 *fw;
        u16 num_crc_errs;
 
-       lbs_deb_enter(LBS_DEB_SPI);
-
        err = spu_set_interrupt_mode(card, 1, 0);
        if (err)
                goto out;
@@ -666,7 +662,7 @@ static int if_spi_prog_main_firmware(struct if_spi_card *card,
 out:
        if (err)
                pr_err("failed to load firmware (err=%d)\n", err);
-       lbs_deb_leave_args(LBS_DEB_SPI, "err %d", err);
+
        return err;
 }
 
@@ -699,8 +695,6 @@ static int if_spi_c2h_cmd(struct if_spi_card *card)
         */
        BUILD_BUG_ON(IF_SPI_CMD_BUF_SIZE % 4 != 0);
 
-       lbs_deb_enter(LBS_DEB_SPI);
-
        /* How many bytes are there to read? */
        err = spu_read_u16(card, IF_SPI_SCRATCH_2_REG, &len);
        if (err)
@@ -735,7 +729,7 @@ static int if_spi_c2h_cmd(struct if_spi_card *card)
 out:
        if (err)
                netdev_err(priv->dev, "%s: err=%d\n", __func__, err);
-       lbs_deb_leave(LBS_DEB_SPI);
+
        return err;
 }
 
@@ -748,8 +742,6 @@ static int if_spi_c2h_data(struct if_spi_card *card)
        u16 len;
        int err = 0;
 
-       lbs_deb_enter(LBS_DEB_SPI);
-
        /* How many bytes are there to read? */
        err = spu_read_u16(card, IF_SPI_SCRATCH_1_REG, &len);
        if (err)
@@ -794,7 +786,7 @@ free_skb:
 out:
        if (err)
                netdev_err(priv->dev, "%s: err=%d\n", __func__, err);
-       lbs_deb_leave(LBS_DEB_SPI);
+
        return err;
 }
 
@@ -870,8 +862,6 @@ static void if_spi_host_to_card_worker(struct work_struct *work)
        card = container_of(work, struct if_spi_card, packet_work);
        priv = card->priv;
 
-       lbs_deb_enter(LBS_DEB_SPI);
-
        /*
         * Read the host interrupt status register to see what we
         * can do.
@@ -943,8 +933,6 @@ static void if_spi_host_to_card_worker(struct work_struct *work)
 err:
        if (err)
                netdev_err(priv->dev, "%s: got error %d\n", __func__, err);
-
-       lbs_deb_leave(LBS_DEB_SPI);
 }
 
 /*
@@ -962,8 +950,6 @@ static int if_spi_host_to_card(struct lbs_private *priv,
        struct if_spi_packet *packet;
        u16 blen;
 
-       lbs_deb_enter_args(LBS_DEB_SPI, "type %d, bytes %d", type, nb);
-
        if (nb == 0) {
                netdev_err(priv->dev, "%s: invalid size requested: %d\n",
                           __func__, nb);
@@ -1004,7 +990,6 @@ static int if_spi_host_to_card(struct lbs_private *priv,
        /* Queue spi xfer work */
        queue_work(card->workqueue, &card->packet_work);
 out:
-       lbs_deb_leave_args(LBS_DEB_SPI, "err=%d", err);
        return err;
 }
 
@@ -1035,8 +1020,6 @@ static int if_spi_init_card(struct if_spi_card *card)
        const struct firmware *helper = NULL;
        const struct firmware *mainfw = NULL;
 
-       lbs_deb_enter(LBS_DEB_SPI);
-
        err = spu_init(card, card->pdata->use_dummy_writes);
        if (err)
                goto out;
@@ -1093,7 +1076,6 @@ static int if_spi_init_card(struct if_spi_card *card)
                goto out;
 
 out:
-       lbs_deb_leave_args(LBS_DEB_SPI, "err %d\n", err);
        return err;
 }
 
@@ -1126,8 +1108,6 @@ static int if_spi_probe(struct spi_device *spi)
        struct libertas_spi_platform_data *pdata = dev_get_platdata(&spi->dev);
        int err = 0;
 
-       lbs_deb_enter(LBS_DEB_SPI);
-
        if (!pdata) {
                err = -EINVAL;
                goto out;
@@ -1221,7 +1201,6 @@ teardown:
        if (pdata->teardown)
                pdata->teardown(spi);
 out:
-       lbs_deb_leave_args(LBS_DEB_SPI, "err %d\n", err);
        return err;
 }
 
@@ -1231,7 +1210,6 @@ static int libertas_spi_remove(struct spi_device *spi)
        struct lbs_private *priv = card->priv;
 
        lbs_deb_spi("libertas_spi_remove\n");
-       lbs_deb_enter(LBS_DEB_SPI);
 
        cancel_work_sync(&card->resume_work);
 
@@ -1243,7 +1221,7 @@ static int libertas_spi_remove(struct spi_device *spi)
        if (card->pdata->teardown)
                card->pdata->teardown(spi);
        free_if_spi_card(card);
-       lbs_deb_leave(LBS_DEB_SPI);
+
        return 0;
 }
 
@@ -1297,18 +1275,16 @@ static struct spi_driver libertas_spi_driver = {
 static int __init if_spi_init_module(void)
 {
        int ret = 0;
-       lbs_deb_enter(LBS_DEB_SPI);
+
        printk(KERN_INFO "libertas_spi: Libertas SPI driver\n");
        ret = spi_register_driver(&libertas_spi_driver);
-       lbs_deb_leave(LBS_DEB_SPI);
+
        return ret;
 }
 
 static void __exit if_spi_exit_module(void)
 {
-       lbs_deb_enter(LBS_DEB_SPI);
        spi_unregister_driver(&libertas_spi_driver);
-       lbs_deb_leave(LBS_DEB_SPI);
 }
 
 module_init(if_spi_init_module);