RDMA/nes: Get rid of "set but not used" variables (69d51023) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/infiniband/hw/nes/nes.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -259,13 +259,11 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
	unsigned long flags;		unsigned long flags;
	struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;		struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
	struct nes_adapter *nesadapter = nesdev->nesadapter;		struct nes_adapter *nesadapter = nesdev->nesadapter;
	u32 qp_id;

	atomic_inc(&qps_destroyed);		atomic_inc(&qps_destroyed);

	/* Free the control structures */		/* Free the control structures */

	qp_id = nesqp->hwqp.qp_id;
	if (nesqp->pbl_vbase) {		if (nesqp->pbl_vbase) {
	pci_free_consistent(nesdev->pcidev, nesqp->qp_mem_size,		pci_free_consistent(nesdev->pcidev, nesqp->qp_mem_size,
	nesqp->hwqp.q2_vbase, nesqp->hwqp.q2_pbase);		nesqp->hwqp.q2_vbase, nesqp->hwqp.q2_pbase);
	@@ -441,7 +439,6 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i
	struct net_device *netdev = NULL;		struct net_device *netdev = NULL;
	struct nes_device *nesdev = NULL;		struct nes_device *nesdev = NULL;
	int ret = 0;		int ret = 0;
	struct nes_vnic *nesvnic = NULL;
	void __iomem *mmio_regs = NULL;		void __iomem *mmio_regs = NULL;
	u8 hw_rev;		u8 hw_rev;

	@@ -677,8 +674,6 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i
	}		}

	nes_print_macaddr(netdev);		nes_print_macaddr(netdev);
	/* create a CM core for this netdev */
	nesvnic = netdev_priv(netdev);

	nesdev->netdev_count++;		nesdev->netdev_count++;
	nesdev->nesadapter->netdev_count++;		nesdev->nesadapter->netdev_count++;

drivers/infiniband/hw/nes/nes_cm.c

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1719,8 +1719,6 @@ static int handle_ack_pkt(struct nes_cm_node cm_node, struct sk_buff skb,
	{		{
	int datasize = 0;		int datasize = 0;
	u32 inc_sequence;		u32 inc_sequence;
	u32 rem_seq_ack;
	u32 rem_seq;
	int ret = 0;		int ret = 0;
	int optionsize;		int optionsize;
	optionsize = (tcph->doff << 2) - sizeof(struct tcphdr);		optionsize = (tcph->doff << 2) - sizeof(struct tcphdr);
	@@ -1730,8 +1728,6 @@ static int handle_ack_pkt(struct nes_cm_node cm_node, struct sk_buff skb,

	skb_pull(skb, tcph->doff << 2);		skb_pull(skb, tcph->doff << 2);
	inc_sequence = ntohl(tcph->seq);		inc_sequence = ntohl(tcph->seq);
	rem_seq = ntohl(tcph->seq);
	rem_seq_ack = ntohl(tcph->ack_seq);
	datasize = skb->len;		datasize = skb->len;
	switch (cm_node->state) {		switch (cm_node->state) {
	case NES_CM_STATE_SYN_RCVD:		case NES_CM_STATE_SYN_RCVD:
	@@ -3128,17 +3124,15 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
	struct nes_vnic *nesvnic;		struct nes_vnic *nesvnic;
	struct nes_cm_listener *cm_node;		struct nes_cm_listener *cm_node;
	struct nes_cm_info cm_info;		struct nes_cm_info cm_info;
	struct nes_adapter *adapter;
	int err;		int err;


	nes_debug(NES_DBG_CM, "cm_id = %p, local port = 0x%04X.\n",		nes_debug(NES_DBG_CM, "cm_id = %p, local port = 0x%04X.\n",
	cm_id, ntohs(cm_id->local_addr.sin_port));		cm_id, ntohs(cm_id->local_addr.sin_port));

	nesvnic = to_nesvnic(cm_id->device);		nesvnic = to_nesvnic(cm_id->device);
	if (!nesvnic)		if (!nesvnic)
	return -EINVAL;		return -EINVAL;
	adapter = nesvnic->nesdev->nesadapter;
	nes_debug(NES_DBG_CM, "nesvnic=%p, netdev=%p, %s\n",		nes_debug(NES_DBG_CM, "nesvnic=%p, netdev=%p, %s\n",
	nesvnic, nesvnic->netdev, nesvnic->netdev->name);		nesvnic, nesvnic->netdev, nesvnic->netdev->name);

drivers/infiniband/hw/nes/nes_hw.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2999,11 +2999,8 @@ static void nes_cqp_ce_handler(struct nes_device nesdev, struct nes_hw_cq cq)

	static u8 locate_mpa(u8 pkt, u32 aeq_info)		static u8 locate_mpa(u8 pkt, u32 aeq_info)
	{		{
	u16 pkt_len;

	if (aeq_info & NES_AEQE_Q2_DATA_ETHERNET) {		if (aeq_info & NES_AEQE_Q2_DATA_ETHERNET) {
	/* skip over ethernet header */		/* skip over ethernet header */
	pkt_len = be16_to_cpu((u16 )(pkt + ETH_HLEN - 2));
	pkt += ETH_HLEN;		pkt += ETH_HLEN;

	/* Skip over IP and TCP headers */		/* Skip over IP and TCP headers */

drivers/infiniband/hw/nes/nes_nic.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -470,7 +470,6 @@ static int nes_netdev_start_xmit(struct sk_buff skb, struct net_device netdev)
	u16 nhoffset;		u16 nhoffset;
	u16 wqes_needed;		u16 wqes_needed;
	u16 wqes_available;		u16 wqes_available;
	u32 old_head;
	u32 wqe_misc;		u32 wqe_misc;

	/*		/*
	@@ -510,7 +509,6 @@ static int nes_netdev_start_xmit(struct sk_buff skb, struct net_device netdev)
	if (skb_is_gso(skb)) {		if (skb_is_gso(skb)) {
	nesvnic->segmented_tso_requests++;		nesvnic->segmented_tso_requests++;
	nesvnic->tso_requests++;		nesvnic->tso_requests++;
	old_head = nesnic->sq_head;
	/* Basically 4 fragments available per WQE with extended fragments */		/* Basically 4 fragments available per WQE with extended fragments */
	wqes_needed = nr_frags >> 2;		wqes_needed = nr_frags >> 2;
	wqes_needed += (nr_frags&3)?1:0;		wqes_needed += (nr_frags&3)?1:0;

drivers/infiniband/hw/nes/nes_verbs.c

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2112,13 +2112,12 @@ static struct ib_mr nes_reg_phys_mr(struct ib_pd ib_pd,
	u32 driver_key = 0;		u32 driver_key = 0;
	u32 root_pbl_index = 0;		u32 root_pbl_index = 0;
	u32 cur_pbl_index = 0;		u32 cur_pbl_index = 0;
	int err = 0, pbl_depth = 0;		int err = 0;
	int ret = 0;		int ret = 0;
	u16 pbl_count = 0;		u16 pbl_count = 0;
	u8 single_page = 1;		u8 single_page = 1;
	u8 stag_key = 0;		u8 stag_key = 0;

	pbl_depth = 0;
	region_length = 0;		region_length = 0;
	vpbl.pbl_vbase = NULL;		vpbl.pbl_vbase = NULL;
	root_vpbl.pbl_vbase = NULL;		root_vpbl.pbl_vbase = NULL;
	@@ -2931,7 +2930,6 @@ int nes_modify_qp(struct ib_qp ibqp, struct ib_qp_attr attr,
	int ret;		int ret;
	u16 original_last_aeq;		u16 original_last_aeq;
	u8 issue_modify_qp = 0;		u8 issue_modify_qp = 0;
	u8 issue_disconnect = 0;
	u8 dont_wait = 0;		u8 dont_wait = 0;

	nes_debug(NES_DBG_MOD_QP, "QP%u: QP State=%u, cur QP State=%u,"		nes_debug(NES_DBG_MOD_QP, "QP%u: QP State=%u, cur QP State=%u,"
	@@ -3083,7 +3081,6 @@ int nes_modify_qp(struct ib_qp ibqp, struct ib_qp_attr attr,
	nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK;		nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK;
	nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n",		nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n",
	nesqp->iwarp_state);		nesqp->iwarp_state);
	issue_disconnect = 1;
	} else {		} else {
	nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK;		nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK;
	nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n",		nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n",