1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-15 10:17:20 +00:00

Clean up some unused variables.

Reviewed by:	ken
Submitted by:	phk
This commit is contained in:
Kenneth D. Merry 1998-10-15 17:46:26 +00:00
parent 434bf653d2
commit 11021a1ab5
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=40398
7 changed files with 8 additions and 30 deletions

View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: cam_periph.c,v 1.3 1998/09/29 09:18:08 bde Exp $
* $Id: cam_periph.c,v 1.4 1998/10/13 21:41:32 ken Exp $
*/
#include <sys/param.h>
@ -264,7 +264,6 @@ camperiphnextunit(struct periph_driver *p_drv, u_int newunit, int wired)
struct cam_periph *periph;
struct cam_periph_config *periph_conf;
char *periph_name;
u_int i;
int s;
s = splsoftcam();
@ -441,7 +440,6 @@ int
cam_periph_lock(struct cam_periph *periph, int priority)
{
int error;
int s;
while ((periph->flags & CAM_PERIPH_LOCKED) != 0) {
periph->flags |= CAM_PERIPH_LOCK_WANTED;

View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: cam_xpt.c,v 1.21 1998/10/14 21:17:39 ken Exp $
* $Id: cam_xpt.c,v 1.22 1998/10/14 22:51:51 ken Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
@ -953,7 +953,6 @@ xptioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
int base_periph_found;
int splbreaknum;
int s;
int i;
ccb = (union ccb *)addr;
unit = ccb->cgdl.unit_number;
@ -1846,7 +1845,6 @@ xptedtdevicefunc(struct cam_ed *device, void *arg)
struct ccb_dev_match *cdm;
dev_match_ret retval;
u_int dev_gen;
cdm = (struct ccb_dev_match *)arg;
@ -2933,7 +2931,6 @@ xpt_action(union ccb *start_ccb)
if ((crs->release_flags & RELSIM_ADJUST_OPENINGS) != 0) {
if ((dev->inq_data.flags & SID_CmdQue) != 0) {
int reduction;
/* Don't ever go below one opening */
if (crs->openings > 0) {
@ -4729,7 +4726,6 @@ static void
xpt_scan_lun(struct cam_periph *periph, struct cam_path *path,
cam_flags flags, union ccb *request_ccb)
{
u_int32_t unit;
cam_status status;
struct cam_path *new_path;
struct cam_periph *old_periph;
@ -5538,7 +5534,6 @@ static void
xpt_config(void *arg)
{
/* Now that interrupts are enabled, go find our devices */
struct cam_eb *bus;
#ifdef CAMDEBUG
/* Setup debugging flags and path */
@ -5631,11 +5626,6 @@ static void
xpt_finishconfig(struct cam_periph *periph, union ccb *done_ccb)
{
struct periph_driver **p_drv;
struct cam_eb *bus;
struct cam_et *target;
struct cam_ed *dev;
struct cam_periph *nperiph;
struct periph_list *periph_head;
int i;
if (done_ccb != NULL) {

View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: scsi_cd.c,v 1.5 1998/10/07 02:57:57 ken Exp $
* $Id: scsi_cd.c,v 1.6 1998/10/12 17:02:37 ken Exp $
*/
/*
* Portions of this driver taken from the original FreeBSD cd driver.
@ -558,7 +558,6 @@ cdasync(void *callback_arg, u_int32_t code,
static cam_status
cdregister(struct cam_periph *periph, void *arg)
{
int s;
struct cd_softc *softc;
struct ccb_setasync csa;
struct ccb_getdev *cgd;
@ -1102,7 +1101,6 @@ cdschedule(struct cam_periph *periph, int priority)
static void
cdrunchangerqueue(void *arg)
{
struct timeval cur_time, busy_time;
struct cd_softc *softc;
struct cdchanger *changer;
int called_from_timeout;
@ -1449,8 +1447,6 @@ cdstart(struct cam_periph *periph, union ccb *start_ccb)
struct buf *bp;
struct ccb_scsiio *csio;
struct scsi_read_capacity_data *rcap;
struct partition *p;
u_int32_t blkno, nblk;
int s;
softc = (struct cd_softc *)periph->softc;

View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: scsi_ch.c,v 1.2 1998/10/02 05:25:49 ken Exp $
* $Id: scsi_ch.c,v 1.3 1998/10/02 21:20:21 ken Exp $
*/
/*
* Derived from the NetBSD SCSI changer driver.
@ -380,7 +380,6 @@ chasync(void *callback_arg, u_int32_t code, struct cam_path *path, void *arg)
static cam_status
chregister(struct cam_periph *periph, void *arg)
{
int s;
struct ch_softc *softc;
struct ccb_setasync csa;
struct ccb_getdev *cgd;

View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: scsi_pass.c,v 1.1 1998/09/15 06:36:34 gibbs Exp $
* $Id: scsi_pass.c,v 1.2 1998/09/16 00:11:53 ken Exp $
*/
#include <sys/param.h>
@ -306,7 +306,6 @@ passasync(void *callback_arg, u_int32_t code,
static cam_status
passregister(struct cam_periph *periph, void *arg)
{
int s;
struct pass_softc *softc;
struct ccb_setasync csa;
struct ccb_getdev *cgd;
@ -702,7 +701,6 @@ passioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
static int
passsendccb(struct cam_periph *periph, union ccb *ccb, union ccb *inccb)
{
struct buf *bp[2];
struct pass_softc *softc;
struct cam_periph_map_info mapinfo;
int error, need_unmap;

View File

@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: scsi_pt.c,v 1.1 1998/09/15 06:36:34 gibbs Exp $
*/
#include <sys/param.h>
@ -176,7 +176,6 @@ ptclose(dev_t dev, int flag, int fmt, struct proc *p)
{
struct cam_periph *periph;
struct pt_softc *softc;
union ccb *ccb;
int unit;
int error;
@ -318,7 +317,6 @@ ptinit(void)
static cam_status
ptctor(struct cam_periph *periph, void *arg)
{
int s;
struct pt_softc *softc;
struct ccb_setasync csa;
struct ccb_getdev *cgd;

View File

@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: scsi_sa.c,v 1.1 1998/09/15 06:36:34 gibbs Exp $
* $Id: scsi_sa.c,v 1.2 1998/10/02 05:15:27 ken Exp $
*/
#include <sys/param.h>
@ -810,7 +810,6 @@ saasync(void *callback_arg, u_int32_t code,
static cam_status
saregister(struct cam_periph *periph, void *arg)
{
int s;
struct sa_softc *softc;
struct ccb_setasync csa;
struct ccb_getdev *cgd;
@ -1121,7 +1120,7 @@ samount(struct cam_periph *periph)
if ((softc->flags & SA_FLAG_TAPE_MOUNTED) == 0) {
struct scsi_read_block_limits_data *rblim;
int buff_mode, comp_enabled, comp_supported;
int comp_enabled, comp_supported;
u_int8_t write_protect;
/*