Refactor channel_queue allocation and initialization

dev/ic/wdc.c

 /*      $OpenBSD: wdc.c,v 1.114 2011/05/08 17:33:56 matthew Exp $       */
 /*      $NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $  */
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 679 matching lines @@
                 }
                 wdc_enable_intr(chp);
         }
 
 #ifdef WDCDEBUG
         wdcdebug_mask = savedmask;
 #endif
         return (ret_value);
 }
 
+struct channel_queue *
+wdc_alloc_queue(void)
+{
+        static int inited = 0;
+        struct channel_queue *queue;
+
+        /* Initialize global data. */
+        if (inited == 0) {
+                /* Initialize the wdc_xfer pool. */
+                pool_init(&wdc_xfer_pool, sizeof(struct wdc_xfer), 0,
+                    0, 0, "wdcspl", NULL);
+                inited = 1;
+        }
+
+        queue = malloc(sizeof(*queue), M_DEVBUF, M_NOWAIT);
+        if (queue != NULL) {
+                TAILQ_INIT(&queue->sc_xfer);
+        }
+        return (queue);
+}
+
+void
+wdc_free_queue(struct channel_queue *queue)
+{
+        free(queue, M_DEVBUF);
+}
+
 void
 wdcattach(struct channel_softc *chp)
 {
         int channel_flags, ctrl_flags, i;
         struct ata_atapi_attach aa_link;
-        static int inited = 0, s;
 #ifdef WDCDEBUG
         int    savedmask = wdcdebug_mask;
 #endif
 
         if (!cold)
                 at_poll = AT_WAIT;
 
         if (chp->wdc->reset == NULL)
                 chp->wdc->reset = wdc_do_reset;
 
@@ skipping 19 matching lines @@
 #ifdef WDCDEBUG
         if (chp->wdc->sc_dev.dv_cfdata->cf_flags & WDC_OPTION_PROBE_VERBOSE)
                 wdcdebug_mask |= DEBUG_PROBE;
 
         if ((chp->ch_drive[0].drive_flags & DRIVE_ATAPI) ||
             (chp->ch_drive[1].drive_flags & DRIVE_ATAPI)) {
                 wdcdebug_mask = DEBUG_PROBE;
         }
 #endif /* WDCDEBUG */
 
-        /* initialise global data */
-        s = splbio();
-        if (inited == 0) {
-                /* Initialize the wdc_xfer pool. */
-                pool_init(&wdc_xfer_pool, sizeof(struct wdc_xfer), 0,
-                    0, 0, "wdcspl", NULL);
-                inited++;
-        }
-        TAILQ_INIT(&chp->ch_queue->sc_xfer);
-        splx(s);
-
         for (i = 0; i < 2; i++) {
                 struct ata_drive_datas *drvp = &chp->ch_drive[i];
 
                 drvp->chnl_softc = chp;
                 drvp->drive = i;
                 /* If controller can't do 16bit flag the drives as 32bit */
                 if ((chp->wdc->cap &
                     (WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32)) ==
                     WDC_CAPABILITY_DATA32)
                         drvp->drive_flags |= DRIVE_CAP32;
@@ skipping 1349 matching lines @@
         }
 
         default:
                 error = ENOTTY;
                 goto exit;
         }
 
 exit:
         return (error);
 }