Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96d4581f authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz
Browse files

NFC: netlink: Add mode parameter to deactivate_target functions 



In order to manage in a better way the nci poll mode state machine,
add mode parameter to deactivate_target functions.
This way we can manage different target state.
mode parameter make sense only in nci core.

Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent cde2aa99

drivers/nfc/nfcsim.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static int nfcsim_activate_target(struct nfc_dev *nfc_dev, 
}



static void nfcsim_deactivate_target(struct nfc_dev *nfc_dev,

				     struct nfc_target *target)

				     struct nfc_target *target, u8 mode)

{

	struct nfcsim *dev = nfc_get_drvdata(nfc_dev);

drivers/nfc/pn533.c

+1 −1
Original line number Diff line number Diff line
@@ -2263,7 +2263,7 @@ static int pn533_activate_target(struct nfc_dev *nfc_dev, 
}



static void pn533_deactivate_target(struct nfc_dev *nfc_dev,

				    struct nfc_target *target)

				    struct nfc_target *target, u8 mode)

{

	struct pn533 *dev = nfc_get_drvdata(nfc_dev);

	struct sk_buff *skb;

include/net/nfc/nfc.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ struct nfc_ops { 
	int (*activate_target)(struct nfc_dev *dev, struct nfc_target *target,

			       u32 protocol);

	void (*deactivate_target)(struct nfc_dev *dev,

				  struct nfc_target *target);

				  struct nfc_target *target, u8 mode);

	int (*im_transceive)(struct nfc_dev *dev, struct nfc_target *target,

			     struct sk_buff *skb, data_exchange_cb_t cb,

			     void *cb_context);

net/nfc/core.c

+2 −2
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ int nfc_activate_target(struct nfc_dev *dev, u32 target_idx, u32 protocol) 
 * @dev: The nfc device that found the target

 * @target_idx: index of the target that must be deactivated

 */

int nfc_deactivate_target(struct nfc_dev *dev, u32 target_idx)

int nfc_deactivate_target(struct nfc_dev *dev, u32 target_idx, u8 mode)

{

	int rc = 0;
@@ -476,7 +476,7 @@ int nfc_deactivate_target(struct nfc_dev *dev, u32 target_idx) 
	if (dev->ops->check_presence)

		del_timer_sync(&dev->check_pres_timer);



	dev->ops->deactivate_target(dev, dev->active_target);

	dev->ops->deactivate_target(dev, dev->active_target, mode);

	dev->active_target = NULL;



error:

net/nfc/digital_core.c

+2 −1
Original line number Diff line number Diff line
@@ -631,7 +631,8 @@ static int digital_activate_target(struct nfc_dev *nfc_dev, 
}



static void digital_deactivate_target(struct nfc_dev *nfc_dev,

				      struct nfc_target *target)

				      struct nfc_target *target,

				      u8 mode)

{

	struct nfc_digital_dev *ddev = nfc_get_drvdata(nfc_dev);