Commit f8d8c844 authored by Hanna V. Linder's avatar Hanna V. Linder Committed by Greg Kroah-Hartman

[PATCH] add class support to drivers/block/paride/pt.c

This patch adds class support to pt.c which "the high-level driver for parallel
port ATAPI tape drives based on chips supported by the paride module." Which I
dont have in order to test.

I have verified it compiles but can not test it. If someone who has the
hardware could I would appreciate it.
parent 2e615ce1
...@@ -145,6 +145,7 @@ static int (*drives[4])[6] = {&drive0, &drive1, &drive2, &drive3}; ...@@ -145,6 +145,7 @@ static int (*drives[4])[6] = {&drive0, &drive1, &drive2, &drive3};
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mtio.h> #include <linux/mtio.h>
#include <linux/device.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -260,6 +261,9 @@ static struct file_operations pt_fops = { ...@@ -260,6 +261,9 @@ static struct file_operations pt_fops = {
.release = pt_release, .release = pt_release,
}; };
/* sysfs class support */
static struct class_simple *pt_class;
static inline int status_reg(struct pi_adapter *pi) static inline int status_reg(struct pi_adapter *pi)
{ {
return pi_read_regr(pi, 1, 6); return pi_read_regr(pi, 1, 6);
...@@ -959,33 +963,62 @@ static ssize_t pt_write(struct file *filp, const char *buf, size_t count, loff_t ...@@ -959,33 +963,62 @@ static ssize_t pt_write(struct file *filp, const char *buf, size_t count, loff_t
static int __init pt_init(void) static int __init pt_init(void)
{ {
int unit; int unit, err = 0;
if (disable) if (disable) {
return -1; err = -1;
goto out;
}
if (pt_detect()) if (pt_detect()) {
return -1; err = -1;
goto out;
}
if (register_chrdev(major, name, &pt_fops)) { if (register_chrdev(major, name, &pt_fops)) {
printk("pt_init: unable to get major number %d\n", major); printk("pt_init: unable to get major number %d\n", major);
for (unit = 0; unit < PT_UNITS; unit++) for (unit = 0; unit < PT_UNITS; unit++)
if (pt[unit].present) if (pt[unit].present)
pi_release(pt[unit].pi); pi_release(pt[unit].pi);
return -1; err = -1;
goto out;
}
pt_class = class_simple_create(THIS_MODULE, "pt");
if (IS_ERR(pt_class)) {
err = PTR_ERR(pt_class);
goto out_chrdev;
} }
devfs_mk_dir("pt"); devfs_mk_dir("pt");
for (unit = 0; unit < PT_UNITS; unit++) for (unit = 0; unit < PT_UNITS; unit++)
if (pt[unit].present) { if (pt[unit].present) {
devfs_mk_cdev(MKDEV(major, unit), class_simple_device_add(pt_class, MKDEV(major, unit),
NULL, "pt%d", unit);
err = devfs_mk_cdev(MKDEV(major, unit),
S_IFCHR | S_IRUSR | S_IWUSR, S_IFCHR | S_IRUSR | S_IWUSR,
"pt/%d", unit); "pt/%d", unit);
devfs_mk_cdev(MKDEV(major, unit + 128), if (err) {
class_simple_device_remove(MKDEV(major, unit));
goto out_class;
}
class_simple_device_add(pt_class, MKDEV(major, unit + 128),
NULL, "pt%dn", unit);
err = devfs_mk_cdev(MKDEV(major, unit + 128),
S_IFCHR | S_IRUSR | S_IWUSR, S_IFCHR | S_IRUSR | S_IWUSR,
"pt/%dn", unit); "pt/%dn", unit);
if (err) {
class_simple_device_remove(MKDEV(major, unit + 128));
goto out_class;
}
} }
return 0; goto out;
out_class:
class_simple_destroy(pt_class);
out_chrdev:
unregister_chrdev(major, "pt");
out:
return err;
} }
static void __exit pt_exit(void) static void __exit pt_exit(void)
...@@ -993,9 +1026,12 @@ static void __exit pt_exit(void) ...@@ -993,9 +1026,12 @@ static void __exit pt_exit(void)
int unit; int unit;
for (unit = 0; unit < PT_UNITS; unit++) for (unit = 0; unit < PT_UNITS; unit++)
if (pt[unit].present) { if (pt[unit].present) {
class_simple_device_remove(MKDEV(major, unit));
devfs_remove("pt/%d", unit); devfs_remove("pt/%d", unit);
class_simple_device_remove(MKDEV(major, unit + 128));
devfs_remove("pt/%dn", unit); devfs_remove("pt/%dn", unit);
} }
class_simple_destroy(pt_class);
devfs_remove("pt"); devfs_remove("pt");
unregister_chrdev(major, name); unregister_chrdev(major, name);
for (unit = 0; unit < PT_UNITS; unit++) for (unit = 0; unit < PT_UNITS; unit++)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment