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

Commit 106495c4 authored by Mike Rapoport's avatar Mike Rapoport Committed by Greg Kroah-Hartman
Browse files

staging: lustre: remove multiple blank lines 



Fixes checkpatch.pl CHECK:LINE_SPACING: Please don't use multiple blank
lines.

The patch is generated using checkpatch.pl --fix-inplace:

for f in $(find drivers/staging/lustre/ -type f) ; do
    ./scripts/checkpatch.pl --types "LINE_SPACING" --test-only=multiple \
    --fix-inplace  -f $f
done

Signed-off-by: default avatarMike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 50ffcb7e

drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h

+0 −3
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#error Do not #include this file directly. #include <linux/libcfs/libcfs.h> instead

#endif





#include <linux/bitops.h>

#include <linux/compiler.h>

#include <linux/ctype.h>
@@ -86,7 +85,6 @@ 
#include "linux-time.h"

#include "linux-mem.h"





#define LUSTRE_TRACE_SIZE (THREAD_SIZE >> 5)



#if !defined(__x86_64__)
@@ -142,5 +140,4 @@ typedef long long_ptr_t; 
#define WITH_WATCHDOG

#endif





#endif /* _LINUX_LIBCFS_H */

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h

+0 −2
Original line number Diff line number Diff line
@@ -848,7 +848,6 @@ kiblnd_rd_msg_size(kib_rdma_desc_t *rd, int msgtype, int n) 
	       offsetof(kib_putack_msg_t, ibpam_rd.rd_frags[n]);

}





static inline __u64

kiblnd_dma_mapping_error(struct ib_device *dev, u64 dma_addr)

{
@@ -905,7 +904,6 @@ static inline unsigned int kiblnd_sg_dma_len(struct ib_device *dev, 
#define KIBLND_CONN_PARAM(e)     ((e)->param.conn.private_data)

#define KIBLND_CONN_PARAM_LEN(e) ((e)->param.conn.private_data_len)





struct ib_mr *kiblnd_find_rd_dma_mr(kib_hca_dev_t *hdev,

				    kib_rdma_desc_t *rd);

struct ib_mr *kiblnd_find_dma_mr(kib_hca_dev_t *hdev,

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c

+0 −1
Original line number Diff line number Diff line
@@ -655,7 +655,6 @@ static int kiblnd_map_tx(lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd, 
	return -EINVAL;

}





static int

kiblnd_setup_rd_iov(lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd,

		    unsigned int niov, struct kvec *iov, int offset, int nob)

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c

+0 −1
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ static int dev_failover; 
module_param(dev_failover, int, 0444);

MODULE_PARM_DESC(dev_failover, "HCA failover for bonding (0 off, 1 on, other values reserved)");





static int require_privileged_port;

module_param(require_privileged_port, int, 0644);

MODULE_PARM_DESC(require_privileged_port, "require privileged port when accepting connection");

drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c

+0 −2
Original line number Diff line number Diff line
@@ -2445,7 +2445,6 @@ ksocknal_base_startup(void) 
		ksocknal_data.ksnd_connd_starting++;

		spin_unlock_bh(&ksocknal_data.ksnd_connd_lock);





		snprintf(name, sizeof(name), "socknal_cd%02d", i);

		rc = ksocknal_thread_start(ksocknal_connd,

					   (void *)((ulong_ptr_t)i), name);
@@ -2836,7 +2835,6 @@ ksocknal_startup(lnet_ni_t *ni) 
	return -ENETDOWN;

}





static void __exit

ksocknal_module_fini(void)

{