From: frank.blaschka@de.ibm.com
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
Carsten Otte <cotte@de.ibm.com>
Subject: [patch 02/11] [PATCH] qeth: Rework qeth_dbf_longtext
Date: Tue, 22 Jun 2010 10:57:03 +0200 [thread overview]
Message-ID: <20100622085807.086142000@de.ibm.com> (raw)
In-Reply-To: 20100622085701.772508000@de.ibm.com
[-- Attachment #1: 602-qeth-dbf-long.diff --]
[-- Type: text/plain, Size: 2426 bytes --]
From: Carsten Otte <cotte@de.ibm.com>
This patch decouples qeth_dbf_longtext from qeth's static debug array. The
function only uses one member anyway.
Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
drivers/s390/net/qeth_core.h | 4 ++--
drivers/s390/net/qeth_core_main.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff -urpN linux-2.6/drivers/s390/net/qeth_core.h linux-2.6-patched/drivers/s390/net/qeth_core.h
--- linux-2.6/drivers/s390/net/qeth_core.h 2010-06-22 08:54:43.000000000 +0200
+++ linux-2.6-patched/drivers/s390/net/qeth_core.h 2010-06-22 08:54:58.000000000 +0200
@@ -71,7 +71,7 @@ struct qeth_dbf_info {
debug_sprintf_event(qeth_dbf[QETH_DBF_MSG].id, level, text)
#define QETH_DBF_TEXT_(name, level, text...) \
- qeth_dbf_longtext(QETH_DBF_##name, level, text)
+ qeth_dbf_longtext(qeth_dbf[QETH_DBF_##name].id, level, text)
#define SENSE_COMMAND_REJECT_BYTE 0
#define SENSE_COMMAND_REJECT_FLAG 0x80
@@ -857,7 +857,7 @@ void qeth_core_get_ethtool_stats(struct
struct ethtool_stats *, u64 *);
void qeth_core_get_strings(struct net_device *, u32, u8 *);
void qeth_core_get_drvinfo(struct net_device *, struct ethtool_drvinfo *);
-void qeth_dbf_longtext(enum qeth_dbf_names dbf_nix, int level, char *text, ...);
+void qeth_dbf_longtext(debug_info_t *id, int level, char *text, ...);
int qeth_core_ethtool_get_settings(struct net_device *, struct ethtool_cmd *);
int qeth_set_access_ctrl_online(struct qeth_card *card);
diff -urpN linux-2.6/drivers/s390/net/qeth_core_main.c linux-2.6-patched/drivers/s390/net/qeth_core_main.c
--- linux-2.6/drivers/s390/net/qeth_core_main.c 2010-06-22 08:54:43.000000000 +0200
+++ linux-2.6-patched/drivers/s390/net/qeth_core_main.c 2010-06-22 08:54:58.000000000 +0200
@@ -4164,17 +4164,17 @@ static void qeth_unregister_dbf_views(vo
}
}
-void qeth_dbf_longtext(enum qeth_dbf_names dbf_nix, int level, char *fmt, ...)
+void qeth_dbf_longtext(debug_info_t *id, int level, char *fmt, ...)
{
char dbf_txt_buf[32];
va_list args;
- if (level > (qeth_dbf[dbf_nix].id)->level)
+ if (level > id->level)
return;
va_start(args, fmt);
vsnprintf(dbf_txt_buf, sizeof(dbf_txt_buf), fmt, args);
va_end(args);
- debug_text_event(qeth_dbf[dbf_nix].id, level, dbf_txt_buf);
+ debug_text_event(id, level, dbf_txt_buf);
}
EXPORT_SYMBOL_GPL(qeth_dbf_longtext);
next prev parent reply other threads:[~2010-06-22 8:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-22 8:57 [patch 00/11] s390: qeth patches for 2.6.36 frank.blaschka
2010-06-22 8:57 ` [patch 01/11] [PATCH] smsgiucv: guarantee single iucv connect in thaw frank.blaschka
2010-06-22 8:57 ` frank.blaschka [this message]
2010-06-22 8:57 ` [patch 03/11] [PATCH] qeth: Add new s390 debug feature for each qeth card frank.blaschka
2010-06-22 8:57 ` [patch 04/11] [PATCH] qeth: Fold qeth_trace debug area frank.blaschka
2010-06-22 8:57 ` [patch 05/11] [PATCH] qeth: Fold qeth_sense " frank.blaschka
2010-06-22 8:57 ` [patch 06/11] [PATCH] qeth: Fold qeth_misc " frank.blaschka
2010-06-22 8:57 ` [patch 07/11] [PATCH] qeth: Fold qeth_qerr " frank.blaschka
2010-06-22 8:57 ` [patch 08/11] [PATCH] qeth: fix use after free for qeths " frank.blaschka
2010-06-22 8:57 ` [patch 09/11] [PATCH] qeth: fix page breaks in hw headers frank.blaschka
2010-06-22 8:57 ` [patch 10/11] [PATCH] qeth: specify correct function level for OSN devices frank.blaschka
2010-06-22 8:57 ` [patch 11/11] [PATCH] qeth: handle missing z/VM authorization of OSX frank.blaschka
2010-06-23 19:08 ` [patch 00/11] s390: qeth patches for 2.6.36 David Miller
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=20100622085807.086142000@de.ibm.com \
--to=frank.blaschka@de.ibm.com \
--cc=cotte@de.ibm.com \
--cc=davem@davemloft.net \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).