[PATCH net-next] nfc: st21nfca: Drop unneeded null check in st21nfca_tx_work()

Krzysztof Kozlowski posted 1 patch 1 year, 1 month ago
drivers/nfc/st21nfca/dep.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
[PATCH net-next] nfc: st21nfca: Drop unneeded null check in st21nfca_tx_work()
Posted by Krzysztof Kozlowski 1 year, 1 month ago
Variable 'info' is obtained via container_of() of struct work_struct, so
it cannot be NULL.  Simplify the code and solve Smatch warning:

  drivers/nfc/st21nfca/dep.c:119 st21nfca_tx_work() warn: can 'info' even be NULL?

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 drivers/nfc/st21nfca/dep.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/nfc/st21nfca/dep.c b/drivers/nfc/st21nfca/dep.c
index 1ec651e31064..3425b68f0ddc 100644
--- a/drivers/nfc/st21nfca/dep.c
+++ b/drivers/nfc/st21nfca/dep.c
@@ -116,18 +116,16 @@ static void st21nfca_tx_work(struct work_struct *work)
 	struct nfc_dev *dev;
 	struct sk_buff *skb;
 
-	if (info) {
-		dev = info->hdev->ndev;
-		skb = info->dep_info.tx_pending;
+	dev = info->hdev->ndev;
+	skb = info->dep_info.tx_pending;
 
-		device_lock(&dev->dev);
+	device_lock(&dev->dev);
 
-		nfc_hci_send_cmd_async(info->hdev, ST21NFCA_RF_READER_F_GATE,
-				ST21NFCA_WR_XCHG_DATA, skb->data, skb->len,
-				info->async_cb, info);
-		device_unlock(&dev->dev);
-		kfree_skb(skb);
-	}
+	nfc_hci_send_cmd_async(info->hdev, ST21NFCA_RF_READER_F_GATE,
+			ST21NFCA_WR_XCHG_DATA, skb->data, skb->len,
+			info->async_cb, info);
+	device_unlock(&dev->dev);
+	kfree_skb(skb);
 }
 
 static void st21nfca_im_send_pdu(struct st21nfca_hci_info *info,
-- 
2.43.0
Re: [PATCH net-next] nfc: st21nfca: Drop unneeded null check in st21nfca_tx_work()
Posted by Simon Horman 1 year, 1 month ago
On Sat, Jan 04, 2025 at 03:20:43PM +0100, Krzysztof Kozlowski wrote:
> Variable 'info' is obtained via container_of() of struct work_struct, so
> it cannot be NULL.  Simplify the code and solve Smatch warning:
> 
>   drivers/nfc/st21nfca/dep.c:119 st21nfca_tx_work() warn: can 'info' even be NULL?
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Reviewed-by: Simon Horman <horms@kernel.org>