Skip to content

Commit

Permalink
nfc: fdp: drop ftrace-like debugging messages
Browse files Browse the repository at this point in the history
Now that the kernel has ftrace, any debugging calls that just do "made
it to this function!" and "leaving this function!" can be removed.
Better to use standard debugging tools.

This allows also to remove several local variables and entire
fdp_nci_recv_frame() function (whose purpose was only to log).

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Link: https://lore.kernel.org/r/20210531073522.6720-1-krzysztof.kozlowski@canonical.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Krzysztof Kozlowski authored and Jakub Kicinski committed Jun 1, 2021
1 parent a729b8e commit 9571289
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 43 deletions.
31 changes: 0 additions & 31 deletions drivers/nfc/fdp/fdp.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,45 +237,25 @@ static int fdp_nci_send_patch(struct nci_dev *ndev, u8 conn_id, u8 type)
static int fdp_nci_open(struct nci_dev *ndev)
{
struct fdp_nci_info *info = nci_get_drvdata(ndev);
struct device *dev = &info->phy->i2c_dev->dev;

dev_dbg(dev, "%s\n", __func__);

return info->phy_ops->enable(info->phy);
}

static int fdp_nci_close(struct nci_dev *ndev)
{
struct fdp_nci_info *info = nci_get_drvdata(ndev);
struct device *dev = &info->phy->i2c_dev->dev;

dev_dbg(dev, "%s\n", __func__);
return 0;
}

static int fdp_nci_send(struct nci_dev *ndev, struct sk_buff *skb)
{
struct fdp_nci_info *info = nci_get_drvdata(ndev);
struct device *dev = &info->phy->i2c_dev->dev;

dev_dbg(dev, "%s\n", __func__);

if (atomic_dec_and_test(&info->data_pkt_counter))
info->data_pkt_counter_cb(ndev);

return info->phy_ops->write(info->phy, skb);
}

int fdp_nci_recv_frame(struct nci_dev *ndev, struct sk_buff *skb)
{
struct fdp_nci_info *info = nci_get_drvdata(ndev);
struct device *dev = &info->phy->i2c_dev->dev;

dev_dbg(dev, "%s\n", __func__);
return nci_recv_frame(ndev, skb);
}
EXPORT_SYMBOL(fdp_nci_recv_frame);

static int fdp_nci_request_firmware(struct nci_dev *ndev)
{
struct fdp_nci_info *info = nci_get_drvdata(ndev);
Expand Down Expand Up @@ -476,8 +456,6 @@ static int fdp_nci_setup(struct nci_dev *ndev)
int r;
u8 patched = 0;

dev_dbg(dev, "%s\n", __func__);

r = nci_core_init(ndev);
if (r)
goto error;
Expand Down Expand Up @@ -585,9 +563,7 @@ static int fdp_nci_core_reset_ntf_packet(struct nci_dev *ndev,
struct sk_buff *skb)
{
struct fdp_nci_info *info = nci_get_drvdata(ndev);
struct device *dev = &info->phy->i2c_dev->dev;

dev_dbg(dev, "%s\n", __func__);
info->setup_reset_ntf = 1;
wake_up(&info->setup_wq);

Expand All @@ -598,9 +574,7 @@ static int fdp_nci_prop_patch_ntf_packet(struct nci_dev *ndev,
struct sk_buff *skb)
{
struct fdp_nci_info *info = nci_get_drvdata(ndev);
struct device *dev = &info->phy->i2c_dev->dev;

dev_dbg(dev, "%s\n", __func__);
info->setup_patch_ntf = 1;
info->setup_patch_status = skb->data[0];
wake_up(&info->setup_wq);
Expand Down Expand Up @@ -773,11 +747,6 @@ EXPORT_SYMBOL(fdp_nci_probe);

void fdp_nci_remove(struct nci_dev *ndev)
{
struct fdp_nci_info *info = nci_get_drvdata(ndev);
struct device *dev = &info->phy->i2c_dev->dev;

dev_dbg(dev, "%s\n", __func__);

nci_unregister_device(ndev);
nci_free_device(ndev);
}
Expand Down
1 change: 0 additions & 1 deletion drivers/nfc/fdp/fdp.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,5 @@ int fdp_nci_probe(struct fdp_i2c_phy *phy, struct nfc_phy_ops *phy_ops,
struct nci_dev **ndev, int tx_headroom, int tx_tailroom,
u8 clock_type, u32 clock_freq, u8 *fw_vsc_cfg);
void fdp_nci_remove(struct nci_dev *ndev);
int fdp_nci_recv_frame(struct nci_dev *ndev, struct sk_buff *skb);

#endif /* __LOCAL_FDP_H_ */
12 changes: 1 addition & 11 deletions drivers/nfc/fdp/i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ static int fdp_nci_i2c_enable(void *phy_id)
{
struct fdp_i2c_phy *phy = phy_id;

dev_dbg(&phy->i2c_dev->dev, "%s\n", __func__);
fdp_nci_i2c_reset(phy);

return 0;
Expand All @@ -59,7 +58,6 @@ static void fdp_nci_i2c_disable(void *phy_id)
{
struct fdp_i2c_phy *phy = phy_id;

dev_dbg(&phy->i2c_dev->dev, "%s\n", __func__);
fdp_nci_i2c_reset(phy);
}

Expand Down Expand Up @@ -197,7 +195,6 @@ static int fdp_nci_i2c_read(struct fdp_i2c_phy *phy, struct sk_buff **skb)
static irqreturn_t fdp_nci_i2c_irq_thread_fn(int irq, void *phy_id)
{
struct fdp_i2c_phy *phy = phy_id;
struct i2c_client *client;
struct sk_buff *skb;
int r;

Expand All @@ -206,9 +203,6 @@ static irqreturn_t fdp_nci_i2c_irq_thread_fn(int irq, void *phy_id)
return IRQ_NONE;
}

client = phy->i2c_dev;
dev_dbg(&client->dev, "%s\n", __func__);

r = fdp_nci_i2c_read(phy, &skb);

if (r == -EREMOTEIO)
Expand All @@ -217,7 +211,7 @@ static irqreturn_t fdp_nci_i2c_irq_thread_fn(int irq, void *phy_id)
return IRQ_HANDLED;

if (skb != NULL)
fdp_nci_recv_frame(phy->ndev, skb);
nci_recv_frame(phy->ndev, skb);

return IRQ_HANDLED;
}
Expand Down Expand Up @@ -288,8 +282,6 @@ static int fdp_nci_i2c_probe(struct i2c_client *client)
u32 clock_freq;
int r = 0;

dev_dbg(dev, "%s\n", __func__);

if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
nfc_err(dev, "No I2C_FUNC_I2C support\n");
return -ENODEV;
Expand Down Expand Up @@ -351,8 +343,6 @@ static int fdp_nci_i2c_remove(struct i2c_client *client)
{
struct fdp_i2c_phy *phy = i2c_get_clientdata(client);

dev_dbg(&client->dev, "%s\n", __func__);

fdp_nci_remove(phy->ndev);
fdp_nci_i2c_disable(phy);

Expand Down

0 comments on commit 9571289

Please sign in to comment.