2 files changed, 14 insertions, 34 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 342f77966a5b..b6266fd31688 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -3762,11 +3762,8 @@ ahd_construct_sdtr(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
 {
         if (offset == 0)
                 period = AHD_ASYNC_XFER_PERIOD;
-        ahd->msgout_buf[ahd->msgout_index++] = MSG_EXTENDED;
-        ahd->msgout_buf[ahd->msgout_index++] = MSG_EXT_SDTR_LEN;
-        ahd->msgout_buf[ahd->msgout_index++] = MSG_EXT_SDTR;
-        ahd->msgout_buf[ahd->msgout_index++] = period;
-        ahd->msgout_buf[ahd->msgout_index++] = offset;
+        ahd->msgout_index += spi_populate_sync_msg(
+                        ahd->msgout_buf + ahd->msgout_index, period, offset);
         ahd->msgout_len += 5;
         if (bootverbose) {
                 printf("(%s:%c:%d:%d): Sending SDTR period %x, offset %x\n",
@@ -3783,10 +3780,8 @@ static void
 ahd_construct_wdtr(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                    u_int bus_width)
 {
-        ahd->msgout_buf[ahd->msgout_index++] = MSG_EXTENDED;
-        ahd->msgout_buf[ahd->msgout_index++] = MSG_EXT_WDTR_LEN;
-        ahd->msgout_buf[ahd->msgout_index++] = MSG_EXT_WDTR;
-        ahd->msgout_buf[ahd->msgout_index++] = bus_width;
+        ahd->msgout_index += spi_populate_width_msg(
+                        ahd->msgout_buf + ahd->msgout_index, bus_width);
         ahd->msgout_len += 4;
         if (bootverbose) {
                 printf("(%s:%c:%d:%d): Sending WDTR %x\n",
@@ -3813,14 +3808,9 @@ ahd_construct_ppr(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                 ppr_options |= MSG_EXT_PPR_PCOMP_EN;
         if (offset == 0)
                 period = AHD_ASYNC_XFER_PERIOD;
-        ahd->msgout_buf[ahd->msgout_index++] = MSG_EXTENDED;
-        ahd->msgout_buf[ahd->msgout_index++] = MSG_EXT_PPR_LEN;
-        ahd->msgout_buf[ahd->msgout_index++] = MSG_EXT_PPR;
-        ahd->msgout_buf[ahd->msgout_index++] = period;
-        ahd->msgout_buf[ahd->msgout_index++] = 0;
-        ahd->msgout_buf[ahd->msgout_index++] = offset;
-        ahd->msgout_buf[ahd->msgout_index++] = bus_width;
-        ahd->msgout_buf[ahd->msgout_index++] = ppr_options;
+        ahd->msgout_index += spi_populate_ppr_msg(
+                        ahd->msgout_buf + ahd->msgout_index, period, offset,
+                        bus_width, ppr_options);
         ahd->msgout_len += 8;
         if (bootverbose) {
                 printf("(%s:%c:%d:%d): Sending PPR bus_width %x, period %x, "
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 58ac46103eb6..d37566978fba 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -2461,11 +2461,8 @@ ahc_construct_sdtr(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
 {
         if (offset == 0)
                 period = AHC_ASYNC_XFER_PERIOD;
-        ahc->msgout_buf[ahc->msgout_index++] = MSG_EXTENDED;
-        ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_SDTR_LEN;
-        ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_SDTR;
-        ahc->msgout_buf[ahc->msgout_index++] = period;
-        ahc->msgout_buf[ahc->msgout_index++] = offset;
+        ahc->msgout_index += spi_populate_sync_msg(
+                        ahc->msgout_buf + ahc->msgout_index, period, offset);
         ahc->msgout_len += 5;
         if (bootverbose) {
                 printf("(%s:%c:%d:%d): Sending SDTR period %x, offset %x\n",
@@ -2482,10 +2479,8 @@ static void
 ahc_construct_wdtr(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
                    u_int bus_width)
 {
-        ahc->msgout_buf[ahc->msgout_index++] = MSG_EXTENDED;
-        ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_WDTR_LEN;
-        ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_WDTR;
-        ahc->msgout_buf[ahc->msgout_index++] = bus_width;
+        ahc->msgout_index += spi_populate_width_msg(
+                        ahc->msgout_buf + ahc->msgout_index, bus_width);
         ahc->msgout_len += 4;
         if (bootverbose) {
                 printf("(%s:%c:%d:%d): Sending WDTR %x\n",
@@ -2505,14 +2500,9 @@ ahc_construct_ppr(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
 {
         if (offset == 0)
                 period = AHC_ASYNC_XFER_PERIOD;
-        ahc->msgout_buf[ahc->msgout_index++] = MSG_EXTENDED;
-        ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_PPR_LEN;
-        ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_PPR;
-        ahc->msgout_buf[ahc->msgout_index++] = period;
-        ahc->msgout_buf[ahc->msgout_index++] = 0;
-        ahc->msgout_buf[ahc->msgout_index++] = offset;
-        ahc->msgout_buf[ahc->msgout_index++] = bus_width;
-        ahc->msgout_buf[ahc->msgout_index++] = ppr_options;
+        ahc->msgout_index += spi_populate_ppr_msg(
+                        ahc->msgout_buf + ahc->msgout_index, period, offset,
+                        bus_width, ppr_options);
         ahc->msgout_len += 8;
         if (bootverbose) {
                 printf("(%s:%c:%d:%d): Sending PPR bus_width %x, period %x, "