Skip to content

Commit

Permalink
nfc: hci: cleanup unneeded spaces
Browse files Browse the repository at this point in the history
No need for multiple spaces in variable declaration (the code does not
use them in other places).  No functional change.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Krzysztof Kozlowski authored and Jakub Kicinski committed Jul 30, 2021
1 parent ddecf55 commit 77411df
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions net/nfc/nci/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ static void nci_send_data_req(struct nci_dev *ndev, unsigned long opt)
static void nci_nfcc_loopback_cb(void *context, struct sk_buff *skb, int err)
{
struct nci_dev *ndev = (struct nci_dev *)context;
struct nci_conn_info *conn_info;
struct nci_conn_info *conn_info;

conn_info = nci_get_conn_info_by_conn_id(ndev, ndev->cur_conn_id);
if (!conn_info) {
Expand Down Expand Up @@ -1006,7 +1006,7 @@ static int nci_transceive(struct nfc_dev *nfc_dev, struct nfc_target *target,
{
struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
int rc;
struct nci_conn_info *conn_info;
struct nci_conn_info *conn_info;

conn_info = ndev->rf_conn_info;
if (!conn_info)
Expand Down Expand Up @@ -1271,7 +1271,7 @@ EXPORT_SYMBOL(nci_register_device);
*/
void nci_unregister_device(struct nci_dev *ndev)
{
struct nci_conn_info *conn_info, *n;
struct nci_conn_info *conn_info, *n;

nci_close_device(ndev);

Expand Down Expand Up @@ -1443,7 +1443,7 @@ int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode,
static void nci_tx_work(struct work_struct *work)
{
struct nci_dev *ndev = container_of(work, struct nci_dev, tx_work);
struct nci_conn_info *conn_info;
struct nci_conn_info *conn_info;
struct sk_buff *skb;

conn_info = nci_get_conn_info_by_conn_id(ndev, ndev->cur_conn_id);
Expand Down
14 changes: 7 additions & 7 deletions net/nfc/nci/hci.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
#include <linux/nfc.h>

struct nci_data {
u8 conn_id;
u8 pipe;
u8 cmd;
const u8 *data;
u32 data_len;
u8 conn_id;
u8 pipe;
u8 cmd;
const u8 *data;
u32 data_len;
} __packed;

struct nci_hci_create_pipe_params {
Expand Down Expand Up @@ -363,7 +363,7 @@ static void nci_hci_cmd_received(struct nci_dev *ndev, u8 pipe,
static void nci_hci_resp_received(struct nci_dev *ndev, u8 pipe,
struct sk_buff *skb)
{
struct nci_conn_info *conn_info;
struct nci_conn_info *conn_info;

conn_info = ndev->hci_dev->conn_info;
if (!conn_info)
Expand Down Expand Up @@ -714,7 +714,7 @@ static int nci_hci_dev_connect_gates(struct nci_dev *ndev,

int nci_hci_dev_session_init(struct nci_dev *ndev)
{
struct nci_conn_info *conn_info;
struct nci_conn_info *conn_info;
struct sk_buff *skb;
int r;

Expand Down
4 changes: 2 additions & 2 deletions net/nfc/nci/ntf.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static void nci_core_conn_credits_ntf_packet(struct nci_dev *ndev,
struct sk_buff *skb)
{
struct nci_core_conn_credit_ntf *ntf = (void *) skb->data;
struct nci_conn_info *conn_info;
struct nci_conn_info *conn_info;
int i;

pr_debug("num_entries %d\n", ntf->num_entries);
Expand Down Expand Up @@ -528,7 +528,7 @@ static int nci_store_general_bytes_nfc_dep(struct nci_dev *ndev,
static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev,
const struct sk_buff *skb)
{
struct nci_conn_info *conn_info;
struct nci_conn_info *conn_info;
struct nci_rf_intf_activated_ntf ntf;
const __u8 *data = skb->data;
int err = NCI_STATUS_OK;
Expand Down
2 changes: 1 addition & 1 deletion net/nfc/nci/rsp.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ static void nci_rf_disc_map_rsp_packet(struct nci_dev *ndev,
static void nci_rf_disc_rsp_packet(struct nci_dev *ndev,
const struct sk_buff *skb)
{
struct nci_conn_info *conn_info;
struct nci_conn_info *conn_info;
__u8 status = skb->data[0];

pr_debug("status 0x%x\n", status);
Expand Down

0 comments on commit 77411df

Please sign in to comment.