diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2007-07-24 03:28:11 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2007-07-24 03:28:11 -0400 |
commit | 165125e1e480f9510a5ffcfbfee4e3ee38c05f23 (patch) | |
tree | 8009c8a5ff09e26dc2418d42f66ecafb055c52a2 /drivers/block/sx8.c | |
parent | f695baf2df9e0413d3521661070103711545207a (diff) |
[BLOCK] Get rid of request_queue_t typedef
Some of the code has been gradually transitioned to using the proper
struct request_queue, but there's lots left. So do a full sweet of
the kernel and get rid of this typedef and replace its uses with
the proper type.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block/sx8.c')
-rw-r--r-- | drivers/block/sx8.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c index 949ae93499e5..402209fec59a 100644 --- a/drivers/block/sx8.c +++ b/drivers/block/sx8.c | |||
@@ -278,7 +278,7 @@ struct carm_host { | |||
278 | unsigned int state; | 278 | unsigned int state; |
279 | u32 fw_ver; | 279 | u32 fw_ver; |
280 | 280 | ||
281 | request_queue_t *oob_q; | 281 | struct request_queue *oob_q; |
282 | unsigned int n_oob; | 282 | unsigned int n_oob; |
283 | 283 | ||
284 | unsigned int hw_sg_used; | 284 | unsigned int hw_sg_used; |
@@ -287,7 +287,7 @@ struct carm_host { | |||
287 | 287 | ||
288 | unsigned int wait_q_prod; | 288 | unsigned int wait_q_prod; |
289 | unsigned int wait_q_cons; | 289 | unsigned int wait_q_cons; |
290 | request_queue_t *wait_q[CARM_MAX_WAIT_Q]; | 290 | struct request_queue *wait_q[CARM_MAX_WAIT_Q]; |
291 | 291 | ||
292 | unsigned int n_msgs; | 292 | unsigned int n_msgs; |
293 | u64 msg_alloc; | 293 | u64 msg_alloc; |
@@ -756,7 +756,7 @@ static inline void carm_end_request_queued(struct carm_host *host, | |||
756 | assert(rc == 0); | 756 | assert(rc == 0); |
757 | } | 757 | } |
758 | 758 | ||
759 | static inline void carm_push_q (struct carm_host *host, request_queue_t *q) | 759 | static inline void carm_push_q (struct carm_host *host, struct request_queue *q) |
760 | { | 760 | { |
761 | unsigned int idx = host->wait_q_prod % CARM_MAX_WAIT_Q; | 761 | unsigned int idx = host->wait_q_prod % CARM_MAX_WAIT_Q; |
762 | 762 | ||
@@ -768,7 +768,7 @@ static inline void carm_push_q (struct carm_host *host, request_queue_t *q) | |||
768 | BUG_ON(host->wait_q_prod == host->wait_q_cons); /* overrun */ | 768 | BUG_ON(host->wait_q_prod == host->wait_q_cons); /* overrun */ |
769 | } | 769 | } |
770 | 770 | ||
771 | static inline request_queue_t *carm_pop_q(struct carm_host *host) | 771 | static inline struct request_queue *carm_pop_q(struct carm_host *host) |
772 | { | 772 | { |
773 | unsigned int idx; | 773 | unsigned int idx; |
774 | 774 | ||
@@ -783,7 +783,7 @@ static inline request_queue_t *carm_pop_q(struct carm_host *host) | |||
783 | 783 | ||
784 | static inline void carm_round_robin(struct carm_host *host) | 784 | static inline void carm_round_robin(struct carm_host *host) |
785 | { | 785 | { |
786 | request_queue_t *q = carm_pop_q(host); | 786 | struct request_queue *q = carm_pop_q(host); |
787 | if (q) { | 787 | if (q) { |
788 | blk_start_queue(q); | 788 | blk_start_queue(q); |
789 | VPRINTK("STARTED QUEUE %p\n", q); | 789 | VPRINTK("STARTED QUEUE %p\n", q); |
@@ -802,7 +802,7 @@ static inline void carm_end_rq(struct carm_host *host, struct carm_request *crq, | |||
802 | } | 802 | } |
803 | } | 803 | } |
804 | 804 | ||
805 | static void carm_oob_rq_fn(request_queue_t *q) | 805 | static void carm_oob_rq_fn(struct request_queue *q) |
806 | { | 806 | { |
807 | struct carm_host *host = q->queuedata; | 807 | struct carm_host *host = q->queuedata; |
808 | struct carm_request *crq; | 808 | struct carm_request *crq; |
@@ -833,7 +833,7 @@ static void carm_oob_rq_fn(request_queue_t *q) | |||
833 | } | 833 | } |
834 | } | 834 | } |
835 | 835 | ||
836 | static void carm_rq_fn(request_queue_t *q) | 836 | static void carm_rq_fn(struct request_queue *q) |
837 | { | 837 | { |
838 | struct carm_port *port = q->queuedata; | 838 | struct carm_port *port = q->queuedata; |
839 | struct carm_host *host = port->host; | 839 | struct carm_host *host = port->host; |
@@ -1494,7 +1494,7 @@ static int carm_init_disks(struct carm_host *host) | |||
1494 | 1494 | ||
1495 | for (i = 0; i < CARM_MAX_PORTS; i++) { | 1495 | for (i = 0; i < CARM_MAX_PORTS; i++) { |
1496 | struct gendisk *disk; | 1496 | struct gendisk *disk; |
1497 | request_queue_t *q; | 1497 | struct request_queue *q; |
1498 | struct carm_port *port; | 1498 | struct carm_port *port; |
1499 | 1499 | ||
1500 | port = &host->port[i]; | 1500 | port = &host->port[i]; |
@@ -1538,7 +1538,7 @@ static void carm_free_disks(struct carm_host *host) | |||
1538 | for (i = 0; i < CARM_MAX_PORTS; i++) { | 1538 | for (i = 0; i < CARM_MAX_PORTS; i++) { |
1539 | struct gendisk *disk = host->port[i].disk; | 1539 | struct gendisk *disk = host->port[i].disk; |
1540 | if (disk) { | 1540 | if (disk) { |
1541 | request_queue_t *q = disk->queue; | 1541 | struct request_queue *q = disk->queue; |
1542 | 1542 | ||
1543 | if (disk->flags & GENHD_FL_UP) | 1543 | if (disk->flags & GENHD_FL_UP) |
1544 | del_gendisk(disk); | 1544 | del_gendisk(disk); |
@@ -1571,7 +1571,7 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1571 | struct carm_host *host; | 1571 | struct carm_host *host; |
1572 | unsigned int pci_dac; | 1572 | unsigned int pci_dac; |
1573 | int rc; | 1573 | int rc; |
1574 | request_queue_t *q; | 1574 | struct request_queue *q; |
1575 | unsigned int i; | 1575 | unsigned int i; |
1576 | 1576 | ||
1577 | if (!printed_version++) | 1577 | if (!printed_version++) |