Author: marius
Date: Sun Jun 9 12:46:41 2013
New Revision: 251568
URL: http://svnweb.freebsd.org/changeset/base/251568
Log:
MFC: r251115
- Remove pointless returns.
- Make cm_data a void pointer and cm_flags unsigned as appropriate.
Modified:
stable/9/sys/dev/aac/aac.c
stable/9/sys/dev/aac/aac_cam.c
stable/9/sys/dev/aac/aac_disk.c
stable/9/sys/dev/aac/aacvar.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/aac/aac.c
==============================================================================
--- stable/9/sys/dev/aac/aac.c Sun Jun 9 12:39:21 2013 (r251567)
+++ stable/9/sys/dev/aac/aac.c Sun Jun 9 12:46:41 2013 (r251568)
@@ -379,8 +379,6 @@ aac_add_event(struct aac_softc *sc, stru
event->ev_type);
break;
}
-
- return;
}
/*
@@ -1631,8 +1629,6 @@ aac_map_command_sg(void *arg, bus_dma_se
aac_requeue_ready(cm);
}
}
-
- return;
}
/*
@@ -2362,7 +2358,6 @@ aac_timeout(struct aac_softc *sc)
"longer running! code= 0x%x\n", code);
}
}
- return;
}
/*
@@ -3372,8 +3367,6 @@ aac_handle_aif(struct aac_softc *sc, str
/* Wakeup any poll()ers */
selwakeuppri(&sc->rcv_select, PRIBIO);
mtx_unlock(&sc->aac_aifq_lock);
-
- return;
}
/*
@@ -3788,6 +3781,4 @@ aac_get_bus_info(struct aac_softc *sc)
if (found)
bus_generic_attach(sc->aac_dev);
-
- return;
}
Modified: stable/9/sys/dev/aac/aac_cam.c
==============================================================================
--- stable/9/sys/dev/aac/aac_cam.c Sun Jun 9 12:39:21 2013
(r251567)
+++ stable/9/sys/dev/aac/aac_cam.c Sun Jun 9 12:46:41 2013
(r251568)
@@ -163,8 +163,6 @@ aac_cam_event(struct aac_softc *sc, stru
event->ev_type);
break;
}
-
- return;
}
static int
@@ -513,8 +511,6 @@ aac_cam_action(struct cam_sim *sim, unio
aac_enqueue_ready(cm);
aac_startio(cm->cm_sc);
-
- return;
}
static void
@@ -623,8 +619,6 @@ aac_cam_complete(struct aac_command *cm)
aac_release_command(cm);
xpt_done(ccb);
-
- return;
}
static u_int32_t
Modified: stable/9/sys/dev/aac/aac_disk.c
==============================================================================
--- stable/9/sys/dev/aac/aac_disk.c Sun Jun 9 12:39:21 2013
(r251567)
+++ stable/9/sys/dev/aac/aac_disk.c Sun Jun 9 12:46:41 2013
(r251568)
@@ -167,8 +167,6 @@ aac_disk_strategy(struct bio *bp)
mtx_lock(&sc->ad_controller->aac_io_lock);
aac_submit_bio(bp);
mtx_unlock(&sc->ad_controller->aac_io_lock);
-
- return;
}
/*
Modified: stable/9/sys/dev/aac/aacvar.h
==============================================================================
--- stable/9/sys/dev/aac/aacvar.h Sun Jun 9 12:39:21 2013
(r251567)
+++ stable/9/sys/dev/aac/aacvar.h Sun Jun 9 12:46:41 2013
(r251568)
@@ -158,13 +158,13 @@ struct aac_command
struct aac_fib *cm_fib; /* FIB associated with this
* command */
u_int64_t cm_fibphys; /* bus address of the FIB */
- struct bio *cm_data; /* pointer to data in kernel
+ void *cm_data; /* pointer to data in kernel
* space */
u_int32_t cm_datalen; /* data length */
bus_dmamap_t cm_datamap; /* DMA map for bio data */
struct aac_sg_table *cm_sgtable; /* pointer to s/g table in
* command */
- int cm_flags;
+ u_int cm_flags;
#define AAC_CMD_MAPPED (1<<0) /* command has had its data
* mapped */
#define AAC_CMD_DATAIN (1<<1) /* command involves data moving
@@ -182,7 +182,7 @@ struct aac_command
#define AAC_QUEUE_FRZN (1<<9) /* Freeze the processing of
* commands on the queue. */
- void (* cm_complete)(struct aac_command *cm);
+ void (*cm_complete)(struct aac_command *cm);
void *cm_private;
time_t cm_timestamp; /* command creation time */
int cm_queue;
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
