Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3509021pxb; Mon, 24 Jan 2022 11:03:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjVJgfn/tBsQUmf9Fdbew/rGJvqjaFTUIB1ouPO1edex/5hQKkkdRPiDp231TW3K5UByIj X-Received: by 2002:a17:902:cecc:b0:14b:287a:a02b with SMTP id d12-20020a170902cecc00b0014b287aa02bmr12595875plg.61.1643050980918; Mon, 24 Jan 2022 11:03:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643050980; cv=none; d=google.com; s=arc-20160816; b=pKe7hMxG5tPeRJQ0h3D3DWQoAv0G1oADC5j0i7jkLX02My2bzRTnbyAa8pmdLxy05o tFxhEItD1D7FbG0GME+Q3qXNu9ioawZjUryMXPa1llDBf/dhaGyjaur4eLasLdf7OTve ztIozJ7npXvX+CvUcP3W/Okx8o6AfTQutbtHEA4LfqVXWoHFf/huUdVYidUeSFyUbwUJ RuYNIPGTQVO5PCqEZHD68JfdFF3CyiCTsjnWWVZ7In9neTRXYhJNCBkTZsdzPueQmhBN d1dfVKbgwbELYMKCN28Q+NlC1MdCex6q8mbyNl7vE0MbZBCWXerxGmWDTTAr92KGKleg kiMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PGyqD82dxu+I1LzWuKTRtEYMzmD7DWmS/l4kMvhh/2c=; b=yv4iEB5VyQCOrzMC6/wQNhyK0sWHHfW1PBah8hxHLAOPY1iCRWdhYf6mQZzN4/DwLl 64oM85d4aviX4jGfqMrvNrOc/ozzuwZEerEWDfZs3pfJYCbnfobDyB9BQ5K+Jx3BiDVS yqsBvd3NXqiV1KE6z1ez9FVaIDpWVkFxwUdOedfY25g6lMQ0TqfPOEzKh+UFA0STPtUD u4WrlIQtP9gVaZpJ4APgWQNucfqyRepT4flJH4Tfx90ZekfyK/u8/umHZWYN7enxrv9h ZPpfiTkmu7DAhf8x7FKw9zp2fPxQrMRD5CYhBvE53aqUUcgSzdqQNnrEeYPu2Ea16sbg fg1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@foss.st.com header.s=selector1 header.b=SgvMgeJS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=foss.st.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p2si14111559pgm.260.2022.01.24.11.02.48; Mon, 24 Jan 2022 11:03:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@foss.st.com header.s=selector1 header.b=SgvMgeJS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=foss.st.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233856AbiAXK07 (ORCPT + 99 others); Mon, 24 Jan 2022 05:26:59 -0500 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:34198 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230451AbiAXK07 (ORCPT ); Mon, 24 Jan 2022 05:26:59 -0500 Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20O7176D017641; Mon, 24 Jan 2022 11:26:57 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=selector1; bh=PGyqD82dxu+I1LzWuKTRtEYMzmD7DWmS/l4kMvhh/2c=; b=SgvMgeJSZKYa7nqYBkizqMrdaMP+U0erTCX1BVb34UOJ+NhJqeYvfuF/lQOHt+EyDGLc k6bF14jg6DQufx5XJipXYrxcjTTeOAzpssq1mxM6EpsNVj6eAtPfi+TVccPtHR6Cc7yc clxigoPtewmXsP4Qjv+CusVEn4K4V1+vMiJ8jHWEPSr42j7vV67j0TivgR+M/gL3KMEJ KPJDtPFe4uWbEqlcrmAS0mcO3rbq+TIZhvTFBQMdQt3iesWv4G3XvlkR2FNYbvtfNWoc nYZ+qVnOrANAAKmh+mBEwtDTF/EpOBe1zAq9G8tnmX00pul6kVljeWkAbdQ9lQsFqD4C Ww== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3dsqbu98rk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jan 2022 11:26:57 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 869F410002A; Mon, 24 Jan 2022 11:26:56 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node2.st.com [10.75.127.5]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 7D2832128BC; Mon, 24 Jan 2022 11:26:56 +0100 (CET) Received: from localhost (10.75.127.45) by SFHDAG2NODE2.st.com (10.75.127.5) with Microsoft SMTP Server (TLS) id 15.0.1497.26; Mon, 24 Jan 2022 11:26:56 +0100 From: Arnaud Pouliquen To: Bjorn Andersson , Mathieu Poirier CC: , , , , Subject: [PATCH v9 07/11] rpmsg: Update rpmsg_chrdev_register_device function Date: Mon, 24 Jan 2022 11:25:20 +0100 Message-ID: <20220124102524.295783-8-arnaud.pouliquen@foss.st.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220124102524.295783-1-arnaud.pouliquen@foss.st.com> References: <20220124102524.295783-1-arnaud.pouliquen@foss.st.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.75.127.45] X-ClientProxiedBy: SFHDAG2NODE2.st.com (10.75.127.5) To SFHDAG2NODE2.st.com (10.75.127.5) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-24_06,2022-01-24_01,2021-12-02_01 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The rpmsg_chrdev driver has been replaced by the rpmsg_ctrl driver for the /dev/rpmsg_ctrlX devices management. The reference for the driver override is now the rpmsg_ctrl. Update the rpmsg_chrdev_register_device function to reflect the update, and rename the function to use the rpmsg_ctrldev prefix. The platform drivers are updated accordingly. Signed-off-by: Arnaud Pouliquen Reviewed-by: Mathieu Poirier Reviewed-by: Bjorn Andersson --- drivers/rpmsg/qcom_glink_native.c | 2 +- drivers/rpmsg/qcom_smd.c | 2 +- drivers/rpmsg/rpmsg_ctrl.c | 2 +- drivers/rpmsg/rpmsg_internal.h | 8 ++++---- drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c index 1030cfa80e04..cf2c057b738c 100644 --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -1715,7 +1715,7 @@ static int qcom_glink_create_chrdev(struct qcom_glink *glink) rpdev->dev.parent = glink->dev; rpdev->dev.release = qcom_glink_device_release; - return rpmsg_chrdev_register_device(rpdev); + return rpmsg_ctrldev_register_device(rpdev); } struct qcom_glink *qcom_glink_native_probe(struct device *dev, diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c index 540e027f08c4..cd623e3e8aa9 100644 --- a/drivers/rpmsg/qcom_smd.c +++ b/drivers/rpmsg/qcom_smd.c @@ -1113,7 +1113,7 @@ static int qcom_smd_create_chrdev(struct qcom_smd_edge *edge) qsdev->rpdev.dev.parent = &edge->dev; qsdev->rpdev.dev.release = qcom_smd_release_device; - return rpmsg_chrdev_register_device(&qsdev->rpdev); + return rpmsg_ctrldev_register_device(&qsdev->rpdev); } /* diff --git a/drivers/rpmsg/rpmsg_ctrl.c b/drivers/rpmsg/rpmsg_ctrl.c index 963e6e81a83f..f43b5e4dbb4c 100644 --- a/drivers/rpmsg/rpmsg_ctrl.c +++ b/drivers/rpmsg/rpmsg_ctrl.c @@ -179,7 +179,7 @@ static struct rpmsg_driver rpmsg_ctrldev_driver = { .probe = rpmsg_ctrldev_probe, .remove = rpmsg_ctrldev_remove, .drv = { - .name = "rpmsg_chrdev", + .name = "rpmsg_ctrl", }, }; diff --git a/drivers/rpmsg/rpmsg_internal.h b/drivers/rpmsg/rpmsg_internal.h index 416316200bde..d4b23fd019a8 100644 --- a/drivers/rpmsg/rpmsg_internal.h +++ b/drivers/rpmsg/rpmsg_internal.h @@ -86,16 +86,16 @@ struct rpmsg_device *rpmsg_create_channel(struct rpmsg_device *rpdev, int rpmsg_release_channel(struct rpmsg_device *rpdev, struct rpmsg_channel_info *chinfo); /** - * rpmsg_chrdev_register_device() - register chrdev device based on rpdev + * rpmsg_ctrldev_register_device() - register a char device for control based on rpdev * @rpdev: prepared rpdev to be used for creating endpoints * * This function wraps rpmsg_register_device() preparing the rpdev for use as * basis for the rpmsg chrdev. */ -static inline int rpmsg_chrdev_register_device(struct rpmsg_device *rpdev) +static inline int rpmsg_ctrldev_register_device(struct rpmsg_device *rpdev) { - strcpy(rpdev->id.name, "rpmsg_chrdev"); - rpdev->driver_override = "rpmsg_chrdev"; + strcpy(rpdev->id.name, "rpmsg_ctrl"); + rpdev->driver_override = "rpmsg_ctrl"; return rpmsg_register_device(rpdev); } diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index ac764e04c898..3ede25b1f2e4 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -849,7 +849,7 @@ static struct rpmsg_device *rpmsg_virtio_add_ctrl_dev(struct virtio_device *vdev rpdev_ctrl->dev.release = virtio_rpmsg_release_device; rpdev_ctrl->little_endian = virtio_is_little_endian(vrp->vdev); - err = rpmsg_chrdev_register_device(rpdev_ctrl); + err = rpmsg_ctrldev_register_device(rpdev_ctrl); if (err) { kfree(vch); return ERR_PTR(err); -- 2.25.1