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

Commit a9a3047d authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Linus Torvalds
Browse files

[PATCH] drivers/scsi: fix-up schedule_timeout() usage 



Use schedule_timeout_uninterruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.

Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6521018d

drivers/scsi/NCR5380.c

+1 −4
Original line number Diff line number Diff line
@@ -606,10 +606,7 @@ static int __init NCR5380_probe_irq(struct Scsi_Host *instance, int possible) 
	NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_DATA | ICR_ASSERT_SEL);



	while (probe_irq == SCSI_IRQ_NONE && time_before(jiffies, timeout))

	{

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

	}

		schedule_timeout_uninterruptible(1);

	

	NCR5380_write(SELECT_ENABLE_REG, 0);

	NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);

drivers/scsi/aacraid/rkt.c

+2 −4
Original line number Diff line number Diff line
@@ -183,8 +183,7 @@ static int rkt_sync_cmd(struct aac_dev *dev, u32 command, 
		/*

		 *	Yield the processor in case we are slow 

		 */

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	}

	if (ok != 1) {

		/*
@@ -452,8 +451,7 @@ int aac_rkt_init(struct aac_dev *dev) 
					dev->name, instance, status);

			goto error_iounmap;

		}

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	}

	if (request_irq(dev->scsi_host_ptr->irq, aac_rkt_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)<0) 

	{

drivers/scsi/aacraid/rx.c

+2 −4
Original line number Diff line number Diff line
@@ -183,8 +183,7 @@ static int rx_sync_cmd(struct aac_dev *dev, u32 command, 
		/*

		 *	Yield the processor in case we are slow 

		 */

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	}

	if (ok != 1) {

		/*
@@ -452,8 +451,7 @@ int aac_rx_init(struct aac_dev *dev) 
					dev->name, instance, status);

			goto error_iounmap;

		}

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	}

	if (request_irq(dev->scsi_host_ptr->irq, aac_rx_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)<0) 

	{

drivers/scsi/aacraid/sa.c

+2 −4
Original line number Diff line number Diff line
@@ -189,8 +189,7 @@ static int sa_sync_cmd(struct aac_dev *dev, u32 command, 
			ok = 1;

			break;

		}

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	}



	if (ok != 1)
@@ -325,8 +324,7 @@ int aac_sa_init(struct aac_dev *dev) 
					name, instance, status);

			goto error_iounmap;

		}

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	}



	if (request_irq(dev->scsi_host_ptr->irq, aac_sa_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev ) < 0) {

drivers/scsi/dpt_i2o.c

+11 −23
Original line number Diff line number Diff line
@@ -1218,8 +1218,7 @@ static s32 adpt_i2o_post_this(adpt_hba* pHba, u32* data, int len) 
			printk(KERN_WARNING"dpti%d: Timeout waiting for message frame!\n", pHba->unit);

			return -ETIMEDOUT;

		}

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	} while(m == EMPTY_QUEUE);

		

	msg = pHba->msg_addr_virt + m;
@@ -1294,8 +1293,7 @@ static s32 adpt_i2o_reset_hba(adpt_hba* pHba) 
			printk(KERN_WARNING"Timeout waiting for message!\n");

			return -ETIMEDOUT;

		}

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	} while (m == EMPTY_QUEUE);



	status = (u8*)kmalloc(4, GFP_KERNEL|ADDR32);
@@ -1327,8 +1325,7 @@ static s32 adpt_i2o_reset_hba(adpt_hba* pHba) 
			return -ETIMEDOUT;

		}

		rmb();

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	}



	if(*status == 0x01 /*I2O_EXEC_IOP_RESET_IN_PROGRESS*/) {
@@ -1345,8 +1342,7 @@ static s32 adpt_i2o_reset_hba(adpt_hba* pHba) 
				printk(KERN_ERR "%s:Timeout waiting for IOP Reset.\n",pHba->name);

				return -ETIMEDOUT;

			}

			set_current_state(TASK_UNINTERRUPTIBLE);

			schedule_timeout(1);

			schedule_timeout_uninterruptible(1);

		} while (m == EMPTY_QUEUE);

		// Flush the offset

		adpt_send_nop(pHba, m);
@@ -1917,11 +1913,8 @@ static int adpt_ioctl(struct inode *inode, struct file *file, uint cmd, 
		return -ENXIO;

	}



	while((volatile u32) pHba->state & DPTI_STATE_RESET ) {

		set_task_state(current,TASK_UNINTERRUPTIBLE);

		schedule_timeout(2);



	}

	while((volatile u32) pHba->state & DPTI_STATE_RESET )

		schedule_timeout_uninterruptible(2);



	switch (cmd) {

	// TODO: handle 3 cases
@@ -2635,8 +2628,7 @@ static s32 adpt_send_nop(adpt_hba*pHba,u32 m) 
			printk(KERN_ERR "%s: Timeout waiting for message frame!\n",pHba->name);

			return 2;

		}

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	}

	msg = (u32 __iomem *)(pHba->msg_addr_virt + m);

	writel( THREE_WORD_MSG_SIZE | SGL_OFFSET_0,&msg[0]);
@@ -2670,8 +2662,7 @@ static s32 adpt_i2o_init_outbound_q(adpt_hba* pHba) 
			printk(KERN_WARNING"%s: Timeout waiting for message frame\n",pHba->name);

			return -ETIMEDOUT;

		}

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	} while(m == EMPTY_QUEUE);



	msg=(u32 __iomem *)(pHba->msg_addr_virt+m);
@@ -2709,8 +2700,7 @@ static s32 adpt_i2o_init_outbound_q(adpt_hba* pHba) 
			printk(KERN_WARNING"%s: Timeout Initializing\n",pHba->name);

			return -ETIMEDOUT;

		}

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	} while (1);



	// If the command was successful, fill the fifo with our reply
@@ -2788,8 +2778,7 @@ static s32 adpt_i2o_status_get(adpt_hba* pHba) 
					pHba->name);

			return -ETIMEDOUT;

		}

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	} while(m==EMPTY_QUEUE);
@@ -2816,8 +2805,7 @@ static s32 adpt_i2o_status_get(adpt_hba* pHba) 
			return -ETIMEDOUT;

		}

		rmb();

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	}



	// Set up our number of outbound and inbound messages