Skip to content

Commit

Permalink
staging: iio: remove now defunct header definitions and add some statics
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Sep 6, 2011
1 parent 1aa0427 commit f625cb9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
9 changes: 0 additions & 9 deletions drivers/staging/iio/iio_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@
#ifndef _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
**/
Expand All @@ -30,8 +23,6 @@ void iio_put(void);
**/
void iio_get(void);

extern dev_t iio_devt;

int __iio_add_chan_devattr(const char *postfix,
const char *group,
struct iio_chan_spec const *chan,
Expand Down
9 changes: 3 additions & 6 deletions drivers/staging/iio/industrialio-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,14 @@
#include "iio_core_trigger.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*/
static DEFINE_IDA(iio_ida);
/* IDR to allocate character device minor numbers */
static DEFINE_IDA(iio_chrdev_ida);
/* Lock used to protect both of the above */
static DEFINE_SPINLOCK(iio_ida_lock);

dev_t iio_devt;
static dev_t iio_devt;

#define IIO_DEV_MAX 256
struct bus_type iio_bus_type = {
Expand Down Expand Up @@ -276,7 +273,7 @@ static const struct file_operations iio_event_chrdev_fileops = {
.llseek = noop_llseek,
};

int iio_device_get_chrdev_minor(void)
static int iio_device_get_chrdev_minor(void)
{
int ret;

Expand All @@ -287,7 +284,7 @@ int iio_device_get_chrdev_minor(void)
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);
}
Expand Down

0 comments on commit f625cb9

Please sign in to comment.