openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: iio: remove now defunct header definitions and add some statics 

Now we have combined all chrdevs into one, some bits and bobs are only
needed in industrialio-core.c and don't need to be in the core header.

Also remove some unused defines.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jonathan Cameron 2011-08-30 12:32:48 +01:00 committed by Greg Kroah-Hartman
parent 1aa0427832
commit f625cb97d4
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/iio/iio_core.h
View File

@ -13,13 +13,6 @@
#ifndef _IIO_CORE_H_ #ifndef _IIO_CORE_H_
#define _IIO_CORE_H_ #define _IIO_CORE_H_
/**
* iio_device_get_chrdev_minor() - get an unused minor number
**/
int iio_device_get_chrdev_minor(void);
void iio_device_free_chrdev_minor(int val);
/** /**
* iio_put() - internal module reference count reduce * iio_put() - internal module reference count reduce
**/ **/
@ -30,8 +23,6 @@ void iio_put(void);
**/ **/
void iio_get(void); void iio_get(void);
extern dev_t iio_devt;
int __iio_add_chan_devattr(const char *postfix, int __iio_add_chan_devattr(const char *postfix,
const char *group, const char *group,
struct iio_chan_spec const *chan, struct iio_chan_spec const *chan,

9
drivers/staging/iio/industrialio-core.c
View File

@ -27,9 +27,6 @@
#include "iio_core_trigger.h" #include "iio_core_trigger.h"
#include "chrdev.h" #include "chrdev.h"
#define IIO_ID_PREFIX "device"
#define IIO_ID_FORMAT IIO_ID_PREFIX "%d"
/* IDR to assign each registered device a unique id*/ /* IDR to assign each registered device a unique id*/
static DEFINE_IDA(iio_ida); static DEFINE_IDA(iio_ida);
/* IDR to allocate character device minor numbers */ /* IDR to allocate character device minor numbers */
@ -37,7 +34,7 @@ static DEFINE_IDA(iio_chrdev_ida);
/* Lock used to protect both of the above */ /* Lock used to protect both of the above */
static DEFINE_SPINLOCK(iio_ida_lock); static DEFINE_SPINLOCK(iio_ida_lock);
dev_t iio_devt; static dev_t iio_devt;
#define IIO_DEV_MAX 256 #define IIO_DEV_MAX 256
struct bus_type iio_bus_type = { struct bus_type iio_bus_type = {
@ -276,7 +273,7 @@ static const struct file_operations iio_event_chrdev_fileops = {
.llseek = noop_llseek, .llseek = noop_llseek,
}; };
int iio_device_get_chrdev_minor(void) static int iio_device_get_chrdev_minor(void)
{ {
int ret; int ret;
@ -287,7 +284,7 @@ int iio_device_get_chrdev_minor(void)
return -ENOMEM; return -ENOMEM;
} }
void iio_device_free_chrdev_minor(int val) static void iio_device_free_chrdev_minor(int val)
{ {
iio_free_ida_val(&iio_chrdev_ida, val); iio_free_ida_val(&iio_chrdev_ida, val);
} }