From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Sep 2012 03:38:34 +0000 (+1000)
Subject: Merge remote-tracking branch 'trivial/for-next'
X-Git-Tag: next-20120907~38
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f8fb4431a98120d6e8b883a4b70a2e9d6a7a0cb1;p=karo-tx-linux.git

Merge remote-tracking branch 'trivial/for-next'

Conflicts:
	drivers/scsi/ipr.c
---

f8fb4431a98120d6e8b883a4b70a2e9d6a7a0cb1
diff --cc drivers/scsi/ipr.c
index cff6503e5b6d,1059c99690e6..637e5527b082
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@@ -562,26 -562,9 +562,26 @@@ static void ipr_trc_hook(struct ipr_cmn
  	trace_entry->u.add_data = add_data;
  }
  #else
- #define ipr_trc_hook(ipr_cmd, type, add_data) do { } while(0)
+ #define ipr_trc_hook(ipr_cmd, type, add_data) do { } while (0)
  #endif
  
 +/**
 + * ipr_lock_and_done - Acquire lock and complete command
 + * @ipr_cmd:	ipr command struct
 + *
 + * Return value:
 + *	none
 + **/
 +static void ipr_lock_and_done(struct ipr_cmnd *ipr_cmd)
 +{
 +	unsigned long lock_flags;
 +	struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
 +
 +	spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
 +	ipr_cmd->done(ipr_cmd);
 +	spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
 +}
 +
  /**
   * ipr_reinit_ipr_cmnd - Re-initialize an IPR Cmnd block for reuse
   * @ipr_cmd:	ipr command struct
@@@ -6398,8 -6330,8 +6398,8 @@@ static int ipr_invalid_adapter(struct i
  	int i;
  
  	if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) {
- 		for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++){
+ 		for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++) {
 -			if (__is_processor(ipr_blocked_processors[i]))
 +			if (pvr_version_is(ipr_blocked_processors[i]))
  				return 1;
  		}
  	}