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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
scsi
/
ide-scsi.c
diff --git
a/drivers/scsi/ide-scsi.c
b/drivers/scsi/ide-scsi.c
index
2d05c14
..
811c66d
100644
(file)
--- a/
drivers/scsi/ide-scsi.c
+++ b/
drivers/scsi/ide-scsi.c
@@
-717,16
+717,10
@@
static ide_driver_t idescsi_driver = {
.drives = LIST_HEAD_INIT(idescsi_driver.drives),
};
.drives = LIST_HEAD_INIT(idescsi_driver.drives),
};
-static int ide_scsi_warned;
-
static int idescsi_ide_open(struct inode *inode, struct file *filp)
{
ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
drive->usage++;
static int idescsi_ide_open(struct inode *inode, struct file *filp)
{
ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
drive->usage++;
- if (!ide_scsi_warned++) {
- printk(KERN_WARNING "ide-scsi: Warning this device driver is only intended for specialist devices.\n");
- printk(KERN_WARNING "ide-scsi: Do not use for cd burning, use /dev/hdX directly instead.\n");
- }
return 0;
}
return 0;
}
@@
-741,7
+735,7
@@
static int idescsi_ide_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
struct block_device *bdev = inode->i_bdev;
unsigned int cmd, unsigned long arg)
{
struct block_device *bdev = inode->i_bdev;
- return generic_ide_ioctl(
file,
bdev, cmd, arg);
+ return generic_ide_ioctl(bdev, cmd, arg);
}
static struct block_device_operations idescsi_ops = {
}
static struct block_device_operations idescsi_ops = {