projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[powerpc.git]
/
drivers
/
block
/
acsi_slm.c
diff --git
a/drivers/block/acsi_slm.c
b/drivers/block/acsi_slm.c
index
a5c1c8e
..
4030a8f
100644
(file)
--- a/
drivers/block/acsi_slm.c
+++ b/
drivers/block/acsi_slm.c
@@
-65,7
+65,6
@@
not be guaranteed. There are several ways to assure this:
#include <linux/time.h>
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/mm.h>
#include <linux/slab.h>
-#include <linux/devfs_fs_kernel.h>
#include <linux/smp_lock.h>
#include <asm/pgtable.h>
#include <linux/smp_lock.h>
#include <asm/pgtable.h>
@@
-369,8
+368,6
@@
static ssize_t slm_read( struct file *file, char *buf, size_t count,
int length;
int end;
int length;
int end;
- if (count < 0)
- return( -EINVAL );
if (!(page = __get_free_page( GFP_KERNEL )))
return( -ENOMEM );
if (!(page = __get_free_page( GFP_KERNEL )))
return( -ENOMEM );
@@
-1007,11
+1004,6
@@
int slm_init( void )
BufferP = SLMBuffer;
SLMState = IDLE;
BufferP = SLMBuffer;
SLMState = IDLE;
- devfs_mk_dir("slm");
- for (i = 0; i < MAX_SLM; i++) {
- devfs_mk_cdev(MKDEV(ACSI_MAJOR, i),
- S_IFCHR|S_IRUSR|S_IWUSR, "slm/%d", i);
- }
return 0;
}
return 0;
}
@@
-1034,10
+1026,6
@@
int init_module(void)
void cleanup_module(void)
{
void cleanup_module(void)
{
- int i;
- for (i = 0; i < MAX_SLM; i++)
- devfs_remove("slm/%d", i);
- devfs_remove("slm");
if (unregister_chrdev( ACSI_MAJOR, "slm" ) != 0)
printk( KERN_ERR "acsi_slm: cleanup_module failed\n");
atari_stram_free( SLMBuffer );
if (unregister_chrdev( ACSI_MAJOR, "slm" ) != 0)
printk( KERN_ERR "acsi_slm: cleanup_module failed\n");
atari_stram_free( SLMBuffer );