NFC: netlink: Rename CMD_FW_UPLOAD to CMD_FW_DOWNLOAD

Samuel Ortiz · Samuel Ortiz · commit 9ea7187c53f6 · 2013-07-31T01:19:43.000+02:00
Loading a firmware into a target is typically called firmware
download, not firmware upload. So we rename the netlink API to
NFC_CMD_FW_DOWNLOAD in order to avoid any terminology confusion from
userspace.

Signed-off-by: Samuel Ortiz &lt;sameo@linux.intel.com&gt;
diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h
@@ -59,7 +59,7 @@ struct nfc_hci_ops {
 			      struct nfc_target *target);
 	int (*event_received)(struct nfc_hci_dev *hdev, u8 gate, u8 event,
 			      struct sk_buff *skb);
-	int (*fw_upload)(struct nfc_hci_dev *hdev, const char *firmware_name);
+	int (*fw_download)(struct nfc_hci_dev *hdev, const char *firmware_name);
 	int (*discover_se)(struct nfc_hci_dev *dev);
 	int (*enable_se)(struct nfc_hci_dev *dev, u32 se_idx);
 	int (*disable_se)(struct nfc_hci_dev *dev, u32 se_idx);
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h
@@ -68,7 +68,7 @@ struct nfc_ops {
 			     void *cb_context);
 	int (*tm_send)(struct nfc_dev *dev, struct sk_buff *skb);
 	int (*check_presence)(struct nfc_dev *dev, struct nfc_target *target);
-	int (*fw_upload)(struct nfc_dev *dev, const char *firmware_name);
+	int (*fw_download)(struct nfc_dev *dev, const char *firmware_name);
 
 	/* Secure Element API */
 	int (*discover_se)(struct nfc_dev *dev);
@@ -127,7 +127,7 @@ struct nfc_dev {
 	int targets_generation;
 	struct device dev;
 	bool dev_up;
-	bool fw_upload_in_progress;
+	bool fw_download_in_progress;
 	u8 rf_mode;
 	bool polling;
 	struct nfc_target *active_target;
diff --git a/include/uapi/linux/nfc.h b/include/uapi/linux/nfc.h
@@ -69,8 +69,8 @@
  *	starting a poll from a device which has a secure element enabled means
  *	we want to do SE based card emulation.
  * @NFC_CMD_DISABLE_SE: Disable the physical link to a specific secure element.
- * @NFC_CMD_FW_UPLOAD: Request to Load/flash firmware, or event to inform that
- *	some firmware was loaded
+ * @NFC_CMD_FW_DOWNLOAD: Request to Load/flash firmware, or event to inform
+ *	that some firmware was loaded
  */
 enum nfc_commands {
 	NFC_CMD_UNSPEC,
@@ -94,7 +94,7 @@ enum nfc_commands {
 	NFC_CMD_DISABLE_SE,
 	NFC_CMD_LLC_SDREQ,
 	NFC_EVENT_LLC_SDRES,
-	NFC_CMD_FW_UPLOAD,
+	NFC_CMD_FW_DOWNLOAD,
 	NFC_EVENT_SE_ADDED,
 	NFC_EVENT_SE_REMOVED,
 /* private: internal use only */
diff --git a/net/nfc/core.c b/net/nfc/core.c
@@ -44,7 +44,7 @@ DEFINE_MUTEX(nfc_devlist_mutex);
 /* NFC device ID bitmap */
 static DEFINE_IDA(nfc_index_ida);
 
-int nfc_fw_upload(struct nfc_dev *dev, const char *firmware_name)
+int nfc_fw_download(struct nfc_dev *dev, const char *firmware_name)
 {
 	int rc = 0;
 
@@ -62,28 +62,28 @@ int nfc_fw_upload(struct nfc_dev *dev, const char *firmware_name)
 		goto error;
 	}
 
-	if (!dev->ops->fw_upload) {
+	if (!dev->ops->fw_download) {
 		rc = -EOPNOTSUPP;
 		goto error;
 	}
 
-	dev->fw_upload_in_progress = true;
-	rc = dev->ops->fw_upload(dev, firmware_name);
+	dev->fw_download_in_progress = true;
+	rc = dev->ops->fw_download(dev, firmware_name);
 	if (rc)
-		dev->fw_upload_in_progress = false;
+		dev->fw_download_in_progress = false;
 
 error:
 	device_unlock(&dev->dev);
 	return rc;
 }
 
-int nfc_fw_upload_done(struct nfc_dev *dev, const char *firmware_name)
+int nfc_fw_download_done(struct nfc_dev *dev, const char *firmware_name)
 {
-	dev->fw_upload_in_progress = false;
+	dev->fw_download_in_progress = false;
 
-	return nfc_genl_fw_upload_done(dev, firmware_name);
+	return nfc_genl_fw_download_done(dev, firmware_name);
 }
-EXPORT_SYMBOL(nfc_fw_upload_done);
+EXPORT_SYMBOL(nfc_fw_download_done);
 
 /**
  * nfc_dev_up - turn on the NFC device
@@ -110,7 +110,7 @@ int nfc_dev_up(struct nfc_dev *dev)
 		goto error;
 	}
 
-	if (dev->fw_upload_in_progress) {
+	if (dev->fw_download_in_progress) {
 		rc = -EBUSY;
 		goto error;
 	}
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
@@ -809,14 +809,14 @@ static void nfc_hci_recv_from_llc(struct nfc_hci_dev *hdev, struct sk_buff *skb)
 	}
 }
 
-static int hci_fw_upload(struct nfc_dev *nfc_dev, const char *firmware_name)
+static int hci_fw_download(struct nfc_dev *nfc_dev, const char *firmware_name)
 {
 	struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
 
-	if (!hdev->ops->fw_upload)
+	if (!hdev->ops->fw_download)
 		return -ENOTSUPP;
 
-	return hdev->ops->fw_upload(hdev, firmware_name);
+	return hdev->ops->fw_download(hdev, firmware_name);
 }
 
 static struct nfc_ops hci_nfc_ops = {
@@ -831,7 +831,7 @@ static struct nfc_ops hci_nfc_ops = {
 	.im_transceive = hci_transceive,
 	.tm_send = hci_tm_send,
 	.check_presence = hci_check_presence,
-	.fw_upload = hci_fw_upload,
+	.fw_download = hci_fw_download,
 	.discover_se = hci_discover_se,
 	.enable_se = hci_enable_se,
 	.disable_se = hci_disable_se,
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
@@ -1089,7 +1089,7 @@ static int nfc_genl_llc_sdreq(struct sk_buff *skb, struct genl_info *info)
 	return rc;
 }
 
-static int nfc_genl_fw_upload(struct sk_buff *skb, struct genl_info *info)
+static int nfc_genl_fw_download(struct sk_buff *skb, struct genl_info *info)
 {
 	struct nfc_dev *dev;
 	int rc;
@@ -1108,13 +1108,13 @@ static int nfc_genl_fw_upload(struct sk_buff *skb, struct genl_info *info)
 	nla_strlcpy(firmware_name, info->attrs[NFC_ATTR_FIRMWARE_NAME],
 		    sizeof(firmware_name));
 
-	rc = nfc_fw_upload(dev, firmware_name);
+	rc = nfc_fw_download(dev, firmware_name);
 
 	nfc_put_device(dev);
 	return rc;
 }
 
-int nfc_genl_fw_upload_done(struct nfc_dev *dev, const char *firmware_name)
+int nfc_genl_fw_download_done(struct nfc_dev *dev, const char *firmware_name)
 {
 	struct sk_buff *msg;
 	void *hdr;
@@ -1124,7 +1124,7 @@ int nfc_genl_fw_upload_done(struct nfc_dev *dev, const char *firmware_name)
 		return -ENOMEM;
 
 	hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
-			  NFC_CMD_FW_UPLOAD);
+			  NFC_CMD_FW_DOWNLOAD);
 	if (!hdr)
 		goto free_msg;
 
@@ -1251,8 +1251,8 @@ static struct genl_ops nfc_genl_ops[] = {
 		.policy = nfc_genl_policy,
 	},
 	{
-		.cmd = NFC_CMD_FW_UPLOAD,
-		.doit = nfc_genl_fw_upload,
+		.cmd = NFC_CMD_FW_DOWNLOAD,
+		.doit = nfc_genl_fw_download,
 		.policy = nfc_genl_policy,
 	},
 	{
diff --git a/net/nfc/nfc.h b/net/nfc/nfc.h
@@ -123,10 +123,10 @@ static inline void nfc_device_iter_exit(struct class_dev_iter *iter)
 	class_dev_iter_exit(iter);
 }
 
-int nfc_fw_upload(struct nfc_dev *dev, const char *firmware_name);
-int nfc_genl_fw_upload_done(struct nfc_dev *dev, const char *firmware_name);
+int nfc_fw_download(struct nfc_dev *dev, const char *firmware_name);
+int nfc_genl_fw_download_done(struct nfc_dev *dev, const char *firmware_name);
 
-int nfc_fw_upload_done(struct nfc_dev *dev, const char *firmware_name);
+int nfc_fw_download_done(struct nfc_dev *dev, const char *firmware_name);
 
 int nfc_dev_up(struct nfc_dev *dev);
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ DEFINE_MUTEX(nfc_devlist_mutex);`
`44`	`44`	`/* NFC device ID bitmap */`
`45`	`45`	`static DEFINE_IDA(nfc_index_ida);`
`46`	`46`
`47`		`-int nfc_fw_upload(struct nfc_dev dev, const char firmware_name)`
	`47`	`+int nfc_fw_download(struct nfc_dev dev, const char firmware_name)`
`48`	`48`	`{`
`49`	`49`	`int rc = 0;`
`50`	`50`
`@@ -62,28 +62,28 @@ int nfc_fw_upload(struct nfc_dev dev, const char firmware_name)`
`62`	`62`	`goto error;`
`63`	`63`	`}`
`64`	`64`
`65`		`- if (!dev->ops->fw_upload) {`
	`65`	`+ if (!dev->ops->fw_download) {`
`66`	`66`	`rc = -EOPNOTSUPP;`
`67`	`67`	`goto error;`
`68`	`68`	`}`
`69`	`69`
`70`		`- dev->fw_upload_in_progress = true;`
`71`		`- rc = dev->ops->fw_upload(dev, firmware_name);`
	`70`	`+ dev->fw_download_in_progress = true;`
	`71`	`+ rc = dev->ops->fw_download(dev, firmware_name);`
`72`	`72`	`if (rc)`
`73`		`- dev->fw_upload_in_progress = false;`
	`73`	`+ dev->fw_download_in_progress = false;`
`74`	`74`
`75`	`75`	`error:`
`76`	`76`	`device_unlock(&dev->dev);`
`77`	`77`	`return rc;`
`78`	`78`	`}`
`79`	`79`
`80`		`-int nfc_fw_upload_done(struct nfc_dev dev, const char firmware_name)`
	`80`	`+int nfc_fw_download_done(struct nfc_dev dev, const char firmware_name)`
`81`	`81`	`{`
`82`		`- dev->fw_upload_in_progress = false;`
	`82`	`+ dev->fw_download_in_progress = false;`
`83`	`83`
`84`		`- return nfc_genl_fw_upload_done(dev, firmware_name);`
	`84`	`+ return nfc_genl_fw_download_done(dev, firmware_name);`
`85`	`85`	`}`
`86`		`-EXPORT_SYMBOL(nfc_fw_upload_done);`
	`86`	`+EXPORT_SYMBOL(nfc_fw_download_done);`
`87`	`87`
`88`	`88`	`/**`
`89`	`89`	`* nfc_dev_up - turn on the NFC device`
`@@ -110,7 +110,7 @@ int nfc_dev_up(struct nfc_dev *dev)`
`110`	`110`	`goto error;`
`111`	`111`	`}`
`112`	`112`
`113`		`- if (dev->fw_upload_in_progress) {`
	`113`	`+ if (dev->fw_download_in_progress) {`
`114`	`114`	`rc = -EBUSY;`
`115`	`115`	`goto error;`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -809,14 +809,14 @@ static void nfc_hci_recv_from_llc(struct nfc_hci_dev hdev, struct sk_buff skb)`
`809`	`809`	`}`
`810`	`810`	`}`
`811`	`811`
`812`		`-static int hci_fw_upload(struct nfc_dev nfc_dev, const char firmware_name)`
	`812`	`+static int hci_fw_download(struct nfc_dev nfc_dev, const char firmware_name)`
`813`	`813`	`{`
`814`	`814`	`struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);`
`815`	`815`
`816`		`- if (!hdev->ops->fw_upload)`
	`816`	`+ if (!hdev->ops->fw_download)`
`817`	`817`	`return -ENOTSUPP;`
`818`	`818`
`819`		`- return hdev->ops->fw_upload(hdev, firmware_name);`
	`819`	`+ return hdev->ops->fw_download(hdev, firmware_name);`
`820`	`820`	`}`
`821`	`821`
`822`	`822`	`static struct nfc_ops hci_nfc_ops = {`
`@@ -831,7 +831,7 @@ static struct nfc_ops hci_nfc_ops = {`
`831`	`831`	`.im_transceive = hci_transceive,`
`832`	`832`	`.tm_send = hci_tm_send,`
`833`	`833`	`.check_presence = hci_check_presence,`
`834`		`- .fw_upload = hci_fw_upload,`
	`834`	`+ .fw_download = hci_fw_download,`
`835`	`835`	`.discover_se = hci_discover_se,`
`836`	`836`	`.enable_se = hci_enable_se,`
`837`	`837`	`.disable_se = hci_disable_se,`