From: Christophe Ricard Date: Mon, 31 Mar 2014 22:34:05 +0000 (+0200) Subject: NFC: st21nfca: st21nfca_hci_i2c_probe returns st21nfca_hci_probe result. X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9bac75d0eceb8d7fea74f11a8b304aa1119681f2;p=linux-beck.git NFC: st21nfca: st21nfca_hci_i2c_probe returns st21nfca_hci_probe result. st21nfca_hci_probe return 0 in case of successful call and a different value in any other cases. There is no need to check for st21nfca_hci_probe return as this will be checked after st21nfca_hci_i2c_probe is completed. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz --- diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c index 71becd9cb99d..aafe70e9abea 100644 --- a/drivers/nfc/st21nfca/i2c.c +++ b/drivers/nfc/st21nfca/i2c.c @@ -555,14 +555,9 @@ static int st21nfca_hci_i2c_probe(struct i2c_client *client, return r; } - r = st21nfca_hci_probe(phy, &i2c_phy_ops, LLC_SHDLC_NAME, + return st21nfca_hci_probe(phy, &i2c_phy_ops, LLC_SHDLC_NAME, ST21NFCA_FRAME_HEADROOM, ST21NFCA_FRAME_TAILROOM, ST21NFCA_HCI_LLC_MAX_PAYLOAD, &phy->hdev); - - if (r < 0) - return r; - - return 0; } static int st21nfca_hci_i2c_remove(struct i2c_client *client)