diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /drivers/pnp | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/isapnp.c | 2 | ||||
| -rw-r--r-- | drivers/pnp/isapnp_proc.c | 34 |
2 files changed, 9 insertions, 27 deletions
diff --git a/drivers/pnp/isapnp.c b/drivers/pnp/isapnp.c index 073248758..8f3a6e1d8 100644 --- a/drivers/pnp/isapnp.c +++ b/drivers/pnp/isapnp.c @@ -241,7 +241,7 @@ void isapnp_deactivate(unsigned char logdev) static void __init isapnp_peek(unsigned char *data, int bytes) { int i, j; - unsigned char d; + unsigned char d=0; for (i = 1; i <= bytes; i++) { for (j = 0; j < 10; j++) { diff --git a/drivers/pnp/isapnp_proc.c b/drivers/pnp/isapnp_proc.c index a26670fc7..d9f73819f 100644 --- a/drivers/pnp/isapnp_proc.c +++ b/drivers/pnp/isapnp_proc.c @@ -202,19 +202,12 @@ static unsigned int isapnp_info_entry_poll(struct file *file, poll_table * wait) static struct file_operations isapnp_info_entry_operations = { - isapnp_info_entry_lseek, /* lseek */ - isapnp_info_entry_read, /* read */ - isapnp_info_entry_write, /* write */ - NULL, /* readdir */ - isapnp_info_entry_poll, /* poll */ - NULL, /* ioctl - default */ - NULL, /* mmap */ - isapnp_info_entry_open, /* open */ - NULL, /* flush */ - isapnp_info_entry_release, /* release */ - NULL, /* can't fsync */ - NULL, /* fasync */ - NULL, /* lock */ + llseek: isapnp_info_entry_lseek, + read: isapnp_info_entry_read, + write: isapnp_info_entry_write, + poll: isapnp_info_entry_poll, + open: isapnp_info_entry_open, + release: isapnp_info_entry_release, }; static struct inode_operations isapnp_info_entry_inode_operations = @@ -277,19 +270,8 @@ static ssize_t isapnp_proc_bus_read(struct file *file, char *buf, size_t nbytes, static struct file_operations isapnp_proc_bus_file_operations = { - isapnp_proc_bus_lseek, /* lseek */ - isapnp_proc_bus_read, /* read */ - NULL, /* write */ - NULL, /* readdir */ - NULL, /* poll */ - NULL, /* ioctl - default */ - NULL, /* mmap */ - NULL, /* open */ - NULL, /* flush */ - NULL, /* release */ - NULL, /* can't fsync */ - NULL, /* fasync */ - NULL, /* lock */ + llseek: isapnp_proc_bus_lseek, + read: isapnp_proc_bus_read, }; static struct inode_operations isapnp_proc_bus_inode_operations = |