From 98124a8082ad238ab33c6ecb881a93d023a069cc Mon Sep 17 00:00:00 2001 From: Jorrit Herder Date: Thu, 25 Aug 2005 12:50:11 +0000 Subject: [PATCH] Cleanup with gcc. --- drivers/libdriver/driver.c | 5 ++--- drivers/libdriver/drvlib.c | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/libdriver/driver.c b/drivers/libdriver/driver.c index 1bd8046eb..44c658100 100644 --- a/drivers/libdriver/driver.c +++ b/drivers/libdriver/driver.c @@ -77,7 +77,6 @@ struct driver *dp; /* Device dependent entry points. */ int r, proc_nr; message mess; - int s, p; /* Get a DMA buffer. */ init_buffer(); @@ -208,7 +207,6 @@ message *mp; /* pointer to read or write message */ */ static iovec_t iovec[NR_IOREQS]; iovec_t *iov; - phys_bytes iovec_phys, user_iovec_phys; phys_bytes iovec_size; unsigned nr_req; int r; @@ -318,6 +316,7 @@ PUBLIC void nop_cleanup() PUBLIC int nop_cancel(struct driver *dr, message *m) { /* Nothing to do for cancel. */ + return(OK); } /*===========================================================================* @@ -326,6 +325,7 @@ PUBLIC int nop_cancel(struct driver *dr, message *m) PUBLIC int nop_select(struct driver *dr, message *m) { /* Nothing to do for select. */ + return(OK); } /*============================================================================* @@ -337,7 +337,6 @@ message *mp; /* pointer to ioctl request */ { /* Carry out a partition setting/getting request. */ struct device *dv; - phys_bytes user_phys, entry_phys; struct partition entry; int s; diff --git a/drivers/libdriver/drvlib.c b/drivers/libdriver/drvlib.c index 70176f27a..31c165d32 100644 --- a/drivers/libdriver/drvlib.c +++ b/drivers/libdriver/drvlib.c @@ -160,7 +160,6 @@ int *io_ok; */ iovec_t iovec1; off_t position; - int s; if(io_ok) *io_ok = 0; @@ -197,7 +196,6 @@ struct part_entry *table; /* four entries */ iovec_t iovec1; off_t position; off_t isosize; - int s; #ifndef CD_SECTOR_SIZE #define CD_SECTOR_SIZE 2048 #endif -- 2.44.0