leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfc: pn533: remove redundant assignment

Browse Source 
In many places,first assign a value to a variable and then return
the variable. which is redundant, we should directly return the value.
in pn533_rf_field funciton,return rc also in the if statement, so we
use return 0 to replace the last return rc.

Signed-off-by: wengjianfeng <wengjianfeng@yulong.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
wengjianfeng 2021-04-12 10:20:06 +08:00 committed by David S. Miller
parent 5711ffd313
commit a115d24a63
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/nfc/pn533/i2c.c
View File

@ -40,11 +40,8 @@ static int pn533_i2c_send_ack(struct pn533 *dev, gfp_t flags)
struct i2c_client *client = phy->i2c_dev;
static const u8 ack[6] = {0x00, 0x00, 0xff, 0x00, 0xff, 0x00};
/* spec 6.2.1.3: Preamble, SoPC (2), ACK Code (2), Postamble */
int rc;
rc = i2c_master_send(client, ack, 6);
return rc;
return i2c_master_send(client, ack, 6);
}
static int pn533_i2c_send_frame(struct pn533 *dev,
@ -199,8 +196,7 @@ static int pn533_i2c_probe(struct i2c_client *client,
&phy->i2c_dev->dev);
if (IS_ERR(priv)) {
r = PTR_ERR(priv);
return r;
return PTR_ERR(priv);
}
phy->priv = priv;

17
drivers/nfc/pn533/pn533.c
View File

@ -489,12 +489,8 @@ static int pn533_send_data_async(struct pn533 *dev, u8 cmd_code,
pn533_send_async_complete_t complete_cb,
void *complete_cb_context)
{
int rc;
rc = __pn533_send_async(dev, cmd_code, req, complete_cb,
return __pn533_send_async(dev, cmd_code, req, complete_cb,
complete_cb_context);
return rc;
}
static int pn533_send_cmd_async(struct pn533 *dev, u8 cmd_code,
@ -502,12 +498,8 @@ static int pn533_send_cmd_async(struct pn533 *dev, u8 cmd_code,
pn533_send_async_complete_t complete_cb,
void *complete_cb_context)
{
int rc;
rc = __pn533_send_async(dev, cmd_code, req, complete_cb,
return __pn533_send_async(dev, cmd_code, req, complete_cb,
complete_cb_context);
return rc;
}
/*
@ -2620,7 +2612,7 @@ static int pn533_rf_field(struct nfc_dev *nfc_dev, u8 rf)
return rc;
}
return rc;
return 0;
}
static int pn532_sam_configuration(struct nfc_dev *nfc_dev)
@ -2794,7 +2786,6 @@ struct pn533 *pn53x_common_init(u32 device_type,
struct device *dev)
{
struct pn533 *priv;
int rc = -ENOMEM;
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv)
@ -2836,7 +2827,7 @@ struct pn533 *pn53x_common_init(u32 device_type,
error:
kfree(priv);
return ERR_PTR(rc);
return ERR_PTR(-ENOMEM);
}
EXPORT_SYMBOL_GPL(pn53x_common_init);