Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268146
b: refs/heads/master
c: f625cb9
h: refs/heads/master
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Sep 6, 2011
1 parent 468b736 commit 2d633fb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1aa042783251c27a93e31929c24647729db326d4
refs/heads/master: f625cb97d4d58f311a9606a4bcf9d9a334ca9952
9 changes: 0 additions & 9 deletions trunk/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 trunk/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 2d633fb

Please sign in to comment.