commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=71fd0c35a1c85fbeb75867020493a3f0d135536b branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
Signed-off-by: Sonic Zhang <[email protected]> --- drivers/staging/icc/core/protocol.c | 16 ++++++++-------- drivers/staging/icc/include/icc.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/icc/core/protocol.c b/drivers/staging/icc/core/protocol.c index 44311b7..7c142e3 100644 --- a/drivers/staging/icc/core/protocol.c +++ b/drivers/staging/icc/core/protocol.c @@ -245,10 +245,10 @@ static int sm_send_message_internal(struct sm_session *session, { struct sm_icc_desc *icc_info = session->icc_info; int ret = 0; - sm_debug("%s: dst %d %08x\n", __func__, icc_info->slave_cpu, (uint32_t)msg->type); + sm_debug("%s: dst %d %08x\n", __func__, icc_info->peer_cpu, (uint32_t)msg->type); ret = sm_message_enqueue(SM_GET_ICC_QUEUE(session), msg); if (!ret) - icc_send_ipi_cpu(icc_info->slave_cpu, icc_info->notify); + icc_send_ipi_cpu(icc_info->peer_cpu, icc_info->notify); return ret; } @@ -1083,7 +1083,7 @@ static int msg_recv_internal(struct sm_msg *msg, struct sm_session *session) memcpy(&message->msg, msg, sizeof(struct sm_msg)); message->dst = cpu; - message->src = ""> + message->src = ""> if ((SM_MSG_PROTOCOL(msg->type) == SP_SCALAR)) sm_send_scalar_ack(session, msg->src_ep, message->src, @@ -1191,7 +1191,7 @@ matched1: session->remote_ep = msg->src_ep; session->flags = SM_CONNECTING; session->type = SM_MSG_PROTOCOL(msg->type); - sm_send_connect_ack(session, msg->src_ep, icc_info->slave_cpu); + sm_send_connect_ack(session, msg->src_ep, icc_info->peer_cpu); break; case SM_SESSION_PACKET_CONNECT_DONE: case SM_SESSION_SCALAR_CONNECT_DONE: @@ -1200,9 +1200,9 @@ matched1: break; case SM_SESSION_PACKET_ACTIVE: if (session->flags & SM_OPEN) - sm_send_session_active_ack(session, msg->src_ep, icc_info->slave_cpu); + sm_send_session_active_ack(session, msg->src_ep, icc_info->peer_cpu); else - sm_send_session_active_noack(session, msg->src_ep, icc_info->slave_cpu); + sm_send_session_active_noack(session, msg->src_ep, icc_info->peer_cpu); break; case SM_SESSION_PACKET_ACTIVE_ACK: if (session->flags & SM_OPEN) { @@ -1216,7 +1216,7 @@ matched1: case SM_SESSION_SCALAR_CLOSE: session->remote_ep = 0; session->flags = 0; - sm_send_close_ack(session, msg->src_ep, icc_info->slave_cpu); + sm_send_close_ack(session, msg->src_ep, icc_info->peer_cpu); break; case SM_SESSION_PACKET_CLOSE_ACK: case SM_SESSION_SCALAR_CLOSE_ACK: @@ -1519,7 +1519,7 @@ static int __devinit bfin_icc_probe(struct platform_device *pdev) } for (i = 0, icc_info = icc->icc_info; i < icc->slave_count; i++, icc_info++) { - icc_info->slave_cpu = i + 1; + icc_info->peer_cpu = i + 1; icc_info->notify = icc_data->slave_info[i].notify; if( icc_info->notify < 0) { diff --git a/drivers/staging/icc/include/icc.h b/drivers/staging/icc/include/icc.h index 4d34220..ff77fac 100644 --- a/drivers/staging/icc/include/icc.h +++ b/drivers/staging/icc/include/icc.h @@ -161,7 +161,7 @@ struct sm_message_queue { session->icc_info->icc_queue) struct sm_icc_desc { - uint32_t slave_cpu; + uint32_t peer_cpu; struct sm_message_queue *icc_queue; struct sm_message_queue *icc_high_queue; struct task_struct *iccq_thread;
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
