diff options
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/cmd64x.c | 2 | ||||
| -rw-r--r-- | drivers/block/swim3.c | 40 | ||||
| -rw-r--r-- | drivers/block/swim_iop.c | 38 |
3 files changed, 1 insertions, 79 deletions
diff --git a/drivers/block/cmd64x.c b/drivers/block/cmd64x.c index 6346f216e..8f5f04aea 100644 --- a/drivers/block/cmd64x.c +++ b/drivers/block/cmd64x.c @@ -7,7 +7,7 @@ * on the 646U2 and not on the 646U. * * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) - * Copyright (C) 1998 David S. Miller (davem@dm.cobaltmicro.com) + * Copyright (C) 1998 David S. Miller (davem@redhat.com) * Copyright (C) 1999 Andre Hedrick (andre@suse.com) */ diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index 3190c10b9..911bafe23 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c @@ -241,10 +241,6 @@ static int floppy_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long param); static int floppy_open(struct inode *inode, struct file *filp); static int floppy_release(struct inode *inode, struct file *filp); -static ssize_t floppy_read(struct file *filp, char *buf, - size_t count, loff_t *ppos); -static ssize_t floppy_write(struct file *filp, const char *buf, - size_t count, loff_t *ppos); static int floppy_check_change(kdev_t dev); static int floppy_revalidate(kdev_t dev); static int swim3_add_device(struct device_node *swims); @@ -988,42 +984,6 @@ static int floppy_revalidate(kdev_t dev) return ret; } -static ssize_t floppy_read(struct file *filp, char *buf, - size_t count, loff_t *ppos) -{ - struct inode *inode = filp->f_dentry->d_inode; - struct floppy_state *fs; - int devnum = MINOR(inode->i_rdev); - - if (devnum >= floppy_count) - return -ENODEV; - - fs = &floppy_states[devnum]; - if (fs->ejected) - return -ENXIO; - return block_read(filp, buf, count, ppos); -} - -static ssize_t floppy_write(struct file * filp, const char * buf, - size_t count, loff_t *ppos) -{ - struct inode * inode = filp->f_dentry->d_inode; - struct floppy_state *fs; - int devnum = MINOR(inode->i_rdev); - - if (devnum >= floppy_count) - return -ENODEV; - check_disk_change(inode->i_rdev); - fs = &floppy_states[devnum]; - if (fs->ejected) - return -ENXIO; - if (fs->write_prot < 0) - fs->write_prot = swim3_readbit(fs, WRITE_PROT); - if (fs->write_prot) - return -EROFS; - return block_write(filp, buf, count, ppos); -} - static void floppy_off(unsigned int nr) { } diff --git a/drivers/block/swim_iop.c b/drivers/block/swim_iop.c index 6a74f9a0b..467cda26d 100644 --- a/drivers/block/swim_iop.c +++ b/drivers/block/swim_iop.c @@ -102,10 +102,6 @@ static void swimiop_receive(struct iop_msg *, struct pt_regs *); static void swimiop_status_update(int, struct swim_drvstatus *); static int swimiop_eject(struct floppy_state *fs); -static ssize_t floppy_read(struct file *filp, char *buf, - size_t count, loff_t *ppos); -static ssize_t floppy_write(struct file *filp, const char *buf, - size_t count, loff_t *ppos); static int floppy_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long param); static int floppy_open(struct inode *inode, struct file *filp); @@ -338,40 +334,6 @@ static int swimiop_eject(struct floppy_state *fs) return cmd->error; } -static ssize_t floppy_read(struct file *filp, char *buf, - size_t count, loff_t *ppos) -{ - struct inode *inode = filp->f_dentry->d_inode; - struct floppy_state *fs; - int devnum = MINOR(inode->i_rdev); - - if (devnum >= floppy_count) - return -ENODEV; - - fs = &floppy_states[devnum]; - if (fs->ejected) - return -ENXIO; - return block_read(filp, buf, count, ppos); -} - -static ssize_t floppy_write(struct file * filp, const char * buf, - size_t count, loff_t *ppos) -{ - struct inode * inode = filp->f_dentry->d_inode; - struct floppy_state *fs; - int devnum = MINOR(inode->i_rdev); - - if (devnum >= floppy_count) - return -ENODEV; - check_disk_change(inode->i_rdev); - fs = &floppy_states[devnum]; - if (fs->ejected) - return -ENXIO; - if (fs->write_prot) - return -EROFS; - return block_write(filp, buf, count, ppos); -} - static struct floppy_struct floppy_type = { 2880,18,2,80,0,0x1B,0x00,0xCF,0x6C,NULL }; /* 7 1.44MB 3.5" */ |