projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] cirrus ep93xx watchdog driver
[powerpc.git]
/
drivers
/
char
/
viotape.c
diff --git
a/drivers/char/viotape.c
b/drivers/char/viotape.c
index
0aff45f
..
60aabdb
100644
(file)
--- a/
drivers/char/viotape.c
+++ b/
drivers/char/viotape.c
@@
-29,10
+29,9
@@
*
* All tape operations are performed by sending messages back and forth to
* the OS/400 partition. The format of the messages is defined in
*
* All tape operations are performed by sending messages back and forth to
* the OS/400 partition. The format of the messages is defined in
- * i
S
eries/vio.h
+ * i
s
eries/vio.h
*/
#include <linux/config.h>
*/
#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@
-54,10
+53,10
@@
#include <asm/ioctls.h>
#include <asm/vio.h>
#include <asm/ioctls.h>
#include <asm/vio.h>
-#include <asm/i
S
eries/vio.h>
-#include <asm/i
Series/HvLpE
vent.h>
-#include <asm/i
Series/HvCallE
vent.h>
-#include <asm/i
Series/HvLpC
onfig.h>
+#include <asm/i
s
eries/vio.h>
+#include <asm/i
series/hv_lp_e
vent.h>
+#include <asm/i
series/hv_call_e
vent.h>
+#include <asm/i
series/hv_lp_c
onfig.h>
#define VIOTAPE_VERSION "1.2"
#define VIOTAPE_MAXREQ 1
#define VIOTAPE_VERSION "1.2"
#define VIOTAPE_MAXREQ 1
@@
-956,9
+955,9
@@
static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
state[i].cur_part = 0;
for (j = 0; j < MAX_PARTITIONS; ++j)
state[i].part_stat_rwi[j] = VIOT_IDLE;
state[i].cur_part = 0;
for (j = 0; j < MAX_PARTITIONS; ++j)
state[i].part_stat_rwi[j] = VIOT_IDLE;
- class_device_create(tape_class, MKDEV(VIOTAPE_MAJOR, i), NULL,
+ class_device_create(tape_class,
NULL,
MKDEV(VIOTAPE_MAJOR, i), NULL,
"iseries!vt%d", i);
"iseries!vt%d", i);
- class_device_create(tape_class, MKDEV(VIOTAPE_MAJOR, i | 0x80),
+ class_device_create(tape_class,
NULL,
MKDEV(VIOTAPE_MAJOR, i | 0x80),
NULL, "iseries!nvt%d", i);
devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i), S_IFCHR | S_IRUSR | S_IWUSR,
"iseries/vt%d", i);
NULL, "iseries!nvt%d", i);
devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i), S_IFCHR | S_IRUSR | S_IWUSR,
"iseries/vt%d", i);
@@
-993,13
+992,16
@@
static struct vio_device_id viotape_device_table[] __devinitdata = {
{ "viotape", "" },
{ "", "" }
};
{ "viotape", "" },
{ "", "" }
};
-
MODULE_DEVICE_TABLE(vio, viotape_device_table);
MODULE_DEVICE_TABLE(vio, viotape_device_table);
+
static struct vio_driver viotape_driver = {
static struct vio_driver viotape_driver = {
- .name = "viotape",
.id_table = viotape_device_table,
.probe = viotape_probe,
.id_table = viotape_device_table,
.probe = viotape_probe,
- .remove = viotape_remove
+ .remove = viotape_remove,
+ .driver = {
+ .name = "viotape",
+ .owner = THIS_MODULE,
+ }
};
};