On Tue, May 13, 2014 at 11:21:59AM +0300, Tomas Winkler wrote:
> From: Alexander Usyskin <[email protected]>
>
> We need to support more then one mei interface
> hence the simple misc devices is not longer an option.
> We use char device now with to not break application
> space we preserve /dev/mei for the first interface.
>
> Signed-off-by: Alexander Usyskin <[email protected]>
> Signed-off-by: Tomas Winkler <[email protected]>
> ---
> drivers/misc/mei/main.c | 98
> +++++++++++++++++++++++++++++++++-------------
> drivers/misc/mei/mei_dev.h | 7 ++++
> drivers/misc/mei/pci-me.c | 1 -
> 3 files changed, 78 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
> index 66f0a1a..c58e059 100644
> --- a/drivers/misc/mei/main.c
> +++ b/drivers/misc/mei/main.c
> @@ -32,7 +32,6 @@
> #include <linux/compat.h>
> #include <linux/jiffies.h>
> #include <linux/interrupt.h>
> -#include <linux/miscdevice.h>
>
> #include <linux/mei.h>
>
> @@ -49,19 +48,12 @@
> */
> static int mei_open(struct inode *inode, struct file *file)
> {
> - struct miscdevice *misc = file->private_data;
> - struct pci_dev *pdev;
> struct mei_cl *cl;
> struct mei_device *dev;
>
> int err;
>
> - if (!misc->parent)
> - return -ENODEV;
> -
> - pdev = container_of(misc->parent, struct pci_dev, dev);
> -
> - dev = pci_get_drvdata(pdev);
> + dev = container_of(inode->i_cdev, struct mei_device, cdev);
> if (!dev)
> return -ENODEV;
>
> @@ -667,26 +659,48 @@ static const struct file_operations mei_fops = {
> .llseek = no_llseek
> };
>
> -/*
> - * Misc Device Struct
> - */
> -static struct miscdevice mei_misc_device = {
> - .name = "mei",
> - .fops = &mei_fops,
> - .minor = MISC_DYNAMIC_MINOR,
> -};
> -
> +static struct class *mei_class;
> +static dev_t mei_devt;
> +#define MAX_MEI_DEVS 5 /* Maximum number of mei devices */
Why have a max number at all?
>
> int mei_register(struct mei_device *dev)
> {
> - int ret;
> - mei_misc_device.parent = &dev->pdev->dev;
> - ret = misc_register(&mei_misc_device);
> - if (ret)
> +
> + int ret, devno;
> + int id = 0; /* FIXME: retrieve interface version*/
You still are only allocating 1 mei device, so why do all of this work
at all? Nothing changes, so why should I accept this patch?
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
