Use inode argument to obtain minor number even in extended close function.

[lincan.git] / lincan / src / close.c

diff --git a/lincan/src/close.c b/lincan/src/close.c
index 4df1533e9fa283dba8228f71a35c4a4d47c2eea3..6a0ca6e0190578fc18b8adf5119a2bd525920ece 100644 (file)
--- a/lincan/src/close.c
+++ b/lincan/src/close.c
@@ -1,17 +1,41 @@
-/* close.c
- * Linux CAN-bus device driver.
- * Written by Arnaud Westenberg email:arnaud@wanadoo.nl
- * Rewritten for new CAN queues by Pavel Pisa - OCERA team member
- * email:pisa@cmp.felk.cvut.cz
- * This software is released under the GPL-License.
- * Version lincan-0.2  9 Jul 2003
- */
+/**************************************************************************/
+/* File: close.c - systemcall to close user connection to the driver      */
+/*                                                                        */
+/* LinCAN - (Not only) Linux CAN bus driver                               */
+/* Copyright (C) 2002-2009 DCE FEE CTU Prague <http://dce.felk.cvut.cz>   */
+/* Copyright (C) 2002-2009 Pavel Pisa <pisa@cmp.felk.cvut.cz>             */
+/* Funded by OCERA and FRESCOR IST projects                               */
+/* Based on CAN driver code by Arnaud Westenberg <arnaud@wanadoo.nl>      */
+/*                                                                        */
+/* LinCAN is free software; you can redistribute it and/or modify it      */
+/* under terms of the GNU General Public License as published by the      */
+/* Free Software Foundation; either version 2, or (at your option) any    */
+/* later version.  LinCAN is distributed in the hope that it will be      */
+/* useful, but WITHOUT ANY WARRANTY; without even the implied warranty    */
+/* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU    */
+/* General Public License for more details. You should have received a    */
+/* copy of the GNU General Public License along with LinCAN; see file     */
+/* COPYING. If not, write to the Free Software Foundation, 675 Mass Ave,  */
+/* Cambridge, MA 02139, USA.                                              */
+/*                                                                        */
+/* To allow use of LinCAN in the compact embedded systems firmware        */
+/* and RT-executives (RTEMS for example), main authors agree with next    */
+/* special exception:                                                     */
+/*                                                                        */
+/* Including LinCAN header files in a file, instantiating LinCAN generics */
+/* or templates, or linking other files with LinCAN objects to produce    */
+/* an application image/executable, does not by itself cause the          */
+/* resulting application image/executable to be covered by                */
+/* the GNU General Public License.                                        */
+/* This exception does not however invalidate any other reasons           */
+/* why the executable file might be covered by the GNU Public License.    */
+/* Publication of enhanced or derived LinCAN files is required although.  */
+/**************************************************************************/
 
 #include "../include/can.h"
 #include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/close.h"
-#include "../include/i82527.h"
 #include "../include/setup.h"
 #include "../include/fasync.h"
 
@@ -21,14 +45,21 @@
 int can_close(struct inode *inode, struct file *file)
 {
        struct canuser_t *canuser = (struct canuser_t*)(file->private_data);
+       struct canchip_t *chip;
        struct canque_ends_t *qends;
        struct msgobj_t *obj;
-       
+       can_spin_irqflags_t iflags;
+       int minor_nr = INODE2MINOR_NR(inode);
+
        if(!canuser || (canuser->magic != CAN_USER_MAGIC)){
                CANMSG("can_close: bad canuser magic\n");
                return -ENODEV;
        }
-       
+       if ((chip=objects_p[minor_nr]->hostchip) == NULL) {
+               CANMSG("There is no hardware support for the device file with minor nr.: %d\n",minor_nr);
+               return -ENODEV;
+       }
+
        obj = canuser->msgobj;
        qends = canuser->qends;
 
@@ -38,19 +69,27 @@ int can_close(struct inode *inode, struct file *file)
 
     #endif /*CAN_ENABLE_KERN_FASYNC*/
 
+       can_spin_lock_irqsave(&canuser_manipulation_lock, iflags);
        list_del(&canuser->peers);
+       can_spin_unlock_irqrestore(&canuser_manipulation_lock, iflags);
        canuser->qends = NULL;
        canqueue_ends_dispose_kern(qends, file->f_flags & O_SYNC);
 
        kfree(canuser);
 
+       can_spin_lock_irqsave(&canuser_manipulation_lock, iflags);
        if(atomic_dec_and_test(&obj->obj_used)){
-               obj->flags &= ~OBJ_OPENED;
-               /* FIXME: what about clearing chip HW status, stopping sending messages etc? */
+               can_msgobj_clear_fl(obj,OPENED);
        };
-       
+       can_spin_unlock_irqrestore(&canuser_manipulation_lock, iflags);
+
     #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,50))
        MOD_DEC_USE_COUNT;
     #endif
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10))
+       if (chip->hostdevice->hwspecops->release_device)
+               kref_put(&chip->hostdevice->refcount,chip->hostdevice->hwspecops->release_device);
+#endif
        return 0;
 }