[PATCH] staging: bcm: sort.c: fix coding style

[Omar Sandoval]

Fix checkpatch.pl "Alignment should match open parenthesis".

Signed-off-by: Omar Sandoval 
---
 drivers/staging/bcm/sort.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/bcm/sort.c b/drivers/staging/bcm/sort.c
index d518c42..ca0b179 100644
--- a/drivers/staging/bcm/sort.c
+++ b/drivers/staging/bcm/sort.c
@@ -28,7 +28,7 @@ VOID SortPackInfo(struct bcm_mini_adapter *Adapter)
DBG_LVL_ALL, "<===");
 
sort(Adapter->PackInfo, NO_OF_QUEUES, sizeof(struct bcm_packet_info),
-   compare_packet_info, NULL);
+compare_packet_info, NULL);
 }
 
 static int compare_classifiers(void const *a, void const *b)
@@ -48,5 +48,5 @@ VOID SortClassifiers(struct bcm_mini_adapter *Adapter)
DBG_LVL_ALL, "<===");
 
sort(Adapter->astClassifierTable, MAX_CLASSIFIERS,
-   sizeof(struct bcm_classifier_rule), compare_classifiers, NULL);
+sizeof(struct bcm_classifier_rule), compare_classifiers, NULL);
 }
-- 
2.1.0

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH] staging: lustre: fix gfp_t/int coercion

[Omar Sandoval]

Fix a few implicit casts between int and gfp_t which were caught by sparse.

Signed-off-by: Omar Sandoval 
---
This patch applies to v3.17-rc6.
 drivers/staging/lustre/lustre/llite/lloop.c| 4 ++--
 drivers/staging/lustre/lustre/ptlrpc/client.c  | 2 +-
 drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lustre/llite/lloop.c 
b/drivers/staging/lustre/lustre/llite/lloop.c
index 8086638..b0d8de5 100644
--- a/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@ -126,7 +126,7 @@ struct lloop_device {
struct block_device *lo_device;
unsigned lo_blocksize;
 
-   int   old_gfp_mask;
+   gfp_t old_gfp_mask;
 
spinlock_t  lo_lock;
struct bio  *lo_bio;
@@ -546,7 +546,7 @@ static int loop_clr_fd(struct lloop_device *lo, struct 
block_device *bdev,
   int count)
 {
struct file *filp = lo->lo_backing_file;
-   int gfp = lo->old_gfp_mask;
+   gfp_t gfp = lo->old_gfp_mask;
 
if (lo->lo_state != LLOOP_BOUND)
return -ENXIO;
diff --git a/drivers/staging/lustre/lustre/ptlrpc/client.c 
b/drivers/staging/lustre/lustre/ptlrpc/client.c
index 4146e8b..c4debbc 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/client.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/client.c
@@ -394,7 +394,7 @@ void ptlrpc_request_cache_fini(void)
kmem_cache_destroy(request_cache);
 }
 
-struct ptlrpc_request *ptlrpc_request_cache_alloc(int flags)
+struct ptlrpc_request *ptlrpc_request_cache_alloc(gfp_t flags)
 {
struct ptlrpc_request *req;
 
diff --git a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h 
b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h
index f7be007..7fe2e58 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h
+++ b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h
@@ -57,7 +57,7 @@ struct ptlrpc_bulk_desc *ptlrpc_new_bulk(unsigned npages, 
unsigned max_brw,
 unsigned type, unsigned portal);
 int ptlrpc_request_cache_init(void);
 void ptlrpc_request_cache_fini(void);
-struct ptlrpc_request *ptlrpc_request_cache_alloc(int flags);
+struct ptlrpc_request *ptlrpc_request_cache_alloc(gfp_t flags);
 void ptlrpc_request_cache_free(struct ptlrpc_request *req);
 void ptlrpc_init_xid(void);
 
-- 
2.1.0

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel