diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /drivers/ap1000 | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'drivers/ap1000')
| -rw-r--r-- | drivers/ap1000/ap.c | 8 | ||||
| -rw-r--r-- | drivers/ap1000/ddv.c | 6 | ||||
| -rw-r--r-- | drivers/ap1000/ringbuf.c | 19 |
3 files changed, 7 insertions, 26 deletions
diff --git a/drivers/ap1000/ap.c b/drivers/ap1000/ap.c index 64340beda..d7ac5cac4 100644 --- a/drivers/ap1000/ap.c +++ b/drivers/ap1000/ap.c @@ -53,7 +53,7 @@ static void ap_release(struct inode * inode, struct file * filp) MOD_DEC_USE_COUNT; } -static void ap_request(void) +static void ap_request(request_queue_t * q) { struct cap_request creq; unsigned int minor; @@ -160,7 +160,7 @@ void ap_complete(struct cap_request *creq) #endif end_request(1); request_count--; - ap_request(); + ap_request(NULL); } @@ -271,7 +271,7 @@ int ap_init(void) return -1; } printk("ap_init: register dev %d\n", MAJOR_NR); - blk_dev[MAJOR_NR].request_fn = &ap_request; + blk_init_queue(BLK_DEFAULT_QUEUE(MAJOR_NR), &ap_request); for (i=0;i<NUM_APDEVS;i++) { ap_blocksizes[i] = AP_BLOCK_SIZE; @@ -307,7 +307,7 @@ void cleanup_module(void) invalidate_buffers(MKDEV(MAJOR_NR, i)); unregister_blkdev( MAJOR_NR, "apblock" ); - blk_dev[MAJOR_NR].request_fn = 0; + blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR)); } #endif /* MODULE */ diff --git a/drivers/ap1000/ddv.c b/drivers/ap1000/ddv.c index f868076d3..ecfcca621 100644 --- a/drivers/ap1000/ddv.c +++ b/drivers/ap1000/ddv.c @@ -620,7 +620,7 @@ static void ddv_request1(void) } -static void ddv_request(void) +static void ddv_request(request_queue_t * q) { cli(); ddv_request1(); @@ -932,7 +932,7 @@ int ddv_init(void) } printk("ddv_init: register dev %d\n", MAJOR_NR); - blk_dev[MAJOR_NR].request_fn = DEVICE_REQUEST; + blk_init_queue(BLK_DEFAULT_QUEUE(MAJOR_NR), DEVICE_REQUEST); read_ahead[MAJOR_NR] = DDV_READ_AHEAD; bif_add_debug_key('d',ddv_status,"DDV status"); @@ -1016,7 +1016,7 @@ void cleanup_module(void) if (*gdp) *gdp = (*gdp)->next; free_irq(APOPT0_IRQ, NULL); - blk_dev[MAJOR_NR].request_fn = 0; + blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR)); } #endif /* MODULE */ diff --git a/drivers/ap1000/ringbuf.c b/drivers/ap1000/ringbuf.c index 49c716732..8acb617b6 100644 --- a/drivers/ap1000/ringbuf.c +++ b/drivers/ap1000/ringbuf.c @@ -308,23 +308,4 @@ static struct file_operations proc_ringbuf_operations = { struct inode_operations proc_ringbuf_inode_operations = { &proc_ringbuf_operations, /* default base directory file-ops */ - NULL, /* create */ - NULL, /* lookup */ - NULL, /* link */ - NULL, /* unlink */ - NULL, /* symlink */ - NULL, /* mkdir */ - NULL, /* rmdir */ - NULL, /* mknod */ - NULL, /* rename */ - NULL, /* readlink */ - NULL, /* follow_link */ - NULL, /* get_block */ - NULL, /* readpage */ - NULL, /* writepage */ - NULL, /* flushpage */ - NULL, /* truncate */ - NULL, /* permission */ - NULL, /* smap */ - NULL /* revalidate */ }; |