[PATCH] Staging: android: logger: Remove uneeded tabs in variable declaration
This patch removes tabs used to align variable names in declaration and
assignation.
It replaces them with exactly one space.
Signed-off-by: Tristan Lelong tristan.lel...@blunderer.org
---
drivers/staging/android/logger.c | 49
1 file changed, 24 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index 28b93d3..ce0b41d 100644
--- a/drivers/staging/android/logger.c
+++ b/drivers/staging/android/logger.c
@@ -50,20 +50,19 @@
* mutex 'mutex'.
*/
struct logger_log {
- unsigned char *buffer;
- struct miscdevice misc;
- wait_queue_head_t wq;
- struct list_headreaders;
- struct mutexmutex;
- size_t w_off;
- size_t head;
- size_t size;
- struct list_headlogs;
+ unsigned char *buffer;
+ struct miscdevice misc;
+ wait_queue_head_t wq;
+ struct list_head readers;
+ struct mutex mutex;
+ size_t w_off;
+ size_t head;
+ size_t size;
+ struct list_head logs;
};
static LIST_HEAD(log_list);
-
/**
* struct logger_reader - a logging device open for reading
* @log: The associated log
@@ -76,11 +75,11 @@ static LIST_HEAD(log_list);
* reference counting. The structure is protected by log-mutex.
*/
struct logger_reader {
- struct logger_log *log;
- struct list_headlist;
- size_t r_off;
- boolr_all;
- int r_ver;
+ struct logger_log *log;
+ struct list_head list;
+ size_t r_off;
+ bool r_all;
+ int r_ver;
};
/* logger_offset - returns index 'n' into the log via (optimized) modulus */
@@ -170,17 +169,17 @@ static ssize_t copy_header_to_user(int ver, struct
logger_entry *entry,
struct user_logger_entry_compat v1;
if (ver 2) {
- v1.len = entry-len;
- v1.__pad= 0;
- v1.pid = entry-pid;
- v1.tid = entry-tid;
- v1.sec = entry-sec;
- v1.nsec = entry-nsec;
- hdr = v1;
- hdr_len = sizeof(struct user_logger_entry_compat);
+ v1.len = entry-len;
+ v1.__pad = 0;
+ v1.pid = entry-pid;
+ v1.tid = entry-tid;
+ v1.sec = entry-sec;
+ v1.nsec = entry-nsec;
+ hdr = v1;
+ hdr_len = sizeof(struct user_logger_entry_compat);
} else {
- hdr = entry;
- hdr_len = sizeof(struct logger_entry);
+ hdr = entry;
+ hdr_len = sizeof(struct logger_entry);
}
return copy_to_user(buf, hdr, hdr_len);
--
2.1.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
RE: [PATCH] staging:rtl8723au: core: Fix error reported by checkpatch.
-Original Message- From: Jes Sorensen [mailto:jes.soren...@redhat.com] Sent: Monday, October 27, 2014 2:13 PM To: Sharma, Sanjeev Cc: larry.fin...@lwfinger.net; gre...@linuxfoundation.org; linux-wirel...@vger.kernel.org; de...@driverdev.osuosl.org; linux-ker...@vger.kernel.org Subject: Re: [PATCH] staging:rtl8723au: core: Fix error reported by checkpatch. Sanjeev Sharma sanjeev_sha...@mentor.com writes: This is a patch to the rtw_cmd.c file that fixes Error reported by checkpatch. Signed-off-by: Sanjeev Sharma sanjeev_sha...@mentor.com --- drivers/staging/rtl8723au/core/rtw_cmd.c | 83 +++- 1 file changed, 40 insertions(+), 43 deletions(-) diff --git a/drivers/staging/rtl8723au/core/rtw_cmd.c b/drivers/staging/rtl8723au/core/rtw_cmd.c index 4eaa502..c1f6254 100644 --- a/drivers/staging/rtl8723au/core/rtw_cmd.c +++ b/drivers/staging/rtl8723au/core/rtw_cmd.c @@ -957,7 +957,7 @@ static void traffic_status_watchdog(struct rtw_adapter *padapter) /* check traffic for powersaving. */ if (((pmlmepriv-LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv-LinkDetectInfo.NumTxOkInPeriod) 8) || - pmlmepriv-LinkDetectInfo.NumRxUnicastOkInPeriod 2) + pmlmepriv-LinkDetectInfo.NumRxUnicastOkInPeriod 2) bEnterPS = false; else bEnterPS = true; This makes the line longer than 80 characters, that is worse than the 'problem' you are fixing. Jes Hello jes, How it can be worse because checkpatch treating this as an Error and line longer than 80 character is warning reported by checkpatch and I could see that in entire staging directory, every maintainer most of the time ignore the 80 column limit and give priority to Error. Please let me know your comment . Sanjeev Sharma ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
RE: [PATCH] staging:rtl8723au: core: Fix error reported by checkpatch.
-Original Message-
From: Joe Perches [mailto:j...@perches.com]
Sent: Monday, October 27, 2014 8:23 PM
To: Jes Sorensen
Cc: Sharma, Sanjeev; larry.fin...@lwfinger.net; gre...@linuxfoundation.org;
linux-wirel...@vger.kernel.org; de...@driverdev.osuosl.org;
linux-ker...@vger.kernel.org
Subject: Re: [PATCH] staging:rtl8723au: core: Fix error reported by checkpatch.
On Mon, 2014-10-27 at 09:43 +0100, Jes Sorensen wrote:
Sanjeev Sharma sanjeev_sha...@mentor.com writes:
This is a patch to the rtw_cmd.c file that fixes Error reported by
checkpatch.
[]
diff --git a/drivers/staging/rtl8723au/core/rtw_cmd.c
b/drivers/staging/rtl8723au/core/rtw_cmd.c
[]
@@ -957,7 +957,7 @@ static void traffic_status_watchdog(struct rtw_adapter
*padapter)
/* check traffic for powersaving. */
if (((pmlmepriv-LinkDetectInfo.NumRxUnicastOkInPeriod +
pmlmepriv-LinkDetectInfo.NumTxOkInPeriod) 8) ||
- pmlmepriv-LinkDetectInfo.NumRxUnicastOkInPeriod 2)
+ pmlmepriv-LinkDetectInfo.NumRxUnicastOkInPeriod
2)
bEnterPS = false;
else
bEnterPS = true;
This makes the line longer than 80 characters, that is worse than the
'problem' you are fixing.
The code already has dozens of long lines already.
This is generally a problem because the variable names are pretty long so
strict 80 column adherence generally isn't possible.
A possible way to shorten these relatively long variable name/line lengths is
to use a temporary for
pmlmeprv-LinkDetectInfo
struct rt_link_detect *ldi = pmlmeprv-LinkDetectInfo;
so:
I am agree on this approach but Let's wait for Jes opinion on it.
Sanjeev Sharma
drivers/staging/rtl8723au/core/rtw_cmd.c | 46
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/rtl8723au/core/rtw_cmd.c
b/drivers/staging/rtl8723au/core/rtw_cmd.c
index d2d7edf..1b24945 100644
--- a/drivers/staging/rtl8723au/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723au/core/rtw_cmd.c
@@ -922,34 +922,33 @@ static void traffic_status_watchdog(struct rtw_adapter
*padapter)
u8 bHigherBusyTxTraffic = false;
struct mlme_priv *pmlmepriv = padapter-mlmepriv;
int BusyThreshold = 100;
+ struct rt_link_detect *ldi = pmlmepriv-LinkDetectInfo;
+
/* */
/* Determine if our traffic is busy now */
/* */
if (check_fwstate(pmlmepriv, _FW_LINKED)) {
if (rtl8723a_BT_coexist(padapter))
BusyThreshold = 50;
- else if (pmlmepriv-LinkDetectInfo.bBusyTraffic)
+ else if (ldi-bBusyTraffic)
BusyThreshold = 75;
/* if we raise bBusyTraffic in last watchdog, using
lower threshold. */
- if (pmlmepriv-LinkDetectInfo.NumRxOkInPeriod BusyThreshold ||
- pmlmepriv-LinkDetectInfo.NumTxOkInPeriod BusyThreshold) {
+ if (ldi-NumRxOkInPeriod BusyThreshold ||
+ ldi-NumTxOkInPeriod BusyThreshold) {
bBusyTraffic = true;
- if (pmlmepriv-LinkDetectInfo.NumRxOkInPeriod
- pmlmepriv-LinkDetectInfo.NumTxOkInPeriod)
+ if (ldi-NumRxOkInPeriod ldi-NumTxOkInPeriod)
bRxBusyTraffic = true;
else
bTxBusyTraffic = true;
}
/* Higher Tx/Rx data. */
- if (pmlmepriv-LinkDetectInfo.NumRxOkInPeriod 4000 ||
- pmlmepriv-LinkDetectInfo.NumTxOkInPeriod 4000) {
+ if (ldi-NumRxOkInPeriod 4000 ||
+ ldi-NumTxOkInPeriod 4000) {
bHigherBusyTraffic = true;
-
- if (pmlmepriv-LinkDetectInfo.NumRxOkInPeriod
- pmlmepriv-LinkDetectInfo.NumTxOkInPeriod)
+ if (ldi-NumRxOkInPeriod ldi-NumTxOkInPeriod)
bHigherBusyRxTraffic = true;
else
bHigherBusyTxTraffic = true;
@@ -958,9 +957,9 @@ static void traffic_status_watchdog(struct rtw_adapter
*padapter)
if (!rtl8723a_BT_coexist(padapter) ||
!rtl8723a_BT_using_antenna_1(padapter)) {
/* check traffic for powersaving. */
- if (((pmlmepriv-LinkDetectInfo.NumRxUnicastOkInPeriod +
- pmlmepriv-LinkDetectInfo.NumTxOkInPeriod) 8) ||
- pmlmepriv-LinkDetectInfo.NumRxUnicastOkInPeriod 2)
+ if (((ldi-NumRxUnicastOkInPeriod +
+ ldi-NumTxOkInPeriod) 8) ||
+
Re: [PATCHv2 1/3] staging: ion: shrink page-pool by page unit
diff --git a/drivers/staging/android/ion/ion_system_heap.c
b/drivers/staging/android/ion/ion_system_heap.c
index da2a63c..0ba8aaf 100644
--- a/drivers/staging/android/ion/ion_system_heap.c
+++ b/drivers/staging/android/ion/ion_system_heap.c
@@ -29,7 +29,7 @@
static gfp_t high_order_gfp_flags = (GFP_HIGHUSER | __GFP_ZERO |
__GFP_NOWARN |
__GFP_NORETRY) ~__GFP_WAIT;
static gfp_t low_order_gfp_flags = (GFP_HIGHUSER | __GFP_ZERO |
__GFP_NOWARN);
-static const unsigned int orders[] = {8, 4, 0};
+static const unsigned int orders[] = {8, 6, 4, 0};
Please ignore this. I'll put it in separate patch.
I'm sorry.
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2] staging: skein: skein_api.c: removed space before ','
I'm saving the patch to my mail server using git-imap-send, then enter
e-mail addresses using Thunderbird and send it.
The problem seems to be that Thunderbird thrashes empty lines when
double clicking the e-mail in Drafts or selecting Edit as new.
When forwarding the e-mail it doesn't seem to affect the empty lines,
very weird behaviour.
Regards,
Mikael
On 2014-10-29 06:25, Sudip Mukherjee wrote:
On Tue, Oct 28, 2014 at 09:07:00PM +0100, Mikael Svantesson wrote:
Signed-off-by: Mikael Svantesson mik...@distopic.net
still the same problem.
ERROR: patch seems to be corrupt (line wrapped?)
---
drivers/staging/skein/skein_api.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/skein/skein_api.c
b/drivers/staging/skein/skein_api.c
index 6e700ee..5bfce07 100644
--- a/drivers/staging/skein/skein_api.c
+++ b/drivers/staging/skein/skein_api.c
@@ -31,7 +31,7 @@ int skein_ctx_prepare(struct skein_ctx *ctx, enum
skein_size size)
{
skein_assert_ret(ctx size, SKEIN_FAIL);
- memset(ctx , 0, sizeof(struct skein_ctx));
+memset(ctx, 0, sizeof(struct skein_ctx));
ctx-skein_size = size;
return SKEIN_SUCCESS;
--
2.1.1
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2] staging: skein: skein_api.c: removed space before ','
On Wed, Oct 29, 2014 at 08:15:43AM +0100, Mikael Svantesson wrote:
I'm saving the patch to my mail server using git-imap-send, then enter
e-mail addresses using Thunderbird and send it.
any particular reason that you are not sending it using git send-email ?
The problem seems to be that Thunderbird thrashes empty lines when
double clicking the e-mail in Drafts or selecting Edit as new.
When forwarding the e-mail it doesn't seem to affect the empty lines,
very weird behaviour.
Regards,
Mikael
On 2014-10-29 06:25, Sudip Mukherjee wrote:
On Tue, Oct 28, 2014 at 09:07:00PM +0100, Mikael Svantesson wrote:
Signed-off-by: Mikael Svantesson mik...@distopic.net
still the same problem.
ERROR: patch seems to be corrupt (line wrapped?)
---
drivers/staging/skein/skein_api.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/skein/skein_api.c
b/drivers/staging/skein/skein_api.c
index 6e700ee..5bfce07 100644
--- a/drivers/staging/skein/skein_api.c
+++ b/drivers/staging/skein/skein_api.c
@@ -31,7 +31,7 @@ int skein_ctx_prepare(struct skein_ctx *ctx, enum
skein_size size)
{
skein_assert_ret(ctx size, SKEIN_FAIL);
- memset(ctx , 0, sizeof(struct skein_ctx));
+ memset(ctx, 0, sizeof(struct skein_ctx));
ctx-skein_size = size;
return SKEIN_SUCCESS;
--
2.1.1
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCHv2 0/3] staging: ion: enable pool shrinking in page unit
2014-10-29 오후 2:35에 Gioh Kim 이(가) 쓴 글: Hello, Current pool shrinking is not page unit, block unit. But shrinker returns the pool size in page unit, so it is confused. And there is no way to control pool size and shrink pool directly. I have 3 patches like followings. 1. Patch 1/3: make pool be shrinked by page unit This patch shrinks pool in page unit. 2. Patch 2/3: limit pool size This patch specifies pool size limit via debugfs. The default value of limit is 0. cat /sys/kernel/debug/ion/heaps/system_limit returns 0. If you want to create 4 pools and limit each pool by 10MB, you can write 40MB(=41943040) at system_limit debugfs file like following: echo 41943040 /sys/kernel/debug/ion/heaps/system_limit 2. Patch 3/3: enable debugfs to shrink page directly This patch enables debugfs to specify shrink amount. For instance, this shrinks all pages in every pool. echo 0 /sys/kernel/debug/ion/heaps/system_shrink And this shrinks 300-pages from entire pool. echo 30 /sys/kernel/debug/ion/heaps/system_shrink It try to shrink high-order pool first because high-order pages is necessary more than low-order when the system has low memory. This patchset is based on linux-next-20141023. Gioh Kim (3): staging: ion: shrink page-pool by page unit staging: ion: limit pool size staging: ion: debugfs to shrink pool drivers/staging/android/ion/ion.c | 62 - drivers/staging/android/ion/ion_page_pool.c | 32 - drivers/staging/android/ion/ion_system_heap.c | 20 ++-- 3 files changed, 75 insertions(+), 39 deletions(-) Following is my test result. I set the orders as 4,3,2,0 for test. # mount -t debugfs none /sys/kernel/debug .. activate driver that calls ion-alloc .. # cat /sys/kernel/debug/ion/heaps/system === no limit client pid size orphaned allocations (info is from last known client): total orphaned0 total 0 deferred free0 0 order 4 highmem pages in pool = 0 total 176 order 4 lowmem pages in pool = 11534336 total 0 order 3 highmem pages in pool = 0 total 0 order 3 lowmem pages in pool = 0 total 0 order 2 highmem pages in pool = 0 total 704 order 2 lowmem pages in pool = 11534336 total 0 order 0 highmem pages in pool = 0 total 2816 order 0 lowmem pages in pool = 11534336 total # cat /sys/kernel/debug/ion/heaps/system_limit 0 # echo 41943040 /sys/kernel/debug/ion/heaps/system_limit # cat /sys/kernel/debug/ion/heaps/system_limit 41943040 .. activate driver that calls ion-alloc .. # cat /sys/kernel/debug/ion/heaps/system 10MB limit client pid size orphaned allocations (info is from last known client): total orphaned0 total 0 deferred free0 0 order 4 highmem pages in pool = 0 total 161 order 4 lowmem pages in pool = 10551296 total 0 order 3 highmem pages in pool = 0 total 0 order 3 lowmem pages in pool = 0 total 0 order 2 highmem pages in pool = 0 total 641 order 2 lowmem pages in pool = 10502144 total 0 order 0 highmem pages in pool = 0 total 2561 order 0 lowmem pages in pool = 10489856 total # cat /sys/kernel/debug/ion/heaps/system_shrink === count total pages 7701 # echo 0 /sys/kernel/debug/ion/heaps/system_shrink = shrink all pages # cat /sys/kernel/debug/ion/heaps/system client pid size orphaned allocations (info is from last known client): total orphaned0 total 0 deferred free0 0 order 4 highmem pages in pool = 0 total 0 order 4 lowmem pages in pool = 0 total 0 order 3 highmem pages in pool = 0 total 0 order 3 lowmem pages in pool = 0 total 0 order 2 highmem pages in pool = 0 total 0 order 2 lowmem pages in pool = 0 total 0 order 0 highmem pages in pool = 0 total 0 order 0 lowmem pages in pool = 0 total # cat /sys/kernel/debug/ion/heaps/system_shrink 0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[patch v2] Documentation/SubmittingPatches: Reported-by tags and permission
The reported-by text says you have to ask for permission, but that should only be if the bug was reported in private. These days the standard is to always give reported-by credit or it's considered a bit rude. Signed-off-by: Dan Carpenter dan.carpen...@oracle.com diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 482c749..1fa1caa 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -483,12 +483,10 @@ have been included in the discussion 14) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes: -If this patch fixes a problem reported by somebody else, consider adding a -Reported-by: tag to credit the reporter for their contribution. Please -note that this tag should not be added without the reporter's permission, -especially if the problem was not reported in a public forum. That said, -if we diligently credit our bug reporters, they will, hopefully, be -inspired to help us again in the future. +The Reported-by tag gives credit to people who find bugs and report them and it +hopefully inspires them to help us again in the future. Please note that if +the bug was reported in private, then ask for permission first before using the +Reported-by tag. A Tested-by: tag indicates that the patch has been successfully tested (in some environment) by the person named. This tag informs maintainers that ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [patch v2] Documentation/SubmittingPatches: Reported-by tags and permission
On Wed, 29 Oct 2014 13:01:36 +0300 Dan Carpenter dan.carpen...@oracle.com wrote: The reported-by text says you have to ask for permission, but that should only be if the bug was reported in private. These days the standard is to always give reported-by credit or it's considered a bit rude. Signed-off-by: Dan Carpenter dan.carpen...@oracle.com Applied, thanks. jon ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 1/1] staging: skein: Removes skein_debug include
Eric, Much better. One small nit below: On Tue, Oct 28, 2014 at 06:44:31PM -0500, Eric Rost wrote: Removes skein_debug.h include since skein_debug.h is nonexistent. Removes unneeded debug empty macro defines and their uses. Signed-off-by: Eric Rost eric.r...@mybabylon.net --- drivers/staging/skein/skein_base.c | 18 -- drivers/staging/skein/skein_base.h | 17 - drivers/staging/skein/skein_block.c | 30 +- 3 files changed, 1 insertion(+), 64 deletions(-) ... diff --git a/drivers/staging/skein/skein_block.c b/drivers/staging/skein/skein_block.c index 36b0b40..289bf13 100644 --- a/drivers/staging/skein/skein_block.c +++ b/drivers/staging/skein/skein_block.c ... @@ -422,9 +409,6 @@ void skein_256_process_block(struct skein_256_ctx *ctx, const u8 *blk_ptr, X3 = w[3] + ks[3]; /* show starting state values */ - skein_show_r_ptr(BLK_BITS, ctx-h, SKEIN_RND_KEY_INITIAL, - x_ptr); - Please remove the comment here as well. blk_ptr += SKEIN_256_BLOCK_BYTES; /* run the rounds */ Fix that up and please add my: Reviewed-by: Jason Cooper ja...@lakedaemon.net to the next version (below your Signed-off-by:). thx, Jason. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 3/3] staging: comedi: usbduxfast: updated address details
On Tue, Oct 14, 2014 at 04:59:13PM +, Hartley Sweeten wrote: On Tuesday, October 14, 2014 9:51 AM, Hartley Sweeten wrote: On Friday, October 10, 2014 12:35 PM, Bernd Porr wrote: Updated the range of years, e-mail and added driver desription as usually done in comedi. Signed-off-by: Bernd Porr m...@berndporr.me.uk Reviewed-by: H Hartley Sweeten hswee...@visionengravers.com Bernd, Oops, this patch has trailing whitespace. Could you fix that please? No need, I've stripped it off, thanks. greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: lustre: fix sparse warning for static declarations
On Sat, Oct 25, 2014 at 07:09:34PM +, Junien Fridrick wrote: This patch fixes the following sparse warnings : drivers/staging/lustre/lnet/lnet/router_proc.c:167:5: warning: symbol 'proc_lnet_routes' was not declared. Should it be static? drivers/staging/lustre/lnet/lnet/router_proc.c:293:5: warning: symbol 'proc_lnet_routers' was not declared. Should it be static? drivers/staging/lustre/lnet/lnet/router_proc.c:428:5: warning: symbol 'proc_lnet_peers' was not declared. Should it be static? drivers/staging/lustre/lnet/lnet/router_proc.c:660:5: warning: symbol 'proc_lnet_nis' was not declared. Should it be static? Signed-off-by: Junien Fridrick linux.ker...@junien.fridrick.net --- This patch is part of task 16 of the Eudyptula challenge Applies to next-20141023 drivers/staging/lustre/lnet/lnet/router_proc.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) This patch fails to apply to my tree, please refresh and try again. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 02/02] staging:lustre:lnet:selftest: remove unused function
On Tue, Oct 28, 2014 at 09:50:19PM +0400, Anton Saraev wrote:
Function lnet_selftest_structure_assertion is never used and can
be removed.
Signed-off-by: Anton Saraev antonysar...@gmail.com
---
drivers/staging/lustre/lnet/selftest/module.c | 11 ---
1 file changed, 11 deletions(-)
diff --git a/drivers/staging/lustre/lnet/selftest/module.c
b/drivers/staging/lustre/lnet/selftest/module.c
index 718663f..92520c2 100644
--- a/drivers/staging/lustre/lnet/selftest/module.c
+++ b/drivers/staging/lustre/lnet/selftest/module.c
@@ -90,17 +90,6 @@ lnet_selftest_fini(void)
return;
}
-static void
-lnet_selftest_structure_assertion(void)
-{
- CLASSERT(sizeof(srpc_msg_t) == 160);
- CLASSERT(sizeof(srpc_test_reqst_t) == 70);
- CLASSERT(offsetof(srpc_msg_t, msg_body.tes_reqst.tsr_concur) == 72);
- CLASSERT(offsetof(srpc_msg_t, msg_body.tes_reqst.tsr_ndest) == 78);
- CLASSERT(sizeof(srpc_stat_reply_t) == 136);
- CLASSERT(sizeof(srpc_stat_reqst_t) == 28);
-}
-
static int
lnet_selftest_init(void)
{
This doesn't apply to my tree at all :(
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 01/02] staging:lustre:lnet:selftest: fix sparse warnings
On Tue, Oct 28, 2014 at 09:50:18PM +0400, Anton Saraev wrote: Fix sparse warnings: symbol X was not declared. Should it be static? Some functions used only in files where they are declared. They can be static. Signed-off-by: Anton Saraev antonysar...@gmail.com --- drivers/staging/lustre/lnet/selftest/conctl.c| 34 drivers/staging/lustre/lnet/selftest/conrpc.c| 20 +- drivers/staging/lustre/lnet/selftest/framework.c | 50 drivers/staging/lustre/lnet/selftest/module.c| 6 +-- drivers/staging/lustre/lnet/selftest/rpc.c | 34 drivers/staging/lustre/lnet/selftest/timer.c | 8 ++-- 6 files changed, 76 insertions(+), 76 deletions(-) This patch adds a build warning to the build, so I can't apply it. Please fix it up and resend. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v6 0/7] staging: skein: CryptoAPI and Module Support
On Mon, Oct 27, 2014 at 09:20:31AM -0400, Jason Cooper wrote: Greg, On Fri, Oct 24, 2014 at 05:29:09PM -0500, Eric Rost wrote: Adds CryptoAPI and loadable module support to the Skein Hashing Algorithm. Collapses threefish module into skein module. Renames skein.c and skein.h to skein_base.c and skein_base.h so module can be named skein.ko. Inlines rotl_64 macro. Removes unneeded #define and skein_debug.h include. Eric Rost (7): staging: skein: Collapses threefish module staging: skein: Renames skein to skein_base staging: skein: Adds CryptoAPI Support staging: skein: Adds Loadable Module Support staging: skein: Inlines rotl_64 staging: skein: Removes unneeded #define For patches 1 through 6, Reviewed-by: Jason Cooper ja...@lakedaemon.net We'll keep working on #7, but feel free to take the first six when you get a moment Greg. Now applied, thanks. greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2] staging: skein: skein_api.c: removed space before ','
On Tue, Oct 28, 2014 at 09:07:00PM +0100, Mikael Svantesson wrote:
Signed-off-by: Mikael Svantesson mik...@distopic.net
---
drivers/staging/skein/skein_api.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/skein/skein_api.c
b/drivers/staging/skein/skein_api.c
index 6e700ee..5bfce07 100644
--- a/drivers/staging/skein/skein_api.c
+++ b/drivers/staging/skein/skein_api.c
@@ -31,7 +31,7 @@ int skein_ctx_prepare(struct skein_ctx *ctx, enum
skein_size size)
{
skein_assert_ret(ctx size, SKEIN_FAIL);
-memset(ctx , 0, sizeof(struct skein_ctx));
+ memset(ctx, 0, sizeof(struct skein_ctx));
Still corrupted, what added the extra ' ' before the '-'?
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: lustre: Fix coding style. Switch and case at the same indent.
On Tue, Oct 28, 2014 at 09:35:15PM +0200, Evaldas Palaima wrote:
Fix a style issue reported by checkpatch.pl for the Eudyptula challenge.
Signed-off-by: Evaldas Palaima evaldas.pala...@gmail.com
---
drivers/staging/lustre/lustre/libcfs/fail.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/lustre/lustre/libcfs/fail.c
b/drivers/staging/lustre/lustre/libcfs/fail.c
index e73ca3d..92444b0 100644
--- a/drivers/staging/lustre/lustre/libcfs/fail.c
+++ b/drivers/staging/lustre/lustre/libcfs/fail.c
@@ -103,18 +103,18 @@ int __cfs_fail_check_set(__u32 id, __u32 value, int set)
}
switch (set) {
- case CFS_FAIL_LOC_NOSET:
- case CFS_FAIL_LOC_VALUE:
- break;
- case CFS_FAIL_LOC_ORSET:
- cfs_fail_loc |= value ~(CFS_FAILED | CFS_FAIL_ONCE);
- break;
- case CFS_FAIL_LOC_RESET:
- cfs_fail_loc = value;
- break;
- default:
- LASSERTF(0, called with bad set %u\n, set);
- break;
+ case CFS_FAIL_LOC_NOSET:
+ case CFS_FAIL_LOC_VALUE:
+ break;
+ case CFS_FAIL_LOC_ORSET:
+ cfs_fail_loc |= value ~(CFS_FAILED | CFS_FAIL_ONCE);
+ break;
+ case CFS_FAIL_LOC_RESET:
+ cfs_fail_loc = value;
+ break;
+ default:
+ LASSERTF(0, called with bad set %u\n, set);
+ break;
}
return 1;
Someone else did this change before you, sorry :(
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 1/2] staging: lustre: Reduce function visibility
On Sat, Oct 25, 2014 at 03:30:37AM +0200, Mariusz Gorski wrote:
This patch fixes the following sparse warnings:
drivers/staging/lustre/lnet/lnet/module.c:47:1: warning: symbol
'lnet_configure' was not declared. Should it be static?
drivers/staging/lustre/lnet/lnet/module.c:67:1: warning: symbol
'lnet_unconfigure' was not declared. Should it be static?
drivers/staging/lustre/lnet/lnet/module.c:87:1: warning: symbol
'lnet_ioctl' was not declared. Should it be static?
drivers/staging/lustre/lnet/lnet/module.c:114:1: warning: symbol
'init_lnet' was not declared. Should it be static?
drivers/staging/lustre/lnet/lnet/module.c:139:1: warning: symbol
'fini_lnet' was not declared. Should it be static?
Signed-off-by: Mariusz Gorski marius.gor...@gmail.com
---
drivers/staging/lustre/lnet/lnet/module.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/lustre/lnet/lnet/module.c
b/drivers/staging/lustre/lnet/lnet/module.c
index e84d59d..dc09b43 100644
--- a/drivers/staging/lustre/lnet/lnet/module.c
+++ b/drivers/staging/lustre/lnet/lnet/module.c
@@ -43,7 +43,7 @@ MODULE_PARM_DESC(config_on_load, configure network at
module load);
static struct mutex lnet_config_mutex;
-int
+static int
lnet_configure(void *arg)
{
/* 'arg' only there so I can be passed to cfs_create_thread() */
@@ -63,7 +63,7 @@ lnet_configure(void *arg)
return rc;
}
-int
+static int
lnet_unconfigure(void)
{
int refcount;
@@ -83,7 +83,7 @@ lnet_unconfigure(void)
return (refcount == 0) ? 0 : -EBUSY;
}
-int
+static int
lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_data *data)
{
int rc;
@@ -110,7 +110,7 @@ lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_data
*data)
DECLARE_IOCTL_HANDLER(lnet_ioctl_handler, lnet_ioctl);
-int
+static int
init_lnet(void)
{
int rc;
@@ -135,7 +135,7 @@ init_lnet(void)
return 0;
}
-void
+static void
fini_lnet(void)
{
int rc;
Someone did this patch before you, sorry.
greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/1] Octeon: Staging Driver: Remove coding warnings
On Sun, Oct 12, 2014 at 01:13:51PM +0530, Akshay Sarode wrote: Checkpatch coding warnings of 'Missing a blank line after declaration' Signed-off-by: Akshay Sarode akshaysarod...@gmail.com --- drivers/staging/octeon/ethernet-tx.c | 11 +++ 1 file changed, 11 insertions(+) Someone else already did this, sorry :( ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/1] staging - rtl8188eu: Deletion of unnecessary checks before three function calls
On Thu, Oct 23, 2014 at 09:20:29PM +0200, SF Markus Elfring wrote: From 45970693cad6c12da2d5ac7da3d2bd7a566170d7 Mon Sep 17 00:00:00 2001 From: Markus Elfring elfr...@users.sourceforge.net Date: Thu, 23 Oct 2014 20:55:13 +0200 Subject: [PATCH] staging - rtl8188eu: Deletion of unnecessary checks before three function calls Why is this here? Please use git send-email to send a patch, so I don't have to hand-edit the text in it. Also, your Subject is a bit odd, it has a Re: in it for no reason, and your From: doesn't match the name you used here. Please fix up and resend. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] drivers: staging: imx-drm Fix checkpatch warning
On Wed, Oct 15, 2014 at 11:37:24PM -0300, Gaston Gonzalez wrote:
Fix line over 80 characters in imx-tve.c
Signed-off-by: Gaston Gonzalez gasc...@gmail.com
---
drivers/staging/imx-drm/imx-tve.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/imx-drm/imx-tve.c
b/drivers/staging/imx-drm/imx-tve.c
index 3e8b0a1..a46905f 100644
--- a/drivers/staging/imx-drm/imx-tve.c
+++ b/drivers/staging/imx-drm/imx-tve.c
@@ -665,7 +665,8 @@ static int imx_tve_bind(struct device *dev, struct device
*master, void *data)
ret = regmap_read(tve-regmap, TVE_COM_CONF_REG, val);
if (ret 0) {
- dev_err(dev, failed to read configuration register: %d\n,
ret);
+ dev_err(dev, failed to read configuration register: %d\n,
+ ret);
return ret;
}
if (val != 0x0010) {
Does not apply :(
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: vt6655: Fix a typo in card.c
On Sun, Oct 26, 2014 at 06:57:37AM +, Nicky Chorley wrote: The word force was spelt incorrectly. Signed-off-by: Nicky Chorley ndchor...@gmail.com --- The C99 comments will be fixed in another patch, when I get round to it! drivers/staging/vt6655/card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index f2a33a9..ce496b1 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -819,7 +819,7 @@ CARDbPowerDown( if (MACbIsRegBitsOn(pDevice-PortOffset, MAC_REG_PSCTL, PSCTL_PS)) return true; - // Froce PSEN on + // Force PSEN on MACvRegBitsOn(pDevice-PortOffset, MAC_REG_PSCTL, PSCTL_PSEN); // check if all TD are empty, -- 1.8.4 This doesn't apply to my tree :( ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: dgnc: fix macro coding style issue in digi.h
On Wed, Oct 29, 2014 at 02:12:38AM +0800, Cheng-Yi He wrote: This is a patch to the digi.h file that fixes up the following error found by the checkpatch tool. ERROR: Macros with complex values should be enclosed in parentheses Signed-off-by: Cheng-Yi He chengyihetai...@gmail.com --- drivers/staging/dgnc/digi.h | 60 ++--- 1 file changed, 30 insertions(+), 30 deletions(-) You didn't test build this patch :( ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: rtl8192e: from bus specific dma api to dma api
On Wed, Oct 22, 2014 at 02:24:46PM +0530, Sudip Mukherjee wrote: we should be using DMA API rather than using bus specific DMA API. Why? converted the occurrence of pci_map_*() to dma_map_*(), and at the same time used the dma_mapping_error(). Trailing whitespace :( What have you used to test this change? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: rts5208: rtsx_scsi: Fixed a brace coding style issue
On Fri, Oct 17, 2014 at 12:30:51AM +0100, Mike Roocroft wrote:
Fixed a coding style issue.
Signed-off-by: Mike Roocroft mike.li...@btinternet.com
---
drivers/staging/rts5208/rtsx_scsi.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/rts5208/rtsx_scsi.c
b/drivers/staging/rts5208/rtsx_scsi.c
index bbbf796..1161082 100644
--- a/drivers/staging/rts5208/rtsx_scsi.c
+++ b/drivers/staging/rts5208/rtsx_scsi.c
@@ -584,9 +584,8 @@ static int start_stop_unit(struct scsi_cmnd *srb, struct
rtsx_chip *chip)
case MAKE_MEDIUM_READY:
case LOAD_MEDIUM:
- if (check_card_ready(chip, lun)) {
+ if (check_card_ready(chip, lun))
return TRANSPORT_GOOD;
- }
set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
TRACE_RET(chip, TRANSPORT_FAILED);
--
2.1.2
Does not apply :(
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH][V2] Staging:rtl8723au: open/closed brace issue
On Sun, Oct 26, 2014 at 03:10:22PM +, Paul McQuade wrote:
ERROR: that open brace { should be on the previous line
Signed-off-by: Paul McQuade paulmcq...@gmail.com
---
drivers/staging/rtl8723au/core/rtw_ap.c | 130
++--
1 file changed, 40 insertions(+), 90 deletions(-)
This doesn't apply to my tree :(
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 2/2] staging: rtl8723au:core
On Sun, Oct 26, 2014 at 04:18:52PM +, Paul McQuade wrote: ERROR: spaces required around that ':' (ctx:VxE) Signed-off-by: Paul McQuade paulmcq...@gmail.com --- drivers/staging/rtl8723au/core/rtw_ieee80211.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) Your Subject: makes no sense :( ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: rtl8723au pointer issue
On Sun, Oct 26, 2014 at 03:59:56PM +, Paul McQuade wrote: ERROR: foo*bar should be foo *bar Signed-off-by: Paul McQuade paulmcq...@gmail.com --- drivers/staging/rtl8723au/core/rtw_cmd.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) The subject does not make sense :( ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 2/2] staging: rtl8723au: core style issue
On Mon, Oct 27, 2014 at 12:16:08AM +, Paul McQuade wrote: spaces required around % Signed-off-by: Paul McQuade paulmcq...@gmail.com --- drivers/staging/rtl8723au/core/rtw_recv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Your subject does not make sense :( ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH RESEND v2 1/2] Staging: rts5208: helper function to manage aspm during reset
On Tue, Oct 28, 2014 at 07:46:55PM +0100, Fabio Falzoi wrote: Define the helper function rtsx_reset_aspm to shorten the rtsx_reset_chip code and get rid of the LONG_LINE checkpatch warnings. Signed-off-by: Fabio Falzoi fabio.falzo...@gmail.com Reviewed-by: Dan Carpenter dan.carpe...@oracle.com --- drivers/staging/rts5208/rtsx_chip.c | 70 + 1 file changed, 39 insertions(+), 31 deletions(-) These both don't apply, can you refresh again? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/2] staging: rtl8723au: core: pointer issue
On Sun, Oct 26, 2014 at 04:17:46PM +, Paul McQuade wrote: ERROR: foo * bar should be foo *bar Signed-off-by: Paul McQuade paulmcq...@gmail.com --- drivers/staging/rtl8723au/core/rtw_efuse.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) Again with the odd subject :( ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 01/10] staging: unisys: fix blank lines virthba
On Tue, Oct 28, 2014 at 06:42:37PM -0400, Erik Arfvidson wrote: This patch removes unnecessary blanks lines and adds necessary blank lines in virthba. Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com --- drivers/staging/unisys/virthba/virthba.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) This series doesn't apply, can you please refresh it against my latest staging-testing branch of staging.git and resend? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/4] [media] solo6x10: free vb2 buffers on stop_streaming
This fixes warning from drivers/media/v4l2-core/videobuf2-core.c:2144
Signed-off-by: Andrey Utkin andrey.krieger.ut...@gmail.com
---
drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
index 28023f9..6cd6a25 100644
--- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
@@ -781,9 +781,19 @@ static int solo_enc_start_streaming(struct vb2_queue *q,
unsigned int count)
static void solo_enc_stop_streaming(struct vb2_queue *q)
{
struct solo_enc_dev *solo_enc = vb2_get_drv_priv(q);
+ unsigned long flags;
+ spin_lock_irqsave(solo_enc-av_lock, flags);
solo_enc_off(solo_enc);
- INIT_LIST_HEAD(solo_enc-vidq_active);
+ while (!list_empty(solo_enc-vidq_active)) {
+ struct solo_vb2_buf *buf = list_entry(
+ solo_enc-vidq_active.next,
+ struct solo_vb2_buf, list);
+
+ list_del(buf-list);
+ vb2_buffer_done(buf-vb, VB2_BUF_STATE_ERROR);
+ }
+ spin_unlock_irqrestore(solo_enc-av_lock, flags);
solo_ring_stop(solo_enc-solo_dev);
}
--
1.8.5.5
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 4/4] [media] solo6x10: don't turn off/on encoder interrupt in processing loop
The used approach actually cannot prevent new encoder interrupt to appear, because interrupt handler can execute in different thread, and in current implementation there is still race condition regarding this. Also from practice the code with this change seems to work as stable as before. Signed-off-by: Andrey Utkin andrey.krieger.ut...@gmail.com --- drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c index b9b61b9..30e09d9 100644 --- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c @@ -703,9 +703,7 @@ static int solo_ring_thread(void *data) if (timeout == -ERESTARTSYS || kthread_should_stop()) break; - solo_irq_off(solo_dev, SOLO_IRQ_ENCODER); solo_handle_ring(solo_dev); - solo_irq_on(solo_dev, SOLO_IRQ_ENCODER); try_to_freeze(); } -- 1.8.5.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/4] [media] solo6x10: free DMA allocation when releasing encoder
Fixes this warning: [ 956.730136] [ cut here ] [ 956.730143] WARNING: CPU: 1 PID: 10134 at lib/dma-debug.c:963 dma_debug_device_change+0x191/0x1f0() [ 956.730146] pci :07:05.0: DMA-API: device driver has pending DMA allocations while released from device [count=8] One of leaked entries details: [device address=0xd3d57000] [size=512 bytes] [mapped with DMA_BIDIRECTIONAL] [mapped as coherent] [ 956.730147] Modules linked in: solo6x10(-) videobuf2_dma_contig videobuf2_dma_sg videobuf2_memops videobuf2_core ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat nf_nat_ipv4 nf_nat videobuf_vmalloc videobuf_core v4l2_common videodev rt2800usb rt2800lib rt2x00usb rt2x00lib mac80211 cfg80211 crc_ccitt usbkbd hid_a4tech hid_generic usbhid snd_hda_codec_hdmi snd_hda_codec_via snd_hda_codec_generic snd_hda_intel snd_hda_controller snd_hda_codec snd_hwdep snd_pcm x86_pkg_temp_thermal snd_timer snd soundcore [ 956.730172] CPU: 1 PID: 10134 Comm: rmmod Not tainted 3.18.0-rc1-next-20141023-zver-dirty #24 [ 956.730173] Hardware name: System manufacturer System Product Name/P8H77-V, BIOS 0501 02/28/2012 [ 956.730175] 0009 8801df9e3c58 817ffe6b 0001 [ 956.730177] 8801df9e3ca8 8801df9e3c98 81091ec7 0046 [ 956.730180] 880215457e90 0008 81cbb10f 880215570098 [ 956.730183] Call Trace: [ 956.730188] [817ffe6b] dump_stack+0x4f/0x7c [ 956.730192] [81091ec7] warn_slowpath_common+0x87/0xb0 [ 956.730194] [81091f91] warn_slowpath_fmt+0x41/0x50 [ 956.730197] [81412558] ? dma_debug_device_change+0xb8/0x1f0 [ 956.730199] [81412631] dma_debug_device_change+0x191/0x1f0 [ 956.730203] [810b14ad] notifier_call_chain+0x4d/0x70 [ 956.730205] [810b15f9] __blocking_notifier_call_chain+0x59/0x80 [ 956.730207] [810b1631] blocking_notifier_call_chain+0x11/0x20 [ 956.730211] [815873af] __device_release_driver+0xcf/0xf0 [ 956.730213] [81587ee8] driver_detach+0xc8/0xd0 [ 956.730215] [81587147] bus_remove_driver+0x57/0xd0 [ 956.730218] [815887e9] driver_unregister+0x29/0x60 [ 956.730221] [81420131] pci_unregister_driver+0x21/0x90 [ 956.730225] [a03219d7] solo_pci_driver_exit+0x10/0x12 [solo6x10] [ 956.730228] [81112ee0] SyS_delete_module+0x170/0x1f0 [ 956.730232] [813eb76e] ? trace_hardirqs_on_thunk+0x3a/0x3f [ 956.730234] [8180abd2] system_call_fastpath+0x12/0x17 [ 956.730235] ---[ end trace e730af02713a6c53 ]--- [ 956.730237] Mapped at: [ 956.730238] [8141186c] debug_dma_alloc_coherent+0x3c/0xb0 [ 956.730240] [a03203f6] solo_enc_v4l2_init+0x706/0xba0 [solo6x10] [ 956.730243] [a03165b3] solo_pci_probe+0x503/0x700 [solo6x10] [ 956.730245] [81420459] local_pci_probe+0x49/0xa0 [ 956.730248] [814207a1] pci_device_probe+0xd1/0x120 Signed-off-by: Andrey Utkin andrey.krieger.ut...@gmail.com --- drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c index 6cd6a25..9afeb69 100644 --- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c @@ -1385,6 +1385,9 @@ static void solo_enc_free(struct solo_enc_dev *solo_enc) if (solo_enc == NULL) return; + pci_free_consistent(solo_enc-solo_dev-pdev, + sizeof(struct solo_p2m_desc) * solo_enc-desc_nelts, + solo_enc-desc_items, solo_enc-desc_dma); video_unregister_device(solo_enc-vfd); v4l2_ctrl_handler_free(solo_enc-hdl); kfree(solo_enc); -- 1.8.5.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2] staging: skein: skein_api.c: removed space before ','
On Wed, Oct 29, 2014 at 08:25:30AM +0100, Mikael Svantesson wrote:
Signed-off-by: Mikael Svantesson mik...@distopic.net
---
drivers/staging/skein/skein_api.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/skein/skein_api.c
b/drivers/staging/skein/skein_api.c
index 6e700ee..5bfce07 100644
--- a/drivers/staging/skein/skein_api.c
+++ b/drivers/staging/skein/skein_api.c
@@ -31,7 +31,7 @@ int skein_ctx_prepare(struct skein_ctx *ctx, enum
skein_size size)
{
skein_assert_ret(ctx size, SKEIN_FAIL);
- memset(ctx , 0, sizeof(struct skein_ctx));
+ memset(ctx, 0, sizeof(struct skein_ctx));
ctx-skein_size = size;
return SKEIN_SUCCESS;
--
2.1.1
On 2014-10-29 08:15, Mikael Svantesson wrote:
I'm saving the patch to my mail server using git-imap-send, then enter
e-mail addresses using Thunderbird and send it.
The problem seems to be that Thunderbird thrashes empty lines when
double clicking the e-mail in Drafts or selecting Edit as new.
When forwarding the e-mail it doesn't seem to affect the empty lines,
very weird behaviour.
Regards,
Mikael
On 2014-10-29 06:25, Sudip Mukherjee wrote:
On Tue, Oct 28, 2014 at 09:07:00PM +0100, Mikael Svantesson wrote:
Signed-off-by: Mikael Svantesson mik...@distopic.net
still the same problem.
ERROR: patch seems to be corrupt (line wrapped?)
---
drivers/staging/skein/skein_api.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/skein/skein_api.c
b/drivers/staging/skein/skein_api.c
index 6e700ee..5bfce07 100644
--- a/drivers/staging/skein/skein_api.c
+++ b/drivers/staging/skein/skein_api.c
@@ -31,7 +31,7 @@ int skein_ctx_prepare(struct skein_ctx *ctx, enum
skein_size size)
{
skein_assert_ret(ctx size, SKEIN_FAIL);
-memset(ctx , 0, sizeof(struct skein_ctx));
+ memset(ctx, 0, sizeof(struct skein_ctx));
ctx-skein_size = size;
return SKEIN_SUCCESS;
--
2.1.1
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Please send this as a correct patch, not one with a whole bunch of
other stuff in it that I would have to hand-edit in order to apply
properly.
Remember, you want to make it as easy as possible for me to accept your
patches, so far, this isn't going well :)
greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: android: logger: Remove uneeded tabs in variable declaration
On Tue, Oct 28, 2014 at 11:09:10PM -0700, Tristan Lelong wrote: This patch removes tabs used to align variable names in declaration and assignation. It replaces them with exactly one space. Why? This seems like a totally unneeded change, sorry. greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 06/10] staging: unisys: remove all unnecessary space after cast visorchannel_funcs
This patch removes all unnecessary spaces after cast for visorchannel_funcs
Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com
---
.../unisys/visorchannel/visorchannel_funcs.c | 25 +++---
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index d53906e..237be55 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -93,7 +93,7 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong
channelBytes,
}
if (channelBytes == 0)
/* we had better be a CLIENT of this channel */
- channelBytes = (ulong) p-chan_hdr.size;
+ channelBytes = (ulong)p-chan_hdr.size;
if (uuid_le_cmp(guid, NULL_UUID_LE) == 0)
/* we had better be a CLIENT of this channel */
guid = p-chan_hdr.chtype;
@@ -291,7 +291,7 @@ EXPORT_SYMBOL_GPL(visorchannel_clear);
void __iomem *
visorchannel_get_header(VISORCHANNEL *channel)
{
- return (void __iomem *) (channel-chan_hdr);
+ return (void __iomem *)channel-chan_hdr;
}
EXPORT_SYMBOL_GPL(visorchannel_get_header);
@@ -338,7 +338,8 @@ sig_read_header(VISORCHANNEL *channel, u32 queue,
sizeof(struct signal_queue_header)) 0) {
ERRDRV(queue=%d SIG_QUEUE_OFFSET=%d,
queue, (int)SIG_QUEUE_OFFSET(channel-chan_hdr, queue));
- ERRDRV(visor_memregion_read of signal queue failed:
(status=%d)\n, rc);
+ ERRDRV(visor_memregion_read of signal queue failed:
(status=%d)\n,
+ rc);
goto Away;
}
rc = TRUE;
@@ -524,7 +525,7 @@ visorchannel_signalqueue_slots_avail(VISORCHANNEL *channel,
u32 queue)
head = head + sig_hdr.max_slots;
slots_used = (head - tail);
slots_avail = sig_hdr.max_signals - slots_used;
- return (int) slots_avail;
+ return (int)slots_avail;
}
EXPORT_SYMBOL_GPL(visorchannel_signalqueue_slots_avail);
@@ -535,7 +536,7 @@ visorchannel_signalqueue_max_slots(VISORCHANNEL *channel,
u32 queue)
if (!sig_read_header(channel, queue, sig_hdr))
return 0;
- return (int) sig_hdr.max_signals;
+ return (int)sig_hdr.max_signals;
}
EXPORT_SYMBOL_GPL(visorchannel_signalqueue_max_slots);
@@ -598,13 +599,13 @@ visorchannel_debug(VISORCHANNEL *channel, int nQueues,
} else
return;
}
- nbytes = (ulong) (phdr-size);
+ nbytes = (ulong)(phdr-size);
seq_printf(seq, --- Begin channel @0x%-16.16Lx for 0x%lx bytes
(region=0x%lx bytes) ---\n,
addr + off, nbytes, nbytes_region);
seq_printf(seq, Type= %pUL\n, phdr-chtype);
seq_printf(seq, ZoneGuid= %pUL\n, phdr-zone_uuid);
seq_printf(seq, Signature = 0x%-16.16Lx\n,
- (long long) phdr-signature);
+ (long long)phdr-signature);
seq_printf(seq, LegacyState = %lu\n, (ulong)phdr-legacy_state);
seq_printf(seq, SrvState= %lu\n, (ulong)phdr-srv_state);
seq_printf(seq, CliStateBoot= %lu\n, (ulong)phdr-cli_state_boot);
@@ -612,14 +613,14 @@ visorchannel_debug(VISORCHANNEL *channel, int nQueues,
seq_printf(seq, HeaderSize = %lu\n, (ulong)phdr-header_size);
seq_printf(seq, Size= %llu\n, (long long)phdr-size);
seq_printf(seq, Features= 0x%-16.16llx\n,
- (long long) phdr-features);
+ (long long)phdr-features);
seq_printf(seq, PartitionHandle = 0x%-16.16llx\n,
- (long long) phdr-partition_handle);
+ (long long)phdr-partition_handle);
seq_printf(seq, Handle = 0x%-16.16llx\n,
- (long long) phdr-handle);
- seq_printf(seq, VersionId = %lu\n, (ulong) phdr-version_id);
+ (long long)phdr-handle);
+ seq_printf(seq, VersionId = %lu\n, (ulong)phdr-version_id);
seq_printf(seq, oChannelSpace = %llu\n,
- (long long) phdr-ch_space_offset);
+ (long long)phdr-ch_space_offset);
if ((phdr-ch_space_offset == 0) || (errcode 0))
;
else
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 09/10] staging: unisys: remove unnecessary blank line in visorchannel_funcs
this patch removes unnecessary blank line in visorchannel_funcs
Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com
---
drivers/staging/unisys/visorchannel/visorchannel_funcs.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 5e48fb3..2da4dc2 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -508,7 +508,6 @@ Away:
}
EXPORT_SYMBOL_GPL(visorchannel_signalinsert);
-
int
visorchannel_signalqueue_slots_avail(VISORCHANNEL *channel, u32 queue)
{
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 08/10] staging: unisys: fixed aligment in visorchannel_funcs
this patch fixes aligment for visorchanne_funcs
Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com
---
drivers/staging/unisys/visorchannel/visorchannel_funcs.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index ce06f8a..5e48fb3 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -230,7 +230,7 @@ visorchannel_read(VISORCHANNEL *channel, ulong offset,
int rc = visor_memregion_read(channel-memregion, offset,
local, nbytes);
if ((rc = 0) (offset == 0)
- (nbytes = sizeof(struct channel_header))) {
+ (nbytes = sizeof(struct channel_header))) {
memcpy(channel-chan_hdr, local,
sizeof(struct channel_header));
}
@@ -404,8 +404,7 @@ safe_sig_queue_validate(struct signal_queue_header
*psafe_sqh,
punsafe_sqh-tail = *ptail;
ERRDRV(safe_sig_queue_validate: head = 0x%x, tail = 0x%x,
MaxSlots = 0x%x,
-*phead, *ptail, psafe_sqh-max_slots);
- return 0;
+ *phead, *ptail, psafe_sqh-max_slots);
}
return 1;
} /* end safe_sig_queue_validate */
@@ -628,9 +627,10 @@ visorchannel_debug(VISORCHANNEL *channel, int nQueues,
struct signal_queue_header q;
errcode = visorchannel_read(channel,
- off + phdr-ch_space_offset +
- (i * sizeof(q)),
- q, sizeof(q));
+ off +
+ phdr-ch_space_offset +
+ (i * sizeof(q)),
+ q, sizeof(q));
if (errcode 0) {
seq_printf(seq,
failed to read signal queue #%d
from channel @0x%-16.16Lx errcode=%d\n,
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 10/10] staging: unisys: fixed braces check in visorchannel_funcs
this patch adds braces to an else statement to remove check in
checkpatch.pl for visorchannel_funcs.c
Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com
---
drivers/staging/unisys/visorchannel/visorchannel_funcs.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 2da4dc2..d4920e2 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -594,8 +594,9 @@ visorchannel_debug(VISORCHANNEL *channel, int nQueues,
if (off == 0) {
phdr = channel-chan_hdr;
seq_puts(seq, (following data may be stale)\n);
- } else
+ } else {
return;
+ }
}
nbytes = (ulong)(phdr-size);
seq_printf(seq, --- Begin channel @0x%-16.16Lx for 0x%lx bytes
(region=0x%lx bytes) ---\n,
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 05/10] staging: unisys: added spinlock comments visorchannel_funcs
This patch adds comment documentation to visorchannel_tag struct
Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com
---
drivers/staging/unisys/visorchannel/visorchannel_funcs.c | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 5fbd5ad..d53906e 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -33,9 +33,13 @@ struct VISORCHANNEL_Tag {
struct channel_header chan_hdr;
uuid_le guid;
ulong size;
- BOOL needs_lock;
- spinlock_t insert_lock;
- spinlock_t remove_lock;
+ BOOL needs_lock; /* Some channels don't need lock due to simplicity */
+ /* The guest can remove from certain queues, but cannot insert into
+* those queues. The guest can insert into other queues, but can't
+* remove from those queues . This is based on the queue type.
+*/
+ spinlock_t insert_lock; /* Protects queue insertion variables */
+ spinlock_t remove_lock; /* Protects queue from removal variables */
struct {
struct signal_queue_header req_queue;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 07/10] staging: unisys: fixed logical continuation visorchannel_funcs
this patch fixes a logical continuation check in visorchannel
Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com
---
drivers/staging/unisys/visorchannel/visorchannel_funcs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 237be55..ce06f8a 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -393,8 +393,8 @@ safe_sig_queue_validate(struct signal_queue_header
*psafe_sqh,
struct signal_queue_header *punsafe_sqh,
u32 *phead, u32 *ptail)
{
- if ((*phead = psafe_sqh-max_slots)
- || (*ptail = psafe_sqh-max_slots)) {
+ if ((*phead = psafe_sqh-max_slots) ||
+ (*ptail = psafe_sqh-max_slots)) {
/* Choose 0 or max, maybe based on current tail value */
*phead = 0;
*ptail = 0;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 01/10] staging: unisys: fix blank lines virthba
This patch removes unnecessary blanks lines and adds necessary blank lines in
virthba.
Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index ee1be5a..7475124 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -101,7 +101,6 @@ static DEF_SCSI_QCMD(virthba_queue_command)
#define virthba_queue_command virthba_queue_command_lck
#endif
-
static int virthba_slave_alloc(struct scsi_device *scsidev);
static int virthba_slave_configure(struct scsi_device *scsidev);
static void virthba_slave_destroy(struct scsi_device *scsidev);
@@ -166,6 +165,7 @@ struct virtdisk_info {
atomic_t error_count;
struct virtdisk_info *next;
};
+
/* Each Scsi_Host has a host_data area that contains this struct. */
struct virthba_info {
struct Scsi_Host *scsihost;
@@ -990,7 +990,6 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd,
sgl = scsi_sglist(scsicmd);
for_each_sg(sgl, sg, scsi_sg_count(scsicmd), i) {
-
cmdrsp-scsi.gpi_list[i].address = sg_phys(sg);
cmdrsp-scsi.gpi_list[i].length = sg-length;
if ((i != 0) (sg-offset != 0))
@@ -1208,7 +1207,6 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct
scsi_cmnd *scsicmd)
bufind += sg[i].length;
}
} else {
-
vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head;
for ( ; vdisk-next; vdisk = vdisk-next) {
if ((scsidev-channel != vdisk-channel)
@@ -1323,7 +1321,6 @@ drain_queue(struct virthba_info *virthbainfo, struct
chaninfo *dc,
}
}
-
/* main function for the thread that waits for scsi commands to arrive
* in a specified queue
*/
@@ -1657,7 +1654,6 @@ virthba_mod_init(void)
POSTCODE_LINUX_3(VHBA_CREATE_FAILURE_PC, error,
POSTCODE_SEVERITY_ERR);
} else {
-
/* create the debugfs directories and entries */
virthba_debugfs_dir = debugfs_create_dir(virthba, NULL);
debugfs_create_file(info, S_IRUSR, virthba_debugfs_dir,
@@ -1748,7 +1744,6 @@ virthba_mod_exit(void)
debugfs_remove_recursive(virthba_debugfs_dir);
LOGINF(Leaving virthba_mod_exit\n);
-
}
/* specify function to be run at module insertion time */
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 04/10] staging: unisys: fix all logical continuation virthba
This patch fixes all logical continuations issues in virthba.c
v2: fixed spacing around bitwise operator suggested by dan carpenter
Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c | 44
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index f30ef08..ee379b7 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -430,11 +430,11 @@ virthba_ISR(int irq, void *dev_id)
return IRQ_NONE;
virthbainfo-interrupts_rcvd++;
pChannelHeader = virthbainfo-chinfo.queueinfo-chan;
- if (((readq(pChannelHeader-features)
- ULTRA_IO_IOVM_IS_OK_WITH_DRIVER_DISABLING_INTS) != 0)
-((readq(pChannelHeader-features)
-ULTRA_IO_DRIVER_DISABLES_INTS) !=
- 0)) {
+ if (((readq(pChannelHeader-features)
+ ULTRA_IO_IOVM_IS_OK_WITH_DRIVER_DISABLING_INTS) != 0)
+ ((readq(pChannelHeader-features)
+ ULTRA_IO_DRIVER_DISABLES_INTS) !=
+0)) {
virthbainfo-interrupts_disabled++;
mask = ~ULTRA_CHANNEL_ENABLE_INTS;
rc1 = uisqueue_interlocked_and(virthbainfo-flags_addr, mask);
@@ -809,9 +809,9 @@ virthba_abort_handler(struct scsi_cmnd *scsicmd)
scsidev = scsicmd-device;
for (vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head;
vdisk-next; vdisk = vdisk-next) {
- if ((scsidev-channel == vdisk-channel)
-(scsidev-id == vdisk-id)
-(scsidev-lun == vdisk-lun)) {
+ if ((scsidev-channel == vdisk-channel)
+ (scsidev-id == vdisk-id)
+ (scsidev-lun == vdisk-lun)) {
if (atomic_read(vdisk-error_count)
VIRTHBA_ERROR_COUNT) {
atomic_inc(vdisk-error_count);
@@ -835,9 +835,9 @@ virthba_bus_reset_handler(struct scsi_cmnd *scsicmd)
scsidev = scsicmd-device;
for (vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head;
vdisk-next; vdisk = vdisk-next) {
- if ((scsidev-channel == vdisk-channel)
-(scsidev-id == vdisk-id)
-(scsidev-lun == vdisk-lun)) {
+ if ((scsidev-channel == vdisk-channel)
+ (scsidev-id == vdisk-id)
+ (scsidev-lun == vdisk-lun)) {
if (atomic_read(vdisk-error_count)
VIRTHBA_ERROR_COUNT) {
atomic_inc(vdisk-error_count);
@@ -861,9 +861,9 @@ virthba_device_reset_handler(struct scsi_cmnd *scsicmd)
scsidev = scsicmd-device;
for (vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head;
vdisk-next; vdisk = vdisk-next) {
- if ((scsidev-channel == vdisk-channel)
-(scsidev-id == vdisk-id)
-(scsidev-lun == vdisk-lun)) {
+ if ((scsidev-channel == vdisk-channel)
+ (scsidev-id == vdisk-id)
+ (scsidev-lun == vdisk-lun)) {
if (atomic_read(vdisk-error_count)
VIRTHBA_ERROR_COUNT) {
atomic_inc(vdisk-error_count);
@@ -1132,9 +1132,9 @@ do_scsi_linuxstat(struct uiscmdrsp *cmdrsp, struct
scsi_cmnd *scsicmd)
/* Okay see what our error_count is here */
for (vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head;
vdisk-next; vdisk = vdisk-next) {
- if ((scsidev-channel != vdisk-channel)
- || (scsidev-id != vdisk-id)
- || (scsidev-lun != vdisk-lun))
+ if ((scsidev-channel != vdisk-channel) ||
+ (scsidev-id != vdisk-id) ||
+ (scsidev-lun != vdisk-lun))
continue;
if (atomic_read(vdisk-error_count) VIRTHBA_ERROR_COUNT) {
@@ -1170,8 +1170,8 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct
scsi_cmnd *scsicmd)
struct virtdisk_info *vdisk;
scsidev = scsicmd-device;
- if ((cmdrsp-scsi.cmnd[0] == INQUIRY)
-(cmdrsp-scsi.bufflen = MIN_INQUIRY_RESULT_LEN)) {
+ if ((cmdrsp-scsi.cmnd[0] == INQUIRY)
+ (cmdrsp-scsi.bufflen = MIN_INQUIRY_RESULT_LEN)) {
if (cmdrsp-scsi.no_disk_result == 0)
return;
@@ -1210,9 +1210,9 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct
scsi_cmnd *scsicmd)
} else {
vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head;
for ( ; vdisk-next; vdisk = vdisk-next) {
- if ((scsidev-channel != vdisk-channel)
- ||
[PATCH 02/10] staging: unisys: virthba fix all spaces after cast
This patch fixes all spaces after cast for virthba
Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c | 130 +++
1 file changed, 65 insertions(+), 65 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index 7475124..6acdfd3 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -261,7 +261,7 @@ add_scsipending_entry(struct virthba_info *vhbainfo, char
cmdtype, void *new)
insert_location = vhbainfo-nextinsert;
while (vhbainfo-pending[insert_location].sent != NULL) {
insert_location = (insert_location + 1) % MAX_PENDING_REQUESTS;
- if (insert_location == (int) vhbainfo-nextinsert) {
+ if (insert_location == (int)vhbainfo-nextinsert) {
LOGERR(Queue should be full. insert_location%d
Unable to find open slot for pending commands.\n,
insert_location);
spin_unlock_irqrestore(vhbainfo-privlock, flags);
@@ -290,7 +290,7 @@ add_scsipending_entry_with_wait(struct virthba_info
*vhbainfo, char cmdtype,
insert_location = add_scsipending_entry(vhbainfo, cmdtype, new);
}
- return (unsigned int) insert_location;
+ return (unsigned int)insert_location;
}
static void *
@@ -301,13 +301,13 @@ del_scsipending_entry(struct virthba_info *vhbainfo,
uintptr_t del)
if (del = MAX_PENDING_REQUESTS) {
LOGERR(Invalid queue position %lu given to delete.
MAX_PENDING_REQUESTS %d\n,
-(unsigned long) del, MAX_PENDING_REQUESTS);
+(unsigned long)del, MAX_PENDING_REQUESTS);
} else {
spin_lock_irqsave(vhbainfo-privlock, flags);
if (vhbainfo-pending[del].sent == NULL)
LOGERR(Deleting already cleared queue entry at
%lu.\n,
-(unsigned long) del);
+(unsigned long)del);
sent = vhbainfo-pending[del].sent;
@@ -419,7 +419,7 @@ process_disk_notify(struct Scsi_Host *shost, struct
uiscmdrsp *cmdrsp)
static irqreturn_t
virthba_ISR(int irq, void *dev_id)
{
- struct virthba_info *virthbainfo = (struct virthba_info *) dev_id;
+ struct virthba_info *virthbainfo = (struct virthba_info *)dev_id;
struct channel_header __iomem *pChannelHeader;
struct signal_queue_header __iomem *pqhdr;
u64 mask;
@@ -443,7 +443,7 @@ virthba_ISR(int irq, void *dev_id)
return IRQ_NONE;
}
pqhdr = (struct signal_queue_header __iomem *)
- ((char __iomem *) pChannelHeader +
+ ((char __iomem *)pChannelHeader +
readq(pChannelHeader-ch_space_offset)) + IOCHAN_FROM_IOPART;
writeq(readq(pqhdr-num_irq_received) + 1,
pqhdr-num_irq_received);
@@ -502,19 +502,19 @@ virthba_probe(struct virtpci_dev *virtpcidev, const
struct pci_device_id *id)
* the max-channel value.
*/
LOGINF(virtpcidev-scsi.max.max_channel=%u, max_id=%u, max_lun=%u,
cmd_per_lun=%u, max_io_size=%u\n,
-(unsigned) virtpcidev-scsi.max.max_channel - 1,
-(unsigned) virtpcidev-scsi.max.max_id,
-(unsigned) virtpcidev-scsi.max.max_lun,
-(unsigned) virtpcidev-scsi.max.cmd_per_lun,
-(unsigned) virtpcidev-scsi.max.max_io_size);
- scsihost-max_channel = (unsigned) virtpcidev-scsi.max.max_channel;
- scsihost-max_id = (unsigned) virtpcidev-scsi.max.max_id;
- scsihost-max_lun = (unsigned) virtpcidev-scsi.max.max_lun;
- scsihost-cmd_per_lun = (unsigned) virtpcidev-scsi.max.cmd_per_lun;
+(unsigned)virtpcidev-scsi.max.max_channel - 1,
+(unsigned)virtpcidev-scsi.max.max_id,
+(unsigned)virtpcidev-scsi.max.max_lun,
+(unsigned)virtpcidev-scsi.max.cmd_per_lun,
+(unsigned)virtpcidev-scsi.max.max_io_size);
+ scsihost-max_channel = (unsigned)virtpcidev-scsi.max.max_channel;
+ scsihost-max_id = (unsigned)virtpcidev-scsi.max.max_id;
+ scsihost-max_lun = (unsigned)virtpcidev-scsi.max.max_lun;
+ scsihost-cmd_per_lun = (unsigned)virtpcidev-scsi.max.cmd_per_lun;
scsihost-max_sectors =
- (unsigned short) (virtpcidev-scsi.max.max_io_size 9);
+ (unsigned short)(virtpcidev-scsi.max.max_io_size 9);
scsihost-sg_tablesize =
- (unsigned short) (virtpcidev-scsi.max.max_io_size / PAGE_SIZE);
+ (unsigned short)(virtpcidev-scsi.max.max_io_size / PAGE_SIZE);
if (scsihost-sg_tablesize MAX_PHYS_INFO)
scsihost-sg_tablesize = MAX_PHYS_INFO;
LOGINF(scsihost-max_channel=%u, max_id=%u, max_lun=%llu,
cmd_per_lun=%u, max_sectors=%hu, sg_tablesize=%hu\n,
@@ -545,7 +545,7 @@
[PATCH 03/10] staging: unisys: virthba fix all alingment issues
this patch fixes all aligment issues in virthba.c
Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c | 82
1 file changed, 42 insertions(+), 40 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index 6acdfd3..f30ef08 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -110,9 +110,10 @@ static int virthba_serverdown(struct virtpci_dev
*virtpcidev, u32 state);
static void doDiskAddRemove(struct work_struct *work);
static void virthba_serverdown_complete(struct work_struct *work);
static ssize_t info_debugfs_read(struct file *file, char __user *buf,
- size_t len, loff_t *offset);
+size_t len, loff_t *offset);
static ssize_t enable_ints_write(struct file *file,
- const char __user *buffer, size_t count, loff_t *ppos);
+const char __user *buffer, size_t count,
+loff_t *ppos);
/*/
/* Globals */
@@ -263,7 +264,7 @@ add_scsipending_entry(struct virthba_info *vhbainfo, char
cmdtype, void *new)
insert_location = (insert_location + 1) % MAX_PENDING_REQUESTS;
if (insert_location == (int)vhbainfo-nextinsert) {
LOGERR(Queue should be full. insert_location%d
Unable to find open slot for pending commands.\n,
-insert_location);
+ insert_location);
spin_unlock_irqrestore(vhbainfo-privlock, flags);
return -1;
}
@@ -301,13 +302,13 @@ del_scsipending_entry(struct virthba_info *vhbainfo,
uintptr_t del)
if (del = MAX_PENDING_REQUESTS) {
LOGERR(Invalid queue position %lu given to delete.
MAX_PENDING_REQUESTS %d\n,
-(unsigned long)del, MAX_PENDING_REQUESTS);
+ (unsigned long)del, MAX_PENDING_REQUESTS);
} else {
spin_lock_irqsave(vhbainfo-privlock, flags);
if (vhbainfo-pending[del].sent == NULL)
LOGERR(Deleting already cleared queue entry at
%lu.\n,
-(unsigned long)del);
+ (unsigned long)del);
sent = vhbainfo-pending[del].sent;
@@ -357,8 +358,8 @@ SendDiskAddRemove(struct diskaddremove *dar)
dar-lun);
if (error)
LOGERR(Failed scsi_add_device:
host_no=%d[chan=%d:id=%d:lun=%d]\n,
-dar-shost-host_no, dar-channel, dar-id,
-dar-lun);
+ dar-shost-host_no, dar-channel, dar-id,
+ dar-lun);
} else
LOGERR(Failed scsi_device_lookup:[chan=%d:id=%d:lun=%d]\n,
dar-channel, dar-id, dar-lun);
@@ -408,8 +409,8 @@ process_disk_notify(struct Scsi_Host *shost, struct
uiscmdrsp *cmdrsp)
QUEUE_DISKADDREMOVE(dar);
} else {
LOGERR(kmalloc failed for dar.
host_no=%d[chan=%d:id=%d:lun=%d]\n,
-shost-host_no, cmdrsp-disknotify.channel,
-cmdrsp-disknotify.id, cmdrsp-disknotify.lun);
+ shost-host_no, cmdrsp-disknotify.channel,
+ cmdrsp-disknotify.id, cmdrsp-disknotify.lun);
}
}
@@ -502,11 +503,11 @@ virthba_probe(struct virtpci_dev *virtpcidev, const
struct pci_device_id *id)
* the max-channel value.
*/
LOGINF(virtpcidev-scsi.max.max_channel=%u, max_id=%u, max_lun=%u,
cmd_per_lun=%u, max_io_size=%u\n,
-(unsigned)virtpcidev-scsi.max.max_channel - 1,
-(unsigned)virtpcidev-scsi.max.max_id,
-(unsigned)virtpcidev-scsi.max.max_lun,
-(unsigned)virtpcidev-scsi.max.cmd_per_lun,
-(unsigned)virtpcidev-scsi.max.max_io_size);
+ (unsigned)virtpcidev-scsi.max.max_channel - 1,
+ (unsigned)virtpcidev-scsi.max.max_id,
+ (unsigned)virtpcidev-scsi.max.max_lun,
+ (unsigned)virtpcidev-scsi.max.cmd_per_lun,
+ (unsigned)virtpcidev-scsi.max.max_io_size);
scsihost-max_channel = (unsigned)virtpcidev-scsi.max.max_channel;
scsihost-max_id = (unsigned)virtpcidev-scsi.max.max_id;
scsihost-max_lun = (unsigned)virtpcidev-scsi.max.max_lun;
@@ -518,12 +519,12 @@ virthba_probe(struct virtpci_dev *virtpcidev, const
struct pci_device_id *id)
if (scsihost-sg_tablesize MAX_PHYS_INFO)
scsihost-sg_tablesize = MAX_PHYS_INFO;
LOGINF(scsihost-max_channel=%u, max_id=%u, max_lun=%llu,
cmd_per_lun=%u,
Re: [PATCH v2] staging: skein: skein_api.c: removed space before ','
On 2014-10-29 17:05, Greg Kroah-Hartman wrote: Please send this as a correct patch, not one with a whole bunch of other stuff in it that I would have to hand-edit in order to apply properly. Remember, you want to make it as easy as possible for me to accept your patches, so far, this isn't going well :) greg k-h Yeah, sorry about that. I have no idea why I haven't just used git-send-email. I'll reply to this e-mail with a (hopefully) correct e-mail, otherwise I'll just give up, this is starting to get too embarassing. :D / Mikael ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
RE: [PATCH 0/9] staging: comedi: addi_apci_1564: additional clean up
On Wednesday, October 22, 2014 4:09 AM, Ian Abbott wrote: On 21/10/14 18:15, Hartley Sweeten wrote: In addition, in apci1564_interrupt() the dev-iobase (BAR1) is used for: s-state = inl(dev-iobase + APCI1564_DI_INT_STATUS_REG) 0x; But is apci1564_reset() and apci1564_cos_insn_config() that register is accessed using devpriv-amcc_iobase (BAR0): inl(devpriv-amcc_iobase + APCI1564_DI_INT_STATUS_REG); The register should not be accessible from both BARs so BAR1 must be the real base address for the boards main registers. dev-iobase (BAR1) is currently used to access the counter register (other than the one access to APCI1564_DI_INT_STATUS_REG listed above). The mapping of those registers would overlay the boards main registers so my guess is they should really use BAR2 as the base address. I need to dig thru the git history to see if the screw up was caused by various patches to the driver or if the problem existed from when it was initially merged. Looks like commit 860ba36cbeadee9064e2925be11dfb8368b9b25d (staging: comedi: addi_apci_1564: move apci1564_interrupt() into addi_apci_1564.c) is the culprit. Ian, I finally got the correct information on the PCI BARs from ADDI-DATA. It appears that this board has always used an FPGA with a PCI core so the AMCC stuff in the driver is completely wrong. In addition, there are two major revisions of the board and they have different I/O mapping. The driver is currently coded to support the Rev 2.x versions of the board (other than the AMCC stuff). Greg just applied a slew of comedi patches. After they hit linux-next I will post a series to fix the APCI-1564. Regards, Hartley ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: android: logger: Remove uneeded tabs in variable declaration
On Thu, Oct 30, 2014 at 12:08:12AM +0800, Greg KH wrote: On Tue, Oct 28, 2014 at 11:09:10PM -0700, Tristan Lelong wrote: This patch removes tabs used to align variable names in declaration and assignation. It replaces them with exactly one space. Why? This seems like a totally unneeded change, sorry. I thought that was a coding style issue, because of the c-lineup-arglist-tabs-only emacs function described in CodingStyle. I guess I should have read the emacs documentation before assuming that both were linked. I am sorry for the mistake. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [RFC] stating: ion: use hot page first in pool
On 10/28/2014 9:57 PM, Gioh Kim wrote: Hello, I found that ion insert freed-page at the tail of list and extract at the head. I think it is good for cache to use the most recently used page but these pages in pool are not cached memory. So I'm not sure using hot page is better or not in this case. What do you think about using hot page first? This is something that really needs data collection and benchmarks to see if there is actually an improvement or not. Thanks, Laura -- Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/2] staging: comedi: das16: use spin-lock when setting timer
das16 sets a timer running in `das16_cmd_exec()` and sets
`devpriv-timer_running` to indicate that it is running. The timer
expiration routine `das16_timer_interrupt()` checks
`devpriv-timer_running` to check whether it needs to reschedule the
timer, but this is not synchronized with `das16_cmd_exec()`. Since
`das16_cancel()` acquires the `dev-spinlock` spin-lock when clearing
`devpriv-timer_running` and removing the timer from the queue, use the
same spin-lock in `das16_cmd_exec()` and `das16_timer_interrupt()`
around the setting and checking of `devpriv-timer_running`.
Since `das16_interrupt()` (called from `das16_timer_interrupt()`) checks
whether DMA is enabled in the device while holding `dev-spinlock`, and
DMA is enabled by `das16_cmd_exec()` around the time it schedules the
timer, enable the DMA in the device while holding the spin-lock.
Signed-off-by: Ian Abbott abbo...@mev.co.uk
---
drivers/staging/comedi/drivers/das16.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/das16.c
b/drivers/staging/comedi/drivers/das16.c
index 51c4a58..3d38404 100644
--- a/drivers/staging/comedi/drivers/das16.c
+++ b/drivers/staging/comedi/drivers/das16.c
@@ -593,11 +593,14 @@ static void das16_timer_interrupt(unsigned long arg)
{
struct comedi_device *dev = (struct comedi_device *)arg;
struct das16_private_struct *devpriv = dev-private;
+ unsigned long flags;
das16_interrupt(dev);
+ spin_lock_irqsave(dev-spinlock, flags);
if (devpriv-timer_running)
mod_timer(devpriv-timer, jiffies + timer_period());
+ spin_unlock_irqrestore(dev-spinlock, flags);
}
static int das16_ai_check_chanlist(struct comedi_device *dev,
@@ -814,7 +817,8 @@ static int das16_cmd_exec(struct comedi_device *dev, struct
comedi_subdevice *s)
enable_dma(devpriv-dma_chan);
release_dma_lock(flags);
- /* set up interrupt */
+ /* set up timer */
+ spin_lock_irqsave(dev-spinlock, flags);
devpriv-timer_running = 1;
devpriv-timer.expires = jiffies + timer_period();
add_timer(devpriv-timer);
@@ -823,6 +827,7 @@ static int das16_cmd_exec(struct comedi_device *dev, struct
comedi_subdevice *s)
if (devpriv-can_burst)
outb(0, dev-iobase + DAS1600_CONV_REG);
+ spin_unlock_irqrestore(dev-spinlock, flags);
return 0;
}
--
2.1.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/2] staging: comedi: das16: deschedule timer routine on detach
The das16 driver optionally uses a kernel timer and a DMA channel to
support asynchronous data acquisition, but currently never calls
`del_timer_sync()`. There is some possibility the timer routine could
still be scheduled to run when the comedi detach handler is run to
clean up the device and cause a certain amount of havoc. Avoid that by
calling `del_time_sync()` in the comedi detach handler
`das16_detach()` if the timer was initialized by the attach handler
`das16_attach()`. Use the timer's `data` member to tell whether it was
initialized or not.
Signed-off-by: Ian Abbott abbo...@mev.co.uk
---
drivers/staging/comedi/drivers/das16.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/staging/comedi/drivers/das16.c
b/drivers/staging/comedi/drivers/das16.c
index 5d47d0a..51c4a58 100644
--- a/drivers/staging/comedi/drivers/das16.c
+++ b/drivers/staging/comedi/drivers/das16.c
@@ -1226,6 +1226,8 @@ static void das16_detach(struct comedi_device *dev)
int i;
if (devpriv) {
+ if (devpriv-timer.data)
+ del_timer_sync(devpriv-timer);
if (dev-iobase)
das16_reset(dev);
--
2.1.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 0/2] staging: comedi: das16: fix some timer sync issues
das16 uses a kernel timer but never removes it from the queue synchronously at the moment. Patch 1 makes sure this is done before it is destroyed. Patch 2 uses the comedi device's main spin-lock to ensure some state shared with the timer routine is updated in an SMP-safe manner. 1) staging: comedi: das16: deschedule timer routine on detach 2) staging: comedi: das16: use spin-lock when setting timer drivers/staging/comedi/drivers/das16.c | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Dear Winner.
Dear winner, Your email address has won you One Million Euro, from Online Lotto, all the E-mail addresses were selected from a data base of internet e-mail users, from which your e-mail address came out as the winning coupon. Winning expiring date 30th of November , 2014. Contact our fiduciary Agent below with your winning number: OL/456/050/006. Online Lotto Agency. Mrs. Ana Paula Filipe. Director of winning claim department. TEL: +31-644-988-051 E-MAIL:agents28.pay...@aol.com ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: skein: skein_api.c: removed space before ','
Mikael, On Wed, Oct 29, 2014 at 05:55:34PM +0100, Mikael Svantesson wrote: Signed-off-by: Mikael Svantesson mik...@distopic.net --- drivers/staging/skein/skein_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Jason Cooper ja...@lakedaemon.net For future patches, please remember to add the 'V3' to the subject like you did for v2. thx, Jason. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: skein: skein_api.c: removed space before ','
Signed-off-by: Mikael Svantesson mik...@distopic.net
---
drivers/staging/skein/skein_api.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/skein/skein_api.c
b/drivers/staging/skein/skein_api.c
index 6e700ee..5bfce07 100644
--- a/drivers/staging/skein/skein_api.c
+++ b/drivers/staging/skein/skein_api.c
@@ -31,7 +31,7 @@ int skein_ctx_prepare(struct skein_ctx *ctx, enum skein_size
size)
{
skein_assert_ret(ctx size, SKEIN_FAIL);
- memset(ctx , 0, sizeof(struct skein_ctx));
+ memset(ctx, 0, sizeof(struct skein_ctx));
ctx-skein_size = size;
return SKEIN_SUCCESS;
--
2.1.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 02/02] staging:lustre:lnet:selftest: remove unused function
Function lnet_selftest_structure_assertion is never used and can
be removed.
Signed-off-by: Anton Saraev antonysar...@gmail.com
---
drivers/staging/lustre/lnet/selftest/module.c | 11 ---
1 file changed, 11 deletions(-)
diff --git a/drivers/staging/lustre/lnet/selftest/module.c
b/drivers/staging/lustre/lnet/selftest/module.c
index b2dd891..92520c2 100644
--- a/drivers/staging/lustre/lnet/selftest/module.c
+++ b/drivers/staging/lustre/lnet/selftest/module.c
@@ -90,17 +90,6 @@ lnet_selftest_fini(void)
return;
}
-void
-lnet_selftest_structure_assertion(void)
-{
- CLASSERT(sizeof(srpc_msg_t) == 160);
- CLASSERT(sizeof(srpc_test_reqst_t) == 70);
- CLASSERT(offsetof(srpc_msg_t, msg_body.tes_reqst.tsr_concur) == 72);
- CLASSERT(offsetof(srpc_msg_t, msg_body.tes_reqst.tsr_ndest) == 78);
- CLASSERT(sizeof(srpc_stat_reply_t) == 136);
- CLASSERT(sizeof(srpc_stat_reqst_t) == 28);
-}
-
static int
lnet_selftest_init(void)
{
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 00/02] staging:lustre:lnet:selftest: fix sparse warnings
As I can understand warning in previous series is about unused function (I don't see other differences in output of make with C=1, W=1 and W=2). I remove static for lnet_selftest_structure_assertion from first patch. Maybe I should merge patches in one but I think that addition of static declaration and deletion of function should be in two different patches. So the second patch depends on the first... Anton Saraev (2): staging:lustre:lnet:selftest: fix sparse warnings staging:lustre:lnet:selftest: remove unused function drivers/staging/lustre/lnet/selftest/conctl.c| 34 drivers/staging/lustre/lnet/selftest/conrpc.c| 20 +- drivers/staging/lustre/lnet/selftest/framework.c | 50 drivers/staging/lustre/lnet/selftest/module.c| 15 +-- drivers/staging/lustre/lnet/selftest/rpc.c | 34 drivers/staging/lustre/lnet/selftest/timer.c | 8 ++-- 6 files changed, 75 insertions(+), 86 deletions(-) -- 1.9.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 01/02] staging:lustre:lnet:selftest: fix sparse warnings
Fix sparse warnings: symbol X was not declared. Should it be static?
Some functions used only in files where they are declared. They can
be static.
Signed-off-by: Anton Saraev antonysar...@gmail.com
---
drivers/staging/lustre/lnet/selftest/conctl.c| 34
drivers/staging/lustre/lnet/selftest/conrpc.c| 20 +-
drivers/staging/lustre/lnet/selftest/framework.c | 50
drivers/staging/lustre/lnet/selftest/module.c| 4 +-
drivers/staging/lustre/lnet/selftest/rpc.c | 34
drivers/staging/lustre/lnet/selftest/timer.c | 8 ++--
6 files changed, 75 insertions(+), 75 deletions(-)
diff --git a/drivers/staging/lustre/lnet/selftest/conctl.c
b/drivers/staging/lustre/lnet/selftest/conctl.c
index ae7b0fc..5bc6153 100644
--- a/drivers/staging/lustre/lnet/selftest/conctl.c
+++ b/drivers/staging/lustre/lnet/selftest/conctl.c
@@ -45,7 +45,7 @@
#include ../../include/linux/lnet/lnetst.h
#include console.h
-int
+static int
lst_session_new_ioctl(lstio_session_new_args_t *args)
{
char *name;
@@ -82,7 +82,7 @@ lst_session_new_ioctl(lstio_session_new_args_t *args)
return rc;
}
-int
+static int
lst_session_end_ioctl(lstio_session_end_args_t *args)
{
if (args-lstio_ses_key != console_session.ses_key)
@@ -91,7 +91,7 @@ lst_session_end_ioctl(lstio_session_end_args_t *args)
return lstcon_session_end();
}
-int
+static int
lst_session_info_ioctl(lstio_session_info_args_t *args)
{
/* no checking of key */
@@ -113,7 +113,7 @@ lst_session_info_ioctl(lstio_session_info_args_t *args)
args-lstio_ses_nmlen);
}
-int
+static int
lst_debug_ioctl(lstio_debug_args_t *args)
{
char *name = NULL;
@@ -194,7 +194,7 @@ out:
return rc;
}
-int
+static int
lst_group_add_ioctl(lstio_group_add_args_t *args)
{
char *name;
@@ -228,7 +228,7 @@ lst_group_add_ioctl(lstio_group_add_args_t *args)
return rc;
}
-int
+static int
lst_group_del_ioctl(lstio_group_del_args_t *args)
{
int rc;
@@ -262,7 +262,7 @@ lst_group_del_ioctl(lstio_group_del_args_t *args)
return rc;
}
-int
+static int
lst_group_update_ioctl(lstio_group_update_args_t *args)
{
int rc;
@@ -320,7 +320,7 @@ lst_group_update_ioctl(lstio_group_update_args_t *args)
return rc;
}
-int
+static int
lst_nodes_add_ioctl(lstio_group_nodes_args_t *args)
{
unsigned feats;
@@ -365,7 +365,7 @@ lst_nodes_add_ioctl(lstio_group_nodes_args_t *args)
return rc;
}
-int
+static int
lst_group_list_ioctl(lstio_group_list_args_t *args)
{
if (args-lstio_grp_key != console_session.ses_key)
@@ -382,7 +382,7 @@ lst_group_list_ioctl(lstio_group_list_args_t *args)
args-lstio_grp_namep);
}
-int
+static int
lst_group_info_ioctl(lstio_group_info_args_t *args)
{
char *name;
@@ -446,7 +446,7 @@ lst_group_info_ioctl(lstio_group_info_args_t *args)
return 0;
}
-int
+static int
lst_batch_add_ioctl(lstio_batch_add_args_t *args)
{
int rc;
@@ -480,7 +480,7 @@ lst_batch_add_ioctl(lstio_batch_add_args_t *args)
return rc;
}
-int
+static int
lst_batch_run_ioctl(lstio_batch_run_args_t *args)
{
int rc;
@@ -515,7 +515,7 @@ lst_batch_run_ioctl(lstio_batch_run_args_t *args)
return rc;
}
-int
+static int
lst_batch_stop_ioctl(lstio_batch_stop_args_t *args)
{
int rc;
@@ -551,7 +551,7 @@ lst_batch_stop_ioctl(lstio_batch_stop_args_t *args)
return rc;
}
-int
+static int
lst_batch_query_ioctl(lstio_batch_query_args_t *args)
{
char *name;
@@ -593,7 +593,7 @@ lst_batch_query_ioctl(lstio_batch_query_args_t *args)
return rc;
}
-int
+static int
lst_batch_list_ioctl(lstio_batch_list_args_t *args)
{
if (args-lstio_bat_key != console_session.ses_key)
@@ -610,7 +610,7 @@ lst_batch_list_ioctl(lstio_batch_list_args_t *args)
args-lstio_bat_namep);
}
-int
+static int
lst_batch_info_ioctl(lstio_batch_info_args_t *args)
{
char *name;
@@ -675,7 +675,7 @@ lst_batch_info_ioctl(lstio_batch_info_args_t *args)
return rc;
}
-int
+static int
lst_stat_query_ioctl(lstio_stat_args_t *args)
{
int rc;
diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.c
b/drivers/staging/lustre/lnet/selftest/conrpc.c
index a3a60d6..b0d 100644
--- a/drivers/staging/lustre/lnet/selftest/conrpc.c
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.c
@@ -88,7 +88,7 @@ lstcon_rpc_done(srpc_client_rpc_t *rpc)
spin_unlock(rpc-crpc_lock);
}
-int
+static int
lstcon_rpc_init(lstcon_node_t *nd, int service, unsigned feats,
int bulk_npg, int bulk_len, int embedded, lstcon_rpc_t *crpc)
{
@@ -113,7 +113,7 @@ lstcon_rpc_init(lstcon_node_t *nd, int service, unsigned
feats,
return 0;
}
-int
+static int
Re: [PATCH] Staging: vt6655: Fix a typo in card.c
On Wed, Oct 29, 2014 at 05:20:30PM +0800, Greg Kroah-Hartman wrote: On Sun, Oct 26, 2014 at 06:57:37AM +, Nicky Chorley wrote: The word force was spelt incorrectly. Signed-off-by: Nicky Chorley ndchor...@gmail.com --- The C99 comments will be fixed in another patch, when I get round to it! drivers/staging/vt6655/card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index f2a33a9..ce496b1 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -819,7 +819,7 @@ CARDbPowerDown( if (MACbIsRegBitsOn(pDevice-PortOffset, MAC_REG_PSCTL, PSCTL_PS)) return true; - // Froce PSEN on + // Force PSEN on MACvRegBitsOn(pDevice-PortOffset, MAC_REG_PSCTL, PSCTL_PSEN); // check if all TD are empty, -- 1.8.4 This doesn't apply to my tree :( I guess that's because of the following commit: 77b6a6a staging: vt6655: card.c: Comments fixes That fixed the C99 comments, but not the typo. I'll make a new patch. Thanks! ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: Fix typo in card.c
The word force was spelt incorrectly. Signed-off-by: Nicky Chorley ndchor...@gmail.com --- drivers/staging/vt6655/card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index eae6789..abb4710 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -808,7 +808,7 @@ CARDbPowerDown( if (MACbIsRegBitsOn(pDevice-PortOffset, MAC_REG_PSCTL, PSCTL_PS)) return true; - /* Froce PSEN on */ + /* Force PSEN on */ MACvRegBitsOn(pDevice-PortOffset, MAC_REG_PSCTL, PSCTL_PSEN); /* check if all TD are empty */ -- 1.8.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH RESEND] staging: dgap: re-arrange functions for removing forward declarations
On 10/29/2014 05:22 AM, Greg KH wrote: On Sun, Oct 26, 2014 at 11:08:54AM +0900, Daeseok Youn wrote: Re-arrange the functions for removing forward declarations. Tested-by: Mark Hounschell ma...@compro.net Signed-off-by: Daeseok Youn daeseok.y...@gmail.com --- RESEND: This patch is tested all by Mark. It is good to merge. Greg, check please. It doesn't apply to my tree :( Daeseok, I will be happy to test the new patch. Somehow another patch got in there without us seeing it commit: ac2f46c365e655dd2c366f69c609febc4ac310fd on the list. That's why it doesn't apply for Greg. Regards Mark ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 0/2] Staging: rts5208: rtsx_reset_chip style clean up
Clean up the code in rtsx_reset_chip function defining two new helper functions rtsx_reset_aspm and rtsx_enable_pcie_intr. Specifically, the following checkpatch warnings are corrected: * PARENTHESIS_ALIGNMENT at rows 295 and 313 This patch is inspired by the following post on LKML regarding another clean up for rts5208 module: http://www.spinics.net/lists/linux-driver-devel/msg55038.html Changes in v3: * rebased against master branch of linux-next tree Changes in v2: * rebased against staging-testing branch of staging driver development tree Fabio Falzoi (2): Staging: rts5208: helper function to manage aspm during reset Staging: rts5208: helper function to enable interrupts drivers/staging/rts5208/rtsx_chip.c | 165 +++- 1 file changed, 87 insertions(+), 78 deletions(-) -- 2.1.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 1/2] Staging: rts5208: helper function to manage aspm during reset
Define the helper function rtsx_reset_aspm to shorten the
rtsx_reset_chip code and get rid of the PARENTHESIS_ALIGNMENT checkpatch
warnings.
Signed-off-by: Fabio Falzoi fabio.falzo...@gmail.com
Reviewed-by: Dan Carpenter dan.carpe...@oracle.com
---
drivers/staging/rts5208/rtsx_chip.c | 70 +
1 file changed, 39 insertions(+), 31 deletions(-)
diff --git a/drivers/staging/rts5208/rtsx_chip.c
b/drivers/staging/rts5208/rtsx_chip.c
index ffcf5de..ea6cfd1 100644
--- a/drivers/staging/rts5208/rtsx_chip.c
+++ b/drivers/staging/rts5208/rtsx_chip.c
@@ -227,6 +227,42 @@ static int rtsx_pre_handle_sdio_new(struct rtsx_chip *chip)
}
#endif
+static int rtsx_reset_aspm(struct rtsx_chip *chip)
+{
+ int ret;
+
+ if (chip-dynamic_aspm) {
+ if (!CHK_SDIO_EXIST(chip) || !CHECK_PID(chip, 0x5288))
+ return STATUS_SUCCESS;
+
+ ret = rtsx_write_cfg_dw(chip, 2, 0xC0, 0xFF,
+ chip-aspm_l0s_l1_en);
+ if (ret != STATUS_SUCCESS)
+ TRACE_RET(chip, STATUS_FAIL);
+
+ return STATUS_SUCCESS;
+ }
+
+ if (CHECK_PID(chip, 0x5208))
+ RTSX_WRITE_REG(chip, ASPM_FORCE_CTL, 0xFF, 0x3F);
+ ret = rtsx_write_config_byte(chip, LCTLR, chip-aspm_l0s_l1_en);
+ if (ret != STATUS_SUCCESS)
+ TRACE_RET(chip, STATUS_FAIL);
+
+ chip-aspm_level[0] = chip-aspm_l0s_l1_en;
+ if (CHK_SDIO_EXIST(chip)) {
+ chip-aspm_level[1] = chip-aspm_l0s_l1_en;
+ ret = rtsx_write_cfg_dw(chip, CHECK_PID(chip, 0x5288) ? 2 : 1,
+ 0xC0, 0xFF, chip-aspm_l0s_l1_en);
+ if (ret != STATUS_SUCCESS)
+ TRACE_RET(chip, STATUS_FAIL);
+ }
+
+ chip-aspm_enabled = 1;
+
+ return STATUS_SUCCESS;
+}
+
int rtsx_reset_chip(struct rtsx_chip *chip)
{
int retval;
@@ -289,37 +325,9 @@ int rtsx_reset_chip(struct rtsx_chip *chip)
/* Enable ASPM */
if (chip-aspm_l0s_l1_en) {
- if (chip-dynamic_aspm) {
- if (CHK_SDIO_EXIST(chip) CHECK_PID(chip, 0x5288)) {
- retval = rtsx_write_cfg_dw(chip, 2, 0xC0, 0xFF,
- chip-aspm_l0s_l1_en);
- if (retval != STATUS_SUCCESS)
- TRACE_RET(chip, STATUS_FAIL);
- }
- } else {
- if (CHECK_PID(chip, 0x5208))
- RTSX_WRITE_REG(chip, ASPM_FORCE_CTL,
- 0xFF, 0x3F);
-
- retval = rtsx_write_config_byte(chip, LCTLR,
- chip-aspm_l0s_l1_en);
- if (retval != STATUS_SUCCESS)
- TRACE_RET(chip, STATUS_FAIL);
-
- chip-aspm_level[0] = chip-aspm_l0s_l1_en;
- if (CHK_SDIO_EXIST(chip)) {
- chip-aspm_level[1] = chip-aspm_l0s_l1_en;
- retval = rtsx_write_cfg_dw(chip,
- CHECK_PID(chip, 0x5288) ? 2 : 1,
- 0xC0, 0xFF,
- chip-aspm_l0s_l1_en);
-
- if (retval != STATUS_SUCCESS)
- TRACE_RET(chip, STATUS_FAIL);
- }
-
- chip-aspm_enabled = 1;
- }
+ retval = rtsx_reset_aspm(chip);
+ if (retval != STATUS_SUCCESS)
+ TRACE_RET(chip, STATUS_FAIL);
} else {
if (chip-asic_code CHECK_PID(chip, 0x5208)) {
retval = rtsx_write_phy_register(chip, 0x07, 0x0129);
--
2.1.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 2/2] Staging: rts5208: helper function to enable interrupts
Define the helper function rtsx_enable_pcie_intr to shorten the
rtsx_reset_chip code.
Signed-off-by: Fabio Falzoi fabio.falzo...@gmail.com
Reviewed-by: Dan Carpenter dan.carpe...@oracle.com
---
drivers/staging/rts5208/rtsx_chip.c | 95 +++--
1 file changed, 48 insertions(+), 47 deletions(-)
diff --git a/drivers/staging/rts5208/rtsx_chip.c
b/drivers/staging/rts5208/rtsx_chip.c
index ea6cfd1..9593d81 100644
--- a/drivers/staging/rts5208/rtsx_chip.c
+++ b/drivers/staging/rts5208/rtsx_chip.c
@@ -263,6 +263,51 @@ static int rtsx_reset_aspm(struct rtsx_chip *chip)
return STATUS_SUCCESS;
}
+static int rtsx_enable_pcie_intr(struct rtsx_chip *chip)
+{
+ int ret;
+
+ if (!chip-asic_code || !CHECK_PID(chip, 0x5208)) {
+ rtsx_enable_bus_int(chip);
+ return STATUS_SUCCESS;
+ }
+
+ if (chip-phy_debug_mode) {
+ RTSX_WRITE_REG(chip, CDRESUMECTL, 0x77, 0);
+ rtsx_disable_bus_int(chip);
+ } else {
+ rtsx_enable_bus_int(chip);
+ }
+
+ if (chip-ic_version = IC_VER_D) {
+ u16 reg;
+
+ ret = rtsx_read_phy_register(chip, 0x00, reg);
+ if (ret != STATUS_SUCCESS)
+ TRACE_RET(chip, STATUS_FAIL);
+
+ reg = 0xFE7F;
+ reg |= 0x80;
+ ret = rtsx_write_phy_register(chip, 0x00, reg);
+ if (ret != STATUS_SUCCESS)
+ TRACE_RET(chip, STATUS_FAIL);
+
+ ret = rtsx_read_phy_register(chip, 0x1C, reg);
+ if (ret != STATUS_SUCCESS)
+ TRACE_RET(chip, STATUS_FAIL);
+
+ reg = 0xFFF7;
+ ret = rtsx_write_phy_register(chip, 0x1C, reg);
+ if (ret != STATUS_SUCCESS)
+ TRACE_RET(chip, STATUS_FAIL);
+ }
+
+ if (chip-driver_first_load (chip-ic_version IC_VER_C))
+ rtsx_calibration(chip);
+
+ return STATUS_SUCCESS;
+}
+
int rtsx_reset_chip(struct rtsx_chip *chip)
{
int retval;
@@ -367,53 +412,9 @@ int rtsx_reset_chip(struct rtsx_chip *chip)
RTSX_WRITE_REG(chip, PERST_GLITCH_WIDTH, 0xFF, 0x80);
- /* Enable PCIE interrupt */
- if (chip-asic_code) {
- if (CHECK_PID(chip, 0x5208)) {
- if (chip-phy_debug_mode) {
- RTSX_WRITE_REG(chip, CDRESUMECTL, 0x77, 0);
- rtsx_disable_bus_int(chip);
- } else {
- rtsx_enable_bus_int(chip);
- }
-
- if (chip-ic_version = IC_VER_D) {
- u16 reg;
-
- retval = rtsx_read_phy_register(chip, 0x00,
- reg);
- if (retval != STATUS_SUCCESS)
- TRACE_RET(chip, STATUS_FAIL);
-
- reg = 0xFE7F;
- reg |= 0x80;
- retval = rtsx_write_phy_register(chip, 0x00,
-reg);
- if (retval != STATUS_SUCCESS)
- TRACE_RET(chip, STATUS_FAIL);
-
- retval = rtsx_read_phy_register(chip, 0x1C,
- reg);
- if (retval != STATUS_SUCCESS)
- TRACE_RET(chip, STATUS_FAIL);
-
- reg = 0xFFF7;
- retval = rtsx_write_phy_register(chip, 0x1C,
-reg);
- if (retval != STATUS_SUCCESS)
- TRACE_RET(chip, STATUS_FAIL);
- }
-
- if (chip-driver_first_load
- (chip-ic_version IC_VER_C))
- rtsx_calibration(chip);
-
- } else {
- rtsx_enable_bus_int(chip);
- }
- } else {
- rtsx_enable_bus_int(chip);
- }
+ retval = rtsx_enable_pcie_intr(chip);
+ if (retval != STATUS_SUCCESS)
+ TRACE_RET(chip, STATUS_FAIL);
chip-need_reset = 0;
--
2.1.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: panel: Use designated initializers
Fix warning: missing initializer [-Wmissing-field-initializers]
by using designated struct initializers.
Signed-off-by: Mariusz Gorski marius.gor...@gmail.com
---
drivers/staging/panel/panel.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 6d1a320..98556ce 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -1375,9 +1375,9 @@ static const struct file_operations lcd_fops = {
};
static struct miscdevice lcd_dev = {
- LCD_MINOR,
- lcd,
- lcd_fops
+ .minor = LCD_MINOR,
+ .name = lcd,
+ .fops = lcd_fops,
};
/* public function usable from the kernel for any purpose */
@@ -1652,9 +1652,9 @@ static const struct file_operations keypad_fops = {
};
static struct miscdevice keypad_dev = {
- KEYPAD_MINOR,
- keypad,
- keypad_fops
+ .minor = KEYPAD_MINOR,
+ .name = keypad,
+ .fops = keypad_fops,
};
static void keypad_send_key(const char *string, int max_len)
--
2.1.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging, rts5208, LLVMLinux: Change extern inline to static inline
With compilers which follow the C99 standard (like modern versions of gcc and
clang), extern inline does the opposite thing from older versions of gcc
(emits code for an externally linkable version of the inline function). static
inline does the intended behavior in both gcc and clang.
Signed-off-by: Behan Webster beh...@converseincode.com
Suggested-by: Arnd Bergmann a...@arndb.de
Cc: Arnd Bergmann a...@arndb.de
---
drivers/staging/rts5208/rtsx_transport.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/rts5208/rtsx_transport.h
b/drivers/staging/rts5208/rtsx_transport.h
index b4b1123..899bc20 100644
--- a/drivers/staging/rts5208/rtsx_transport.h
+++ b/drivers/staging/rts5208/rtsx_transport.h
@@ -46,7 +46,7 @@ void rtsx_add_cmd(struct rtsx_chip *chip,
void rtsx_send_cmd_no_wait(struct rtsx_chip *chip);
int rtsx_send_cmd(struct rtsx_chip *chip, u8 card, int timeout);
-extern inline u8 *rtsx_get_cmd_data(struct rtsx_chip *chip)
+static inline u8 *rtsx_get_cmd_data(struct rtsx_chip *chip)
{
#ifdef CMD_USING_SG
return (u8 *)(chip-host_sg_tbl_ptr);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/4] staging, rtl8192e, LLVMLinux: Remove unused inline prototype
rtllib_probe_req is defined as static inline in rtllib_softmac.c however it is declared differently as extern inline in rtllib_softmac.h. Since it isn't used outside of the scope of rtllib_softmac, it makes sense to remove the incorrect declaration. Signed-off-by: Behan Webster beh...@converseincode.com Suggested-by: Arnd Bergmann a...@arndb.de Cc: Arnd Bergmann a...@arndb.de --- drivers/staging/rtl8192e/rtllib.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 33995ac..1322782 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -2762,7 +2762,6 @@ extern void rtllib_stop_scan(struct rtllib_device *ieee); extern bool rtllib_act_scanning(struct rtllib_device *ieee, bool sync_scan); extern void rtllib_stop_scan_syncro(struct rtllib_device *ieee); extern void rtllib_start_scan_syncro(struct rtllib_device *ieee, u8 is_mesh); -extern inline struct sk_buff *rtllib_probe_req(struct rtllib_device *ieee); extern u8 MgntQuery_MgntFrameTxRate(struct rtllib_device *ieee); extern void rtllib_sta_ps_send_null_frame(struct rtllib_device *ieee, short pwr); -- 1.9.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/4] staging, rtl8192e, LLVMLinux: Remove unused prototype
MgntQuery_MgntFrameTxRate is only used within rtllib_softmac.c, so it really
should be static instead of extern.
Since it is currently extern a warning is generated because a different
function of the same name is defined staticlly in ieee80211_softmac.c
Removing the incorrect extern declaration and defining the rtllib_softmac
version of this routine static fixes the warning.
Signed-off-by: Behan Webster beh...@converseincode.com
Suggested-by: Arnd Bergmann a...@arndb.de
Cc: Arnd Bergmann a...@arndb.de
---
drivers/staging/rtl8192e/rtllib.h | 1 -
drivers/staging/rtl8192e/rtllib_softmac.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h
b/drivers/staging/rtl8192e/rtllib.h
index 1322782..cef2dc2 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -2762,7 +2762,6 @@ extern void rtllib_stop_scan(struct rtllib_device *ieee);
extern bool rtllib_act_scanning(struct rtllib_device *ieee, bool sync_scan);
extern void rtllib_stop_scan_syncro(struct rtllib_device *ieee);
extern void rtllib_start_scan_syncro(struct rtllib_device *ieee, u8 is_mesh);
-extern u8 MgntQuery_MgntFrameTxRate(struct rtllib_device *ieee);
extern void rtllib_sta_ps_send_null_frame(struct rtllib_device *ieee,
short pwr);
extern void rtllib_sta_wakeup(struct rtllib_device *ieee, short nl);
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c
b/drivers/staging/rtl8192e/rtllib_softmac.c
index 067a45a..089a058 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -193,7 +193,7 @@ MgntQuery_TxRateExcludeCCKRates(struct rtllib_device *ieee)
return QueryRate;
}
-u8 MgntQuery_MgntFrameTxRate(struct rtllib_device *ieee)
+static u8 MgntQuery_MgntFrameTxRate(struct rtllib_device *ieee)
{
struct rt_hi_throughput *pHTInfo = ieee-pHTInfo;
u8 rate;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 4/4] staging, rtl8192e, LLVMLinux: Make static local in inline function const
rtllib_association_req is a (large) inline function which defines 2 constant
static arrays which aren't labelled as const. As a result clang complains with:
non-constant static local variable in inline function may be different in
different files
[-Wstatic-local-in-inline]
static u8 AironetIeOui[] = {0x00, 0x01, 0x66};
^
The solution is making them static const.
However doing so requires dropping const when being used with struct
octet_string. However the value is used in a const fashion thereafter, so no
harm done.
Signed-off-by: Behan Webster beh...@converseincode.com
Suggested-by: Arnd Bergmann a...@arndb.de
Cc: Arnd Bergmann a...@arndb.de
---
drivers/staging/rtl8192e/rtllib_softmac.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c
b/drivers/staging/rtl8192e/rtllib_softmac.c
index 089a058..e970db4 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -1311,7 +1311,7 @@ inline struct sk_buff *rtllib_association_req(struct
rtllib_network *beacon,
}
if (beacon-bCkipSupported) {
- static u8 AironetIeOui[] = {0x00, 0x01, 0x66};
+ static const u8 AironetIeOui[] = {0x00, 0x01, 0x66};
u8 CcxAironetBuf[30];
struct octet_string osCcxAironetIE;
@@ -1331,10 +1331,11 @@ inline struct sk_buff *rtllib_association_req(struct
rtllib_network *beacon,
}
if (beacon-bCcxRmEnable) {
- static u8 CcxRmCapBuf[] = {0x00, 0x40, 0x96, 0x01, 0x01, 0x00};
+ static const u8 CcxRmCapBuf[] = {0x00, 0x40, 0x96, 0x01, 0x01,
+ 0x00};
struct octet_string osCcxRmCap;
- osCcxRmCap.Octet = CcxRmCapBuf;
+ osCcxRmCap.Octet = (u8 *) CcxRmCapBuf;
osCcxRmCap.Length = sizeof(CcxRmCapBuf);
tag = skb_put(skb, ccxrm_ie_len);
*tag++ = MFIE_TYPE_GENERIC;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 0/4] staging, rtl8192e, LLVMLinux: Patches to enable the kernel to be compiled with clang/LLVM
Removing a number of warnings generated from compiling stl8192e with clang. The LLVMLinux project aims to fully build the Linux kernel using both gcc and clang (the C front end for the LLVM compiler infrastructure project). Behan Webster (4): staging, rtl8192e, LLVMLinux: Change extern inline to static inline staging, rtl8192e, LLVMLinux: Remove unused inline prototype staging, rtl8192e, LLVMLinux: Remove unused prototype staging, rtl8192e, LLVMLinux: Make static local in inline function const drivers/staging/rtl8192e/rtllib.h | 6 ++ drivers/staging/rtl8192e/rtllib_softmac.c | 11 ++- 2 files changed, 8 insertions(+), 9 deletions(-) -- 1.9.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [RFC] stating: ion: use hot page first in pool
2014-10-30 오전 2:00에 Laura Abbott 이(가) 쓴 글: On 10/28/2014 9:57 PM, Gioh Kim wrote: Hello, I found that ion insert freed-page at the tail of list and extract at the head. I think it is good for cache to use the most recently used page but these pages in pool are not cached memory. So I'm not sure using hot page is better or not in this case. What do you think about using hot page first? This is something that really needs data collection and benchmarks to see if there is actually an improvement or not. Thanks, Laura Thank you for always. I'm looking for a benchmark tool for my platform, but not founding yet. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 01/10] staging: unisys: fix blank lines virthba
On Wed, Oct 29, 2014 at 12:24:57PM -0400, Erik Arfvidson wrote: This patch removes unnecessary blanks lines and adds necessary blank lines in virthba. Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com --- drivers/staging/unisys/virthba/virthba.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) This patch series still does not apply, please refresh it against my staging-testing branch of staging.git and resend. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: vt6655: Fix typo in card.c
On Wed, Oct 29, 2014 at 08:00:37PM +, Nicky Chorley wrote: The word force was spelt incorrectly. Signed-off-by: Nicky Chorley ndchor...@gmail.com --- drivers/staging/vt6655/card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index eae6789..abb4710 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -808,7 +808,7 @@ CARDbPowerDown( if (MACbIsRegBitsOn(pDevice-PortOffset, MAC_REG_PSCTL, PSCTL_PS)) return true; - /* Froce PSEN on */ + /* Force PSEN on */ MACvRegBitsOn(pDevice-PortOffset, MAC_REG_PSCTL, PSCTL_PSEN); /* check if all TD are empty */ -- 1.8.4 This no longer applies to my tree due to a lot of other patches for this driver that just went in right before you sent this :( ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v3 0/2] Staging: rts5208: rtsx_reset_chip style clean up
On Wed, Oct 29, 2014 at 10:58:17PM +0100, Fabio Falzoi wrote: Clean up the code in rtsx_reset_chip function defining two new helper functions rtsx_reset_aspm and rtsx_enable_pcie_intr. Specifically, the following checkpatch warnings are corrected: * PARENTHESIS_ALIGNMENT at rows 295 and 313 This patch is inspired by the following post on LKML regarding another clean up for rts5208 module: http://www.spinics.net/lists/linux-driver-devel/msg55038.html Changes in v3: * rebased against master branch of linux-next tree That's not going to work, can you redo it against my staging-testing branch of staging.git? Or, if you really want to work off of linux-next, wait a few days before I merge my staging-testing branch into staging-next to show up in linux-next. As it is, these patches don't apply, so I'm going to have to drop them from my queue. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH RESEND] staging: dgap: re-arrange functions for removing forward declarations
Hi, 2014-10-29 18:22 GMT+09:00 Greg KH gre...@linuxfoundation.org: On Sun, Oct 26, 2014 at 11:08:54AM +0900, Daeseok Youn wrote: Re-arrange the functions for removing forward declarations. Tested-by: Mark Hounschell ma...@compro.net Signed-off-by: Daeseok Youn daeseok.y...@gmail.com --- RESEND: This patch is tested all by Mark. It is good to merge. Greg, check please. It doesn't apply to my tree :( Yes, it need to rebase as Mark's comment. I will send this again after rebase. Thanks. Daeseok Youn. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 1/1] staging: skein: Removes skein_debug include
Removes skein_debug.h include since skein_debug.h is nonexistent. Removes unneeded debug empty macro defines and their uses. Signed-off-by: Eric Rost eric.r...@mybabylon.net --- drivers/staging/skein/skein_base.c | 18 - drivers/staging/skein/skein_base.h | 17 - drivers/staging/skein/skein_block.c | 51 + 3 files changed, 1 insertion(+), 85 deletions(-) diff --git a/drivers/staging/skein/skein_base.c b/drivers/staging/skein/skein_base.c index ebc436a..7e700a6 100644 --- a/drivers/staging/skein/skein_base.c +++ b/drivers/staging/skein/skein_base.c @@ -124,8 +124,6 @@ int skein_256_init_ext(struct skein_256_ctx *ctx, size_t hash_bit_len, /* tree hash config info (or SKEIN_CFG_TREE_INFO_SEQUENTIAL) */ cfg.w[2] = skein_swap64(tree_info); - skein_show_key(256, ctx-h, key, key_bytes); - /* compute the initial chaining values from config block */ skein_256_process_block(ctx, cfg.b, 1, SKEIN_CFG_STR_LEN); @@ -232,8 +230,6 @@ int skein_256_final(struct skein_256_ctx *ctx, u8 *hash_val) /* output the ctr mode bytes */ skein_put64_lsb_first(hash_val+i*SKEIN_256_BLOCK_BYTES, ctx-x, n); - skein_show_final(256, ctx-h, n, -hash_val+i*SKEIN_256_BLOCK_BYTES); /* restore the counter mode key for next time */ memcpy(ctx-x, x, sizeof(x)); } @@ -353,8 +349,6 @@ int skein_512_init_ext(struct skein_512_ctx *ctx, size_t hash_bit_len, /* tree hash config info (or SKEIN_CFG_TREE_INFO_SEQUENTIAL) */ cfg.w[2] = skein_swap64(tree_info); - skein_show_key(512, ctx-h, key, key_bytes); - /* compute the initial chaining values from config block */ skein_512_process_block(ctx, cfg.b, 1, SKEIN_CFG_STR_LEN); @@ -461,8 +455,6 @@ int skein_512_final(struct skein_512_ctx *ctx, u8 *hash_val) /* output the ctr mode bytes */ skein_put64_lsb_first(hash_val+i*SKEIN_512_BLOCK_BYTES, ctx-x, n); - skein_show_final(512, ctx-h, n, -hash_val+i*SKEIN_512_BLOCK_BYTES); /* restore the counter mode key for next time */ memcpy(ctx-x, x, sizeof(x)); } @@ -577,8 +569,6 @@ int skein_1024_init_ext(struct skein_1024_ctx *ctx, size_t hash_bit_len, /* tree hash config info (or SKEIN_CFG_TREE_INFO_SEQUENTIAL) */ cfg.w[2] = skein_swap64(tree_info); - skein_show_key(1024, ctx-h, key, key_bytes); - /* compute the initial chaining values from config block */ skein_1024_process_block(ctx, cfg.b, 1, SKEIN_CFG_STR_LEN); @@ -685,8 +675,6 @@ int skein_1024_final(struct skein_1024_ctx *ctx, u8 *hash_val) /* output the ctr mode bytes */ skein_put64_lsb_first(hash_val+i*SKEIN_1024_BLOCK_BYTES, ctx-x, n); - skein_show_final(1024, ctx-h, n, -hash_val+i*SKEIN_1024_BLOCK_BYTES); /* restore the counter mode key for next time */ memcpy(ctx-x, x, sizeof(x)); } @@ -794,8 +782,6 @@ int skein_256_output(struct skein_256_ctx *ctx, u8 *hash_val) /* output the ctr mode bytes */ skein_put64_lsb_first(hash_val+i*SKEIN_256_BLOCK_BYTES, ctx-x, n); - skein_show_final(256, ctx-h, n, -hash_val+i*SKEIN_256_BLOCK_BYTES); /* restore the counter mode key for next time */ memcpy(ctx-x, x, sizeof(x)); } @@ -833,8 +819,6 @@ int skein_512_output(struct skein_512_ctx *ctx, u8 *hash_val) /* output the ctr mode bytes */ skein_put64_lsb_first(hash_val+i*SKEIN_512_BLOCK_BYTES, ctx-x, n); - skein_show_final(256, ctx-h, n, -hash_val+i*SKEIN_512_BLOCK_BYTES); /* restore the counter mode key for next time */ memcpy(ctx-x, x, sizeof(x)); } @@ -872,8 +856,6 @@ int skein_1024_output(struct skein_1024_ctx *ctx, u8 *hash_val) /* output the ctr mode bytes */ skein_put64_lsb_first(hash_val+i*SKEIN_1024_BLOCK_BYTES, ctx-x, n); - skein_show_final(256, ctx-h, n, -hash_val+i*SKEIN_1024_BLOCK_BYTES); /* restore the counter mode key for next time */ memcpy(ctx-x, x, sizeof(x)); } diff --git a/drivers/staging/skein/skein_base.h b/drivers/staging/skein/skein_base.h index 0111fa4..993b951 100644 --- a/drivers/staging/skein/skein_base.h +++ b/drivers/staging/skein/skein_base.h @@ -15,10 +15,6 @@ ** ** The default
Re: [PATCH v3 1/1] staging: skein: Removes skein_debug include
On Wed, 2014-10-29 at 19:12 -0500, Eric Rost wrote: Removes skein_debug.h include since skein_debug.h is nonexistent. Removes unneeded debug empty macro defines and their uses. Signed-off-by: Eric Rost eric.r...@mybabylon.net --- Jason, I wanted you to take one last look at this before I put reviewed-by on it, as I snipped one more piece of SKEIN_DEBUG that I found in the middle of skein_block.c thx, Eric ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: android: logger: fix kuid/uid in logger_entry
From: Xiong Zhou jencce.ker...@gmail.com
struct logger_entry can be returned to userspace via ioctl,
so it is wrong to have a kuid_t member, fixing it to uid_t.
This was introduced by commit bd471258f2, to pass uidguid
type checks : UIDGID_STRICT_TYPE_CHECKS, which has been
removed from kernel in commit 261000a56b6.
Fixes: bd471258f2 (logger: use kuid_t instead of uid_t)
Signed-off-by: Xiong Zhou jencce.ker...@gmail.com
---
drivers/staging/android/logger.c | 4 ++--
drivers/staging/android/logger.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index 28b93d3..fb06bf2 100644
--- a/drivers/staging/android/logger.c
+++ b/drivers/staging/android/logger.c
@@ -252,7 +252,7 @@ static size_t get_next_entry_by_uid(struct logger_log *log,
entry = get_entry_header(log, off, scratch);
- if (uid_eq(entry-euid, euid))
+ if (entry-euid == __kuid_val(euid))
return off;
next_len = sizeof(struct logger_entry) + entry-len;
@@ -430,7 +430,7 @@ static ssize_t logger_write_iter(struct kiocb *iocb, struct
iov_iter *from)
header.tid = current-pid;
header.sec = now.tv_sec;
header.nsec = now.tv_nsec;
- header.euid = current_euid();
+ header.euid = __kuid_val(current_euid());
header.len = count;
header.hdr_size = sizeof(struct logger_entry);
diff --git a/drivers/staging/android/logger.h b/drivers/staging/android/logger.h
index 70af7d8..cc6bbd9 100644
--- a/drivers/staging/android/logger.h
+++ b/drivers/staging/android/logger.h
@@ -66,7 +66,7 @@ struct logger_entry {
__s32 tid;
__s32 sec;
__s32 nsec;
- kuid_t euid;
+ uid_t euid;
charmsg[0];
};
--
1.9.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: rtl8192e: from bus specific dma api to dma api
On Wed, Oct 29, 2014 at 04:47:25PM +0800, Greg Kroah-Hartman wrote: On Wed, Oct 22, 2014 at 02:24:46PM +0530, Sudip Mukherjee wrote: we should be using DMA API rather than using bus specific DMA API. Why? as given in the DMA-API-HOWTO.txt : the DMA API works with any bus independent of the underlying microprocessor architecture. converted the occurrence of pci_map_*() to dma_map_*(), and at the same time used the dma_mapping_error(). Trailing whitespace :( oops .. really sorry . when i checked with checkpatch it didnot show any error. and I did not know that trailing whitespaces should not be there in the commit message also. What have you used to test this change? it has just been build tested , not tested on hardware. thanks sudip thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
