[PATCH] staging: lustre: Fixed warnings about using 0 as NULL ptr
Fixed a bunch of warnings pointed out by sparse about using 0 to
represent a NULL pointer.
Signed-off-by: Greg DeAngelis gdean...@gmail.com
---
drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/lustre/lustre/mgc/lproc_mgc.c
b/drivers/staging/lustre/lustre/mgc/lproc_mgc.c
index 1506af1..6c877c5 100644
--- a/drivers/staging/lustre/lustre/mgc/lproc_mgc.c
+++ b/drivers/staging/lustre/lustre/mgc/lproc_mgc.c
@@ -56,21 +56,21 @@ static int mgc_ir_state_seq_show(struct seq_file *m, void
*v)
LPROC_SEQ_FOPS_RO(mgc_ir_state);
static struct lprocfs_vars lprocfs_mgc_obd_vars[] = {
- { uuid,mgc_uuid_fops, 0, 0 },
- { ping,mgc_ping_fops, 0, 0222 },
- { connect_flags, mgc_connect_flags_fops, 0, 0 },
- { mgs_server_uuid, mgc_server_uuid_fops, 0, 0 },
- { mgs_conn_uuid, mgc_conn_uuid_fops, 0, 0 },
- { import, mgc_import_fops, 0, 0 },
- { state, mgc_state_fops,0, 0 },
- { ir_state,mgc_ir_state_fops, 0, 0 },
- { 0 }
+ { uuid,mgc_uuid_fops, NULL, 0 },
+ { ping,mgc_ping_fops, NULL, 0222 },
+ { connect_flags, mgc_connect_flags_fops, NULL, 0 },
+ { mgs_server_uuid, mgc_server_uuid_fops, NULL, 0 },
+ { mgs_conn_uuid, mgc_conn_uuid_fops, NULL, 0 },
+ { import, mgc_import_fops, NULL, 0 },
+ { state, mgc_state_fops,NULL, 0 },
+ { ir_state,mgc_ir_state_fops, NULL, 0 },
+ { NULL }
};
LPROC_SEQ_FOPS_RO_TYPE(mgc, numrefs);
static struct lprocfs_vars lprocfs_mgc_module_vars[] = {
- { num_refs, mgc_numrefs_fops, 0, 0 },
- { 0 }
+ { num_refs, mgc_numrefs_fops, NULL, 0 },
+ { NULL }
};
void lprocfs_mgc_init_vars(struct lprocfs_static_vars *lvars)
--
1.7.10.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: bcm: fix lines over 80 characters
Signed-off-by: Greg DeAngelis gdean...@gmail.com
---
drivers/staging/bcm/Transmit.c | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c
index 2ed4836..4976746 100644
--- a/drivers/staging/bcm/Transmit.c
+++ b/drivers/staging/bcm/Transmit.c
@@ -46,12 +46,14 @@ int SendControlPacket(struct bcm_mini_adapter *Adapter,
char *pControlPacket)
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, Tx);
if (!pControlPacket || !Adapter) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL,
Got NULL Control Packet or Adapter);
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL,
+ Got NULL Control Packet or Adapter);
return STATUS_FAILURE;
}
if ((atomic_read(Adapter-CurrNumFreeTxDesc)
((PLeader-PLength-1)/MAX_DEVICE_DESC_SIZE)+1)) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL,
NO FREE DESCRIPTORS TO SEND CONTROL PACKET);
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL,
+ NO FREE DESCRIPTORS TO SEND CONTROL PACKET);
return STATUS_FAILURE;
}
@@ -109,7 +111,8 @@ int SetupNextSend(struct bcm_mini_adapter *Adapter, struct
sk_buff *Packet, USH
(UINT *)Packet-len,
Adapter-PackInfo[QueueIndex].bEthCSSupport);
if (status != STATUS_SUCCESS) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL,
PHS Transmit failed..\n);
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL,
+ PHS Transmit failed..\n);
goto errExit;
}
@@ -217,12 +220,15 @@ int tx_pkt_handler(struct bcm_mini_adapter *Adapter /**
pointer to adapter obje
Adapter-LinkStatus == SYNC_UP_REQUEST
!Adapter-bSyncUpRequestSent) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_PACKETS,
DBG_LVL_ALL, Calling LinkMessage);
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_PACKETS,
+ DBG_LVL_ALL, Calling LinkMessage);
LinkMessage(Adapter);
}
if ((Adapter-IdleMode || Adapter-bShutStatus)
atomic_read(Adapter-TotalPacketCount)) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_PACKETS,
DBG_LVL_ALL, Device in Low Power mode...waking up);
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX,
+ TX_PACKETS, DBG_LVL_ALL,
+ Device in Low Power mode...waking up);
Adapter-usIdleModePattern = ABORT_IDLE_MODE;
Adapter-bWakeUpDevice = TRUE;
wake_up(Adapter-process_rx_cntrlpkt);
@@ -232,7 +238,8 @@ int tx_pkt_handler(struct bcm_mini_adapter *Adapter /**
pointer to adapter obje
atomic_set(Adapter-TxPktAvail, 0);
}
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, Exiting
the tx thread..\n);
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL,
+ Exiting the tx thread..\n);
Adapter-transmit_packet_thread = NULL;
return 0;
}
--
1.7.10.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
