[linux-yocto] [PATCH 22/57] LSI AXM55xx: Checkpatch update 'Move datastream apis'

Charlie Paul cpaul.windriver at gmail.com
Mon Mar 17 21:56:22 PDT 2014


The changes are code syntax updates pointed out by checkpatch.

Signed-off-by: Charlie Paul <charlie.paul at windriver.com>
---
 drivers/rapidio/devices/lsi/axxia-rio-ds.c |   92 ++++++++++++++--------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/drivers/rapidio/devices/lsi/axxia-rio-ds.c b/drivers/rapidio/devices/lsi/axxia-rio-ds.c
index becca47..57ae565 100755
--- a/drivers/rapidio/devices/lsi/axxia-rio-ds.c
+++ b/drivers/rapidio/devices/lsi/axxia-rio-ds.c
@@ -233,7 +233,7 @@ EXPORT_SYMBOL(axxia_data_stream_global_cfg);
  * Returns %0 on success
  ****************************************************************************/
 int axxia_open_ob_data_stream(
-	struct rio_mport 	*mport,
+	struct rio_mport	*mport,
 	void			*dev_id,
 	int			dse_id,
 	int			num_header_entries,
@@ -271,8 +271,8 @@ EXPORT_SYMBOL(axxia_open_ob_data_stream);
  * Returns %0 on success
  ****************************************************************************/
 int open_ob_data_stream(
-	struct rio_mport 	*mport,
-	void		  	*dev_id,
+	struct rio_mport	*mport,
+	void			*dev_id,
 	int			dse_id,
 	int			num_header_entries,
 	int			num_data_entries)
@@ -429,24 +429,24 @@ int open_ob_data_stream(
  * @mport:		Pointer to the master port
  * @dest_id:		Destination ID of the data stream
  * @stream_id:		Data stream ID
- * @cos:	  	Class of service of the stream
+ * @cos:		Class of service of the stream
  * @priority:		Priority of the data stream
  * @is_hdr_desc:	Indicate if the descriptor a header descriptor
  *			or data descriptor
  * @buffer:		Pointer to where the data is stored
- * @data_len:   	Data buffer length associated with the descriptor
+ * @data_len:	Data buffer length associated with the descriptor
  *
  * Returns %0 on success
  ****************************************************************************/
 int axxia_add_ob_data_stream(
 	struct rio_mport	*mport,
-	int		   	dest_id,
-	int		   	stream_id,
-	int		   	cos,
+	int			dest_id,
+	int			stream_id,
+	int			cos,
 	int			priority,
 	int			is_hdr_desc,
-	void		  	*buffer,
-	int		   	data_len)
+	void		*buffer,
+	int			data_len)
 {
 	struct rio_priv *priv = mport->priv;
 	struct axxia_rio_ds_priv      *ptr_ds_priv;
@@ -753,7 +753,7 @@ void ob_dse_irq_handler(struct rio_irq_handler *h, u32 state)
  * Returns %0 on success
  ****************************************************************************/
 int axxia_close_ob_data_stream(
-	struct rio_mport  	*mport,
+	struct rio_mport	*mport,
 	int			dse_id)
 {
 	struct rio_priv               *priv = mport->priv;
@@ -831,7 +831,7 @@ EXPORT_SYMBOL(axxia_close_ob_data_stream);
  *	larger than or equal to the expected PDU.
  *
  * @mport:			Pointer to the master port
- * @source_id: 	Source ID of the data stream
+ * @source_id:	Source ID of the data stream
  * @cos:			Class of service of the stream
  * @desc_dbuf_size: Data buffer size the descriptor can handle
  * @num_entries:	Number of descriptors in this descriptor chain
@@ -839,10 +839,10 @@ EXPORT_SYMBOL(axxia_close_ob_data_stream);
  * Returns %0 on success
  ****************************************************************************/
 int axxia_open_ib_data_stream(
-	struct rio_mport  	*mport,
+	struct rio_mport	*mport,
 	void			*dev_id,
 	int			source_id,
-	int		  	cos,
+	int			cos,
 	int			desc_dbuf_size,
 	int			num_entries)
 {
@@ -870,7 +870,7 @@ EXPORT_SYMBOL(axxia_open_ib_data_stream);
  *  It is called by axxia_open_ib_data_stream( ).
  *
  * @mport:		Pointer to the master port
- * @source_id: 	Source ID of the data stream
+ * @source_id:	Source ID of the data stream
  * @cos:		Class of service of the stream
  * @desc_dbuf_size: Data buffer size the descriptor can handle
  * @num_entries:	Number of descriptors in this descriptor chain
@@ -878,10 +878,10 @@ EXPORT_SYMBOL(axxia_open_ib_data_stream);
  * Returns %0 on success
  ****************************************************************************/
 int open_ib_data_stream(
-	struct rio_mport  	*mport,
+	struct rio_mport	*mport,
 	void			*dev_id,
 	int			source_id,
-	int		  	cos,
+	int			cos,
 	int			desc_dbuf_size,
 	int			num_entries)
 {
@@ -909,36 +909,36 @@ int open_ib_data_stream(
 	**	6 - 32K, 7 - 64K
 	*/
 	switch (desc_dbuf_size) {
-		case RIO_IBDS_DATA_BUF_1K:
-			hw_desc_size = 1;
-			break;
+	case RIO_IBDS_DATA_BUF_1K:
+		hw_desc_size = 1;
+		break;
 
-		case RIO_IBDS_DATA_BUF_2K:
-			hw_desc_size = 2;
-			break;
+	case RIO_IBDS_DATA_BUF_2K:
+		hw_desc_size = 2;
+		break;
 
-		case RIO_IBDS_DATA_BUF_4K:
-			hw_desc_size = 3;
-			break;
+	case RIO_IBDS_DATA_BUF_4K:
+		hw_desc_size = 3;
+		break;
 
-		case RIO_IBDS_DATA_BUF_8K:
-			hw_desc_size = 4;
-			break;
+	case RIO_IBDS_DATA_BUF_8K:
+		hw_desc_size = 4;
+		break;
 
-		case RIO_IBDS_DATA_BUF_16K:
-			hw_desc_size = 5;
-			break;
+	case RIO_IBDS_DATA_BUF_16K:
+		hw_desc_size = 5;
+		break;
 
-		case RIO_IBDS_DATA_BUF_32K:
-			hw_desc_size = 6;
-			break;
+	case RIO_IBDS_DATA_BUF_32K:
+		hw_desc_size = 6;
+		break;
 
-		case RIO_IBDS_DATA_BUF_64K:
-			hw_desc_size = 0;
-			break;
+	case RIO_IBDS_DATA_BUF_64K:
+		hw_desc_size = 0;
+		break;
 
-		default:
-			return -EINVAL;
+	default:
+		return -EINVAL;
 	}
 
 	/* TBD ASR_SPINLOCK_INTERRUPT_DISABLE(&priv->ioLock, lflags); */
@@ -1201,7 +1201,7 @@ int axxia_add_ibds_buffer(
 	if (ptr_virt_m_cfg->num_desc_free == 1)
 		return -ENOMEM;
 
-     spin_lock_irqsave(&ptr_virt_m_cfg->lock, iflags);
+	spin_lock_irqsave(&ptr_virt_m_cfg->lock, iflags);
 
 	/* put user's buffer into the corresponding descriptors */
 	ptr_data_desc =
@@ -1264,7 +1264,7 @@ int axxia_add_ibds_buffer(
 
 	ptr_virt_m_cfg->num_desc_free--;
 
-    spin_unlock_irqrestore(&ptr_virt_m_cfg->lock, iflags);
+	spin_unlock_irqrestore(&ptr_virt_m_cfg->lock, iflags);
 
 	return 0;
 }
@@ -1345,9 +1345,9 @@ void ib_dse_vsid_m_irq_handler(struct rio_irq_handler *h, u32 state)
 							RAB_IBDSE_STAT(dse_id),
 							&dse_stat);
 
-						if (((dse_stat & IB_DSE_STAT_TRANS_PENDING)  ||
-						(dse_stat & IB_DSE_STAT_TIMEOUT))	&&
-							((dse_stat & IB_DSE_VSID_IN_USED) == virt_vsid)) {
+						if (((dse_stat & IB_DSE_STAT_TRANS_PENDING) ||
+								(dse_stat & IB_DSE_STAT_TIMEOUT)) &&
+								((dse_stat & IB_DSE_VSID_IN_USED) == virt_vsid)) {
 					/*
 					** BZ43821 - SW workaround for
 					** the IBDS descriptor fetch
@@ -1568,7 +1568,7 @@ EXPORT_SYMBOL(axxia_get_ibds_data);
  *  This function closes an inbound data streaming.
  *
  * @mport:		Pointer to the master port
- * @source_id:   	Source ID of the data stream
+ * @source_id:	Source ID of the data stream
  * @cos:		Class of service of the stream
  *
  * Returns %0 on success
-- 
1.7.9.5



More information about the linux-yocto mailing list