Merge branch 'misc' into for-next (59b5b28d) · Commits · e / devices / android_kernel_teracube_2e

drivers/infiniband/hw/amso1100/c2_ae.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -141,7 +141,7 @@ static const char *to_qp_state_str(int state)
	return "C2_QP_STATE_ERROR";		return "C2_QP_STATE_ERROR";
	default:		default:
	return "<invalid QP state>";		return "<invalid QP state>";
	};		}
	}		}

	void c2_ae_event(struct c2_dev *c2dev, u32 mq_index)		void c2_ae_event(struct c2_dev *c2dev, u32 mq_index)

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -357,7 +357,7 @@ static int mthca_eq_int(struct mthca_dev dev, struct mthca_eq eq)
	mthca_warn(dev, "Unhandled event %02x(%02x) on EQ %d\n",		mthca_warn(dev, "Unhandled event %02x(%02x) on EQ %d\n",
	eqe->type, eqe->subtype, eq->eqn);		eqe->type, eqe->subtype, eq->eqn);
	break;		break;
	};		}

	set_eqe_hw(eqe);		set_eqe_hw(eqe);
	++eq->cons_index;		++eq->cons_index;

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -150,7 +150,7 @@ enum ib_qp_state get_ibqp_state(enum ocrdma_qp_state qps)
	return IB_QPS_SQE;		return IB_QPS_SQE;
	case OCRDMA_QPS_ERR:		case OCRDMA_QPS_ERR:
	return IB_QPS_ERR;		return IB_QPS_ERR;
	};		}
	return IB_QPS_ERR;		return IB_QPS_ERR;
	}		}

	@@ -171,7 +171,7 @@ static enum ocrdma_qp_state get_ocrdma_qp_state(enum ib_qp_state qps)
	return OCRDMA_QPS_SQE;		return OCRDMA_QPS_SQE;
	case IB_QPS_ERR:		case IB_QPS_ERR:
	return OCRDMA_QPS_ERR;		return OCRDMA_QPS_ERR;
	};		}
	return OCRDMA_QPS_ERR;		return OCRDMA_QPS_ERR;
	}		}

	@@ -1982,7 +1982,7 @@ int ocrdma_mbx_create_qp(struct ocrdma_qp qp, struct ib_qp_init_attr attrs,
	break;		break;
	default:		default:
	return -EINVAL;		return -EINVAL;
	};		}

	cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_CREATE_QP, sizeof(*cmd));		cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_CREATE_QP, sizeof(*cmd));
	if (!cmd)		if (!cmd)

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -531,7 +531,7 @@ static void ocrdma_event_handler(struct ocrdma_dev *dev, u32 event)
	case BE_DEV_DOWN:		case BE_DEV_DOWN:
	ocrdma_close(dev);		ocrdma_close(dev);
	break;		break;
	};		}
	}		}

	static struct ocrdma_driver ocrdma_drv = {		static struct ocrdma_driver ocrdma_drv = {

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -141,7 +141,7 @@ static inline void get_link_speed_and_width(struct ocrdma_dev *dev,
	/* Unsupported */		/* Unsupported */
	*ib_speed = IB_SPEED_SDR;		*ib_speed = IB_SPEED_SDR;
	*ib_width = IB_WIDTH_1X;		*ib_width = IB_WIDTH_1X;
	};		}
	}		}


	@@ -2331,7 +2331,7 @@ static enum ib_wc_status ocrdma_to_ibwc_err(u16 status)
	default:		default:
	ibwc_status = IB_WC_GENERAL_ERR;		ibwc_status = IB_WC_GENERAL_ERR;
	break;		break;
	};		}
	return ibwc_status;		return ibwc_status;
	}		}

	@@ -2370,7 +2370,7 @@ static void ocrdma_update_wc(struct ocrdma_qp qp, struct ib_wc ibwc,
	pr_err("%s() invalid opcode received = 0x%x\n",		pr_err("%s() invalid opcode received = 0x%x\n",
	__func__, hdr->cw & OCRDMA_WQE_OPCODE_MASK);		__func__, hdr->cw & OCRDMA_WQE_OPCODE_MASK);
	break;		break;
	};		}
	}		}

	static void ocrdma_set_cqe_status_flushed(struct ocrdma_qp *qp,		static void ocrdma_set_cqe_status_flushed(struct ocrdma_qp *qp,