Commit 9bac75d0 authored Apr 01, 2014 by Christophe Ricard Committed by Samuel Ortiz Apr 22, 2014

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 <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

parent 761a2c4f

drivers/nfc/st21nfca/i2c.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -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)