git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
char
/
viotape.c
diff --git
a/drivers/char/viotape.c
b/drivers/char/viotape.c
index
b72b204
..
9438512
100644
(file)
--- a/
drivers/char/viotape.c
+++ b/
drivers/char/viotape.c
@@
-49,7
+49,7
@@
#include <asm/uaccess.h>
#include <asm/ioctls.h>
#include <asm/uaccess.h>
#include <asm/ioctls.h>
-
+#include <asm/firmware.h>
#include <asm/vio.h>
#include <asm/iseries/vio.h>
#include <asm/iseries/hv_lp_event.h>
#include <asm/vio.h>
#include <asm/iseries/vio.h>
#include <asm/iseries/hv_lp_event.h>
@@
-442,7
+442,7
@@
static ssize_t viotap_write(struct file *file, const char *buf,
if (op == NULL)
return -ENOMEM;
if (op == NULL)
return -ENOMEM;
- get_dev_info(file->f_dentry->d_inode, &devi);
+ get_dev_info(file->f_
path.
dentry->d_inode, &devi);
/*
* We need to make sure we can send a request. We use
/*
* We need to make sure we can send a request. We use
@@
-532,7
+532,7
@@
static ssize_t viotap_read(struct file *file, char *buf, size_t count,
if (op == NULL)
return -ENOMEM;
if (op == NULL)
return -ENOMEM;
- get_dev_info(file->f_dentry->d_inode, &devi);
+ get_dev_info(file->f_
path.
dentry->d_inode, &devi);
/*
* We need to make sure we can send a request. We use
/*
* We need to make sure we can send a request. We use
@@
-612,7
+612,7
@@
static int viotap_ioctl(struct inode *inode, struct file *file,
if (op == NULL)
return -ENOMEM;
if (op == NULL)
return -ENOMEM;
- get_dev_info(file->f_dentry->d_inode, &devi);
+ get_dev_info(file->f_
path.
dentry->d_inode, &devi);
down(&reqSem);
down(&reqSem);
@@
-777,7
+777,7
@@
static int viotap_open(struct inode *inode, struct file *file)
if (op == NULL)
return -ENOMEM;
if (op == NULL)
return -ENOMEM;
- get_dev_info(file->f_dentry->d_inode, &devi);
+ get_dev_info(file->f_
path.
dentry->d_inode, &devi);
/* Note: We currently only support one mode! */
if ((devi.devno >= viotape_numdev) || (devi.mode)) {
/* Note: We currently only support one mode! */
if ((devi.devno >= viotape_numdev) || (devi.mode)) {
@@
-822,7
+822,7
@@
static int viotap_release(struct inode *inode, struct file *file)
return -ENOMEM;
init_completion(&op->com);
return -ENOMEM;
init_completion(&op->com);
- get_dev_info(file->f_dentry->d_inode, &devi);
+ get_dev_info(file->f_
path.
dentry->d_inode, &devi);
if (devi.devno >= viotape_numdev) {
ret = -ENODEV;
if (devi.devno >= viotape_numdev) {
ret = -ENODEV;
@@
-940,7
+940,6
@@
static void vioHandleTapeEvent(struct HvLpEvent *event)
static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
{
static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
{
- char tapename[32];
int i = vdev->unit_address;
int j;
int i = vdev->unit_address;
int j;
@@
-956,10
+955,9
@@
static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
"iseries!vt%d", i);
class_device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80),
NULL, "iseries!nvt%d", i);
"iseries!vt%d", i);
class_device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80),
NULL, "iseries!nvt%d", i);
- sprintf(tapename, "iseries/vt%d", i);
- printk(VIOTAPE_KERN_INFO "tape %s is iSeries "
+ printk(VIOTAPE_KERN_INFO "tape iseries/vt%d is iSeries "
"resource %10.10s type %4.4s, model %3.3s\n",
"resource %10.10s type %4.4s, model %3.3s\n",
-
tapename
, viotape_unitinfo[i].rsrcname,
+
i
, viotape_unitinfo[i].rsrcname,
viotape_unitinfo[i].type, viotape_unitinfo[i].model);
return 0;
}
viotape_unitinfo[i].type, viotape_unitinfo[i].model);
return 0;
}
@@
-999,6
+997,9
@@
int __init viotap_init(void)
int ret;
struct proc_dir_entry *e;
int ret;
struct proc_dir_entry *e;
+ if (!firmware_has_feature(FW_FEATURE_ISERIES))
+ return -ENODEV;
+
op_struct_list = NULL;
if ((ret = add_op_structs(VIOTAPE_MAXREQ)) < 0) {
printk(VIOTAPE_KERN_WARN "couldn't allocate op structs\n");
op_struct_list = NULL;
if ((ret = add_op_structs(VIOTAPE_MAXREQ)) < 0) {
printk(VIOTAPE_KERN_WARN "couldn't allocate op structs\n");