mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

staging: iio: Move from class to bus

Browse source 
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 2010-05-04 14:43:00 +01:00 committed by Greg Kroah-Hartman
parent e5c003ae82
commit 5aaaeba82e
5 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/iio/iio.h
View file

@ -377,7 +377,7 @@ void iio_deallocate_chrdev(struct iio_handler *handler);
#define IIO_UNSIGNED(a) (a) #define IIO_UNSIGNED(a) (a)
extern dev_t iio_devt; extern dev_t iio_devt;
extern struct class iio_class; extern struct bus_type iio_bus_type;
/** /**
* iio_put_device() - reference counted deallocation of struct device * iio_put_device() - reference counted deallocation of struct device

28
drivers/staging/iio/industrialio-core.c
View file

@ -42,16 +42,10 @@ dev_t iio_devt;
EXPORT_SYMBOL(iio_devt); EXPORT_SYMBOL(iio_devt);
#define IIO_DEV_MAX 256 #define IIO_DEV_MAX 256
static char *iio_devnode(struct device *dev, mode_t *mode) struct bus_type iio_bus_type = {
{
return kasprintf(GFP_KERNEL, "iio/%s", dev_name(dev));
}
struct class iio_class = {
.name = "iio", .name = "iio",
.devnode = iio_devnode,
}; };
EXPORT_SYMBOL(iio_class); EXPORT_SYMBOL(iio_bus_type);
void __iio_change_event(struct iio_detected_event_list *ev, void __iio_change_event(struct iio_detected_event_list *ev,
int ev_code, int ev_code,
@ -405,7 +399,7 @@ int iio_setup_ev_int(struct iio_event_interface *ev_int,
{ {
int ret, minor; int ret, minor;
ev_int->dev.class = &iio_class; ev_int->dev.bus = &iio_bus_type;
ev_int->dev.parent = dev; ev_int->dev.parent = dev;
ev_int->dev.type = &iio_event_type; ev_int->dev.type = &iio_event_type;
device_initialize(&ev_int->dev); device_initialize(&ev_int->dev);
@ -478,23 +472,23 @@ static int __init iio_init(void)
{ {
int ret; int ret;
/* Create sysfs class */ /* Register sysfs bus */
ret = class_register(&iio_class); ret = bus_register(&iio_bus_type);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR printk(KERN_ERR
"%s could not create sysfs class\n", "%s could not register bus type\n",
__FILE__); __FILE__);
goto error_nothing; goto error_nothing;
} }
ret = iio_dev_init(); ret = iio_dev_init();
if (ret < 0) if (ret < 0)
goto error_unregister_class; goto error_unregister_bus_type;
return 0; return 0;
error_unregister_class: error_unregister_bus_type:
class_unregister(&iio_class); bus_unregister(&iio_bus_type);
error_nothing: error_nothing:
return ret; return ret;
} }
@ -502,7 +496,7 @@ static int __init iio_init(void)
static void __exit iio_exit(void) static void __exit iio_exit(void)
{ {
iio_dev_exit(); iio_dev_exit();
class_unregister(&iio_class); bus_unregister(&iio_bus_type);
} }
static int iio_device_register_sysfs(struct iio_dev *dev_info) static int iio_device_register_sysfs(struct iio_dev *dev_info)
@ -768,7 +762,7 @@ struct iio_dev *iio_allocate_device(void)
if (dev) { if (dev) {
dev->dev.type = &iio_dev_type; dev->dev.type = &iio_dev_type;
dev->dev.class = &iio_class; dev->dev.bus = &iio_bus_type;
device_initialize(&dev->dev); device_initialize(&dev->dev);
dev_set_drvdata(&dev->dev, (void *)dev); dev_set_drvdata(&dev->dev, (void *)dev);
mutex_init(&dev->mlock); mutex_init(&dev->mlock);

2
drivers/staging/iio/industrialio-ring.c
View file

@ -210,7 +210,7 @@ __iio_request_ring_buffer_access_chrdev(struct iio_ring_buffer *buf,
buf->access_handler.flags = 0; buf->access_handler.flags = 0;
buf->access_dev.parent = &buf->dev; buf->access_dev.parent = &buf->dev;
buf->access_dev.class = &iio_class; buf->access_dev.bus = &iio_bus_type;
buf->access_dev.type = &iio_ring_access_type; buf->access_dev.type = &iio_ring_access_type;
device_initialize(&buf->access_dev); device_initialize(&buf->access_dev);

2
drivers/staging/iio/industrialio-trigger.c
View file

@ -365,7 +365,7 @@ struct iio_trigger *iio_allocate_trigger(void)
trig = kzalloc(sizeof *trig, GFP_KERNEL); trig = kzalloc(sizeof *trig, GFP_KERNEL);
if (trig) { if (trig) {
trig->dev.type = &iio_trig_type; trig->dev.type = &iio_trig_type;
trig->dev.class = &iio_class; trig->dev.bus = &iio_bus_type;
device_initialize(&trig->dev); device_initialize(&trig->dev);
dev_set_drvdata(&trig->dev, (void *)trig); dev_set_drvdata(&trig->dev, (void *)trig);
spin_lock_init(&trig->pollfunc_list_lock); spin_lock_init(&trig->pollfunc_list_lock);

2
drivers/staging/iio/ring_sw.c
View file

@ -419,7 +419,7 @@ struct iio_ring_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev)
buf->dev.type = &iio_sw_ring_type; buf->dev.type = &iio_sw_ring_type;
device_initialize(&buf->dev); device_initialize(&buf->dev);
buf->dev.parent = &indio_dev->dev; buf->dev.parent = &indio_dev->dev;
buf->dev.class = &iio_class; buf->dev.bus = &iio_bus_type;
dev_set_drvdata(&buf->dev, (void *)buf); dev_set_drvdata(&buf->dev, (void *)buf);
return buf; return buf;