From: Niranjan Dighe <niranjan.dighe@gmail.com>
To: gregkh@linuxfoundation.org
Cc: liodot@gmail.com, charrer@alacritech.com,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Niranjan Dighe <niranjan.dighe@gmail.com>
Subject: [PATCH v2 1/2] Staging: slicoss: Remove redundant and disabled code block
Date: Thu, 26 Mar 2015 23:51:58 +0530 [thread overview]
Message-ID: <1427394118-2983-1-git-send-email-niranjan.dighe@gmail.com> (raw)
In-Reply-To: <20150326121203.GA22363@kroah.com>
Removing code guarded by undefined macro SLIC_TRACE_DUMP_ENABLED
Signed-off-by: Niranjan Dighe <niranjan.dighe@gmail.com>
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 3104cb0..c2bda1d 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -2553,41 +2553,6 @@ static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
slic_intagg_set(adapter, intagg);
return 0;
-#ifdef SLIC_TRACE_DUMP_ENABLED
- case SIOCSLICTRACEDUMP:
- {
- u32 value;
-
- DBG_IOCTL("slic_ioctl SIOCSLIC_TRACE_DUMP\n");
-
- if (copy_from_user(data, rq->ifr_data, 28)) {
- PRINT_ERROR
- ("slic: copy_from_user FAILED getting initial simba param\n");
- return -EFAULT;
- }
-
- value = data[0];
- if (tracemon_request == SLIC_DUMP_DONE) {
- PRINT_ERROR
- ("ATK Diagnostic Trace Dump Requested\n");
- tracemon_request = SLIC_DUMP_REQUESTED;
- tracemon_request_type = value;
- tracemon_timestamp = jiffies;
- } else if ((tracemon_request == SLIC_DUMP_REQUESTED) ||
- (tracemon_request ==
- SLIC_DUMP_IN_PROGRESS)) {
- PRINT_ERROR
- ("ATK Diagnostic Trace Dump Requested but already in progress... ignore\n");
- } else {
- PRINT_ERROR
- ("ATK Diagnostic Trace Dump Requested\n");
- tracemon_request = SLIC_DUMP_REQUESTED;
- tracemon_request_type = value;
- tracemon_timestamp = jiffies;
- }
- return 0;
- }
-#endif
case SIOCETHTOOL:
if (copy_from_user(&ecmd, rq->ifr_data, sizeof(ecmd)))
return -EFAULT;
--
1.9.1
next prev parent reply other threads:[~2015-03-26 18:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-24 19:58 [PATCH] Staging: slicoss: Fix checkpatch.pl issues Niranjan Dighe
2015-03-26 12:12 ` Greg KH
2015-03-26 18:21 ` Niranjan Dighe [this message]
2015-03-26 18:22 ` [PATCH v2 2/2] Staging: slicoss: Get rid of redundant pointer variable Niranjan Dighe
2015-03-26 18:33 ` Dan Carpenter
2015-03-26 18:52 ` Greg KH
2015-03-26 20:52 ` Joe Perches
2015-03-26 21:32 ` Greg KH
2015-03-26 21:42 ` Joe Perches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427394118-2983-1-git-send-email-niranjan.dighe@gmail.com \
--to=niranjan.dighe@gmail.com \
--cc=charrer@alacritech.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liodot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox