[PATCH] Xilinx: hwicap: cleanup

[Grant Likely]

On Mon, Feb 11, 2008 at 11:24 AM, Stephen Neuendorffer
<stephen.neuendorffer at xilinx.com> wrote:
> Fix some missing __user tags and incorrect section tags.
>  Convert semaphores to mutexes.
>  Make probed_devices re-entrancy and error condition safe.
>  Fix some backwards memcpys.
>  Some other minor cleanups.
>  Use kerneldoc format.
>
>  Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer at xilinx.com>

Thanks Steven, some more comments below.

>
>  ---
>
>  Grant, Since it appears that the driver will stay in as-is, here are
>  the updates against mainline, based on Jiri's comments.
>  ---
>   drivers/char/xilinx_hwicap/buffer_icap.c   |   80 ++++++++++----------
>   drivers/char/xilinx_hwicap/fifo_icap.c     |   60 +++++++-------
>   drivers/char/xilinx_hwicap/xilinx_hwicap.c |  113 ++++++++++++++++------------
>   drivers/char/xilinx_hwicap/xilinx_hwicap.h |   24 +++---
>   4 files changed, 148 insertions(+), 129 deletions(-)
>
>  diff --git a/drivers/char/xilinx_hwicap/buffer_icap.c b/drivers/char/xilinx_hwicap/buffer_icap.c
>  index dfea2bd..2c5d17d 100644
>  --- a/drivers/char/xilinx_hwicap/buffer_icap.c
>  +++ b/drivers/char/xilinx_hwicap/buffer_icap.c
>  @@ -148,9 +148,9 @@ static inline void buffer_icap_set_size(void __iomem *base_address,
>   }
>
>   /**
>  - * buffer_icap_mSetoffsetReg: Set the bram offset register.
>  - * @parameter base_address: contains the base address of the device.
>  - * @parameter data: is the value to be written to the data register.
>  + * buffer_icap_mSetoffsetReg - Set the bram offset register.

This is the only function that is still in camel case; it should
probably be changed also... In fact, this functions doesn't seem to be
used at all.  Can it just be removed?  Are there any other unused
functions in this driver?

>  diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
>  index 24f6aef..eddaa26 100644
>  --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
>  +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
>  @@ -344,7 +345,7 @@ int hwicap_initialize_hwicap(struct hwicap_drvdata *drvdata)
>   }
>
>   static ssize_t
>  -hwicap_read(struct file *file, char *buf, size_t count, loff_t *ppos)
>  +hwicap_read(struct file *file, __user char *buf, size_t count, loff_t *ppos)

This looks like it should be 'char __user *buf' instead of '__user char *buf'.

>   {
>         struct hwicap_drvdata *drvdata = file->private_data;
>         ssize_t bytes_to_read = 0;
>   static ssize_t
>  -hwicap_write(struct file *file, const char *buf,
>  +hwicap_write(struct file *file, const __user char *buf,
>                 size_t count, loff_t *ppos)

Ditto on placement of __user

>  @@ -549,8 +556,7 @@ static int hwicap_release(struct inode *inode, struct file *file)
>         int i;
>         int status = 0;
>
>  -       if (down_interruptible(&drvdata->sem))
>  -               return -ERESTARTSYS;
>  +       mutex_lock(&drvdata->sem);

Why not mutex_lock_interruptible()? (goes for all cases of mutex_lock())

Cheers,
g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.