Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29979a71 authored by Mike Miller's avatar Mike Miller Committed by Jens Axboe
Browse files

cciss: move next_command function from ifdef 



The definition of next_command also ended up in wrong place It ended up
inside an "#ifdef CONFIG_PROCFS".  Already caught by Randy Dunlap and a
couple others.  Tried to put it somewhere that made sense.

Signed-off-by: default avatarMike Miller <mike.miller@hp.com>
Cc: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent b14aa6dc

drivers/block/cciss.c

+23 −22
Original line number Original line Diff line number Diff line
@@ -213,6 +213,7 @@ static void cciss_hba_release(struct device *dev); 
static void cciss_device_release(struct device *dev);

static void cciss_device_release(struct device *dev);

static void cciss_free_gendisk(ctlr_info_t *h, int drv_index);

static void cciss_free_gendisk(ctlr_info_t *h, int drv_index);

static void cciss_free_drive_info(ctlr_info_t *h, int drv_index);

static void cciss_free_drive_info(ctlr_info_t *h, int drv_index);

static inline u32 next_command(ctlr_info_t *h);





/* performant mode helper functions */

/* performant mode helper functions */

static void  calc_bucket_map(int *bucket, int num_buckets, int nsgs,

static void  calc_bucket_map(int *bucket, int num_buckets, int nsgs,
@@ -374,28 +375,6 @@ static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG", 




#ifdef CONFIG_PROC_FS

#ifdef CONFIG_PROC_FS





static inline u32 next_command(ctlr_info_t *h)

{

	u32 a;



	if (unlikely(h->transMethod != CFGTBL_Trans_Performant))

		return h->access.command_completed(h);



	if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {

		a = *(h->reply_pool_head); /* Next cmd in ring buffer */

		(h->reply_pool_head)++;

		h->commands_outstanding--;

	} else {

		a = FIFO_EMPTY;

	}

	/* Check for wraparound */

	if (h->reply_pool_head == (h->reply_pool + h->max_commands)) {

		h->reply_pool_head = h->reply_pool;

		h->reply_pool_wraparound ^= 1;

	}

	return a;

}



/*

/*

 * Report information about this controller.

 * Report information about this controller.

 */

 */
@@ -3411,6 +3390,28 @@ static inline void finish_cmd(ctlr_info_t *h, CommandList_struct *c, 
#endif

#endif

}

}





static inline u32 next_command(ctlr_info_t *h)

{

	u32 a;



	if (unlikely(h->transMethod != CFGTBL_Trans_Performant))

		return h->access.command_completed(h);



	if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {

		a = *(h->reply_pool_head); /* Next cmd in ring buffer */

		(h->reply_pool_head)++;

		h->commands_outstanding--;

	} else {

		a = FIFO_EMPTY;

	}

	/* Check for wraparound */

	if (h->reply_pool_head == (h->reply_pool + h->max_commands)) {

		h->reply_pool_head = h->reply_pool;

		h->reply_pool_wraparound ^= 1;

	}

	return a;

}



/* process completion of an indexed ("direct lookup") command */

/* process completion of an indexed ("direct lookup") command */

static inline u32 process_indexed_cmd(ctlr_info_t *h, u32 raw_tag)

static inline u32 process_indexed_cmd(ctlr_info_t *h, u32 raw_tag)

{

{