lkml.org 
[lkml]   [2021]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v2 1/7] rpmsg: char: Export eptdev create an destroy functions
    On Tue, Apr 13, 2021 at 03:44:52PM +0200, Arnaud Pouliquen wrote:
    > To prepare the split of the code related to the control (ctrldev)
    > and the endpoint (eptdev) devices in 2 separate files:
    >
    > - Rename and export the functions in rpmsg_char.h.
    >
    > - Suppress the dependency with the rpmsg_ctrldev struct in the
    > rpmsg_chrdev_create_eptdev function.
    >
    > - The rpmsg class is provided as parameter in rpmsg_chrdev_create_eptdev,
    > because the class is associated to the control part.
    >
    > Suggested-by: Mathieu Poirier <mathieu.poirier@linaro.org>
    > Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
    > ---
    > drivers/rpmsg/rpmsg_char.c | 19 +++++++++------
    > drivers/rpmsg/rpmsg_char.h | 50 ++++++++++++++++++++++++++++++++++++++
    > 2 files changed, 61 insertions(+), 8 deletions(-)
    > create mode 100644 drivers/rpmsg/rpmsg_char.h
    >
    > diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c
    > index 2bebc9b2d163..b9df8dc4365f 100644
    > --- a/drivers/rpmsg/rpmsg_char.c
    > +++ b/drivers/rpmsg/rpmsg_char.c
    > @@ -1,5 +1,6 @@
    > // SPDX-License-Identifier: GPL-2.0
    > /*
    > + * Copyright (C) 2021, STMicroelectronics
    > * Copyright (c) 2016, Linaro Ltd.
    > * Copyright (c) 2012, Michal Simek <monstr@monstr.eu>
    > * Copyright (c) 2012, PetaLogix
    > @@ -22,6 +23,7 @@
    > #include <linux/uaccess.h>
    > #include <uapi/linux/rpmsg.h>
    >
    > +#include "rpmsg_char.h"
    > #include "rpmsg_internal.h"
    >
    > #define RPMSG_DEV_MAX (MINORMASK + 1)
    > @@ -78,7 +80,7 @@ struct rpmsg_eptdev {
    > wait_queue_head_t readq;
    > };
    >
    > -static int rpmsg_eptdev_destroy(struct device *dev, void *data)
    > +int rpmsg_chrdev_destroy_eptdev(struct device *dev, void *data)

    Shouldn't this be rpmsg_chrdev_eptdev_destroy()? I've been wondering about the
    flipping of destroy and eptdev... The same for rpmsg_chrdev_create_eptdev().

    With that:

    Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>

    > {
    > struct rpmsg_eptdev *eptdev = dev_to_eptdev(dev);
    >
    > @@ -97,6 +99,7 @@ static int rpmsg_eptdev_destroy(struct device *dev, void *data)
    >
    > return 0;
    > }
    > +EXPORT_SYMBOL(rpmsg_chrdev_destroy_eptdev);
    >
    > static int rpmsg_ept_cb(struct rpmsg_device *rpdev, void *buf, int len,
    > void *priv, u32 addr)
    > @@ -280,7 +283,7 @@ static long rpmsg_eptdev_ioctl(struct file *fp, unsigned int cmd,
    > if (cmd != RPMSG_DESTROY_EPT_IOCTL)
    > return -EINVAL;
    >
    > - return rpmsg_eptdev_destroy(&eptdev->dev, NULL);
    > + return rpmsg_chrdev_destroy_eptdev(&eptdev->dev, NULL);
    > }
    >
    > static const struct file_operations rpmsg_eptdev_fops = {
    > @@ -339,10 +342,9 @@ static void rpmsg_eptdev_release_device(struct device *dev)
    > kfree(eptdev);
    > }
    >
    > -static int rpmsg_eptdev_create(struct rpmsg_ctrldev *ctrldev,
    > - struct rpmsg_channel_info chinfo)
    > +int rpmsg_chrdev_create_eptdev(struct rpmsg_device *rpdev, struct device *parent,
    > + struct rpmsg_channel_info chinfo, struct class *rpmsg_class)
    > {
    > - struct rpmsg_device *rpdev = ctrldev->rpdev;
    > struct rpmsg_eptdev *eptdev;
    > struct device *dev;
    > int ret;
    > @@ -362,7 +364,7 @@ static int rpmsg_eptdev_create(struct rpmsg_ctrldev *ctrldev,
    >
    > device_initialize(dev);
    > dev->class = rpmsg_class;
    > - dev->parent = &ctrldev->dev;
    > + dev->parent = parent;
    > dev->groups = rpmsg_eptdev_groups;
    > dev_set_drvdata(dev, eptdev);
    >
    > @@ -405,6 +407,7 @@ static int rpmsg_eptdev_create(struct rpmsg_ctrldev *ctrldev,
    >
    > return ret;
    > }
    > +EXPORT_SYMBOL(rpmsg_chrdev_create_eptdev);
    >
    > static int rpmsg_ctrldev_open(struct inode *inode, struct file *filp)
    > {
    > @@ -444,7 +447,7 @@ static long rpmsg_ctrldev_ioctl(struct file *fp, unsigned int cmd,
    > chinfo.src = eptinfo.src;
    > chinfo.dst = eptinfo.dst;
    >
    > - return rpmsg_eptdev_create(ctrldev, chinfo);
    > + return rpmsg_chrdev_create_eptdev(ctrldev->rpdev, &ctrldev->dev, chinfo, rpmsg_class);
    > };
    >
    > static const struct file_operations rpmsg_ctrldev_fops = {
    > @@ -530,7 +533,7 @@ static void rpmsg_chrdev_remove(struct rpmsg_device *rpdev)
    > int ret;
    >
    > /* Destroy all endpoints */
    > - ret = device_for_each_child(&ctrldev->dev, NULL, rpmsg_eptdev_destroy);
    > + ret = device_for_each_child(&ctrldev->dev, NULL, rpmsg_chrdev_destroy_eptdev);
    > if (ret)
    > dev_warn(&rpdev->dev, "failed to nuke endpoints: %d\n", ret);
    >
    > diff --git a/drivers/rpmsg/rpmsg_char.h b/drivers/rpmsg/rpmsg_char.h
    > new file mode 100644
    > index 000000000000..379d2ae2bee8
    > --- /dev/null
    > +++ b/drivers/rpmsg/rpmsg_char.h
    > @@ -0,0 +1,50 @@
    > +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
    > +/*
    > + * Copyright (C) STMicroelectronics 2021.
    > + */
    > +
    > +#ifndef __RPMSG_CHRDEV_H__
    > +#define __RPMSG_CHRDEV_H__
    > +
    > +#if IS_REACHABLE(CONFIG_RPMSG_CHAR)
    > +/**
    > + * rpmsg_chrdev_create_eptdev() - register char device based on an endpoint
    > + * @rpdev: prepared rpdev to be used for creating endpoints
    > + * @parent: parent device
    > + * @chinfo: assiated endpoint channel information.
    > + *
    > + * This function create a new rpmsg char endpoint device to instantiate a new
    > + * endpoint based on chinfo information.
    > + */
    > +int rpmsg_chrdev_create_eptdev(struct rpmsg_device *rpdev, struct device *parent,
    > + struct rpmsg_channel_info chinfo, struct class *rpmsg_class);
    > +
    > +/**
    > + * rpmsg_chrdev_destroy_eptdev() - destroy created char device endpoint.
    > + * @data: private data associated to the endpoint device
    > + *
    > + * This function destroys a rpmsg char endpoint device created by the RPMSG_DESTROY_EPT_IOCTL
    > + * control.
    > + */
    > +int rpmsg_chrdev_destroy_eptdev(struct device *dev, void *data);
    > +
    > +#else /*IS_REACHABLE(CONFIG_RPMSG_CHAR) */
    > +
    > +static inline int rpmsg_chrdev_create_eptdev(struct rpmsg_device *rpdev, struct device *parent,
    > + struct rpmsg_channel_info chinfo,
    > + struct class *rpmsg_class)
    > +{
    > + return -EINVAL;
    > +}
    > +
    > +static inline int rpmsg_chrdev_destroy_eptdev(struct device *dev, void *data)
    > +{
    > + /* This shouldn't be possible */
    > + WARN_ON(1);
    > +
    > + return 0;
    > +}
    > +
    > +#endif /*IS_REACHABLE(CONFIG_RPMSG_CHAR) */
    > +
    > +#endif /*__RPMSG_CHRDEV_H__ */
    > --
    > 2.17.1
    >

    \
     
     \ /
      Last update: 2021-04-21 19:55    [W:2.601 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site