public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Ondrej Zary <linux@rainbow-software.org>
To: "Greg Kroah-Hartman" <greg@kroah.com>
Cc: Marek Belisko <marek.belisko@gmail.com>,
	Kernel development list <linux-kernel@vger.kernel.org>
Subject: [PATCH 27/28] staging: ft1000-pcmcia: remove PSEUDOSZ, use sizeof(struct pseudo_hdr) instead
Date: Fri,  1 Jul 2011 00:03:56 +0200	[thread overview]
Message-ID: <1309471437-12633-28-git-send-email-linux@rainbow-software.org> (raw)
In-Reply-To: <1309471437-12633-1-git-send-email-linux@rainbow-software.org>

PSEUDOSZ seems to define struct pseudo_hdr size.
Remove it and use sizeof(struct pseudo_hdr) directly.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
---
 drivers/staging/ft1000/ft1000-pcmcia/ft1000.h    |    2 --
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c |    8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
index e1aa528..ba6f87d 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
@@ -202,8 +202,6 @@ struct pseudo_hdr {
 #define MAX_DSP_SESS_REC	1024
 
 #define DSP_QID_OFFSET	4
-#define PSEUDOSZ	16
-#define PSEUDOSZWRD	8
 
 /* Maximum number of occurrence of pseudo header errors before resetting PC Card. */
 #define MAX_PH_ERR	300
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index 23854e0..990b2af 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -795,7 +795,7 @@ void ft1000_send_cmd (struct net_device *dev, u16 *ptempbuffer, int size, u16 qt
 	u16 tempword;
 	unsigned long flags;
 
-	size += PSEUDOSZ;
+	size += sizeof(struct pseudo_hdr);
 	// check for odd byte and increment to 16-bit word align value
 	if ((size & 0x0001)) {
 		size++;
@@ -883,12 +883,12 @@ bool ft1000_receive_cmd(struct net_device *dev, u16 * pbuffer, int maxsz, u16 *p
 	unsigned long flags;
 
 	if (info->AsicID == ELECTRABUZZ_ID) {
-		size = ( ft1000_read_dpram(dev, *pnxtph) ) + PSEUDOSZ;
+		size = ( ft1000_read_dpram(dev, *pnxtph) ) + sizeof(struct pseudo_hdr);
 	} else {
 		size =
 			ntohs(ft1000_read_dpram_mag_16
 			  (dev, FT1000_MAG_PH_LEN,
-			   FT1000_MAG_PH_LEN_INDX)) + PSEUDOSZ;
+			   FT1000_MAG_PH_LEN_INDX)) + sizeof(struct pseudo_hdr);
 	}
 	if (size > maxsz) {
 		DEBUG(1,
@@ -1317,7 +1317,7 @@ int ft1000_parse_dpram_msg(struct net_device *dev)
 		}
 		DEBUG(1, "FT1000:ft1000_parse_dpram_msg:total length = %d\n",
 			  total_len);
-		if ((total_len < MAX_CMD_SQSIZE) && (total_len > PSEUDOSZ)) {
+		if ((total_len < MAX_CMD_SQSIZE) && (total_len > sizeof(struct pseudo_hdr))) {
             total_len += nxtph;
             cnt = 0;
             // ft1000_read_reg will return a value that needs to be byteswap
-- 
Ondrej Zary


  parent reply	other threads:[~2011-06-30 22:06 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-30 22:03 [PATCH 00/28] staging: ft1000-pcmcia: various fixes Ondrej Zary
2011-06-30 22:03 ` [PATCH 01/28] staging: ft1000-pcmcia: don't crash on load Ondrej Zary
2011-06-30 22:03 ` [PATCH 02/28] staging: ft1000-pcmcia: fix compilation with FT_DEBUG enabled Ondrej Zary
2011-06-30 22:03 ` [PATCH 03/28] staging: ft1000-pcmcia: delete ft1000.conf Ondrej Zary
2011-06-30 22:03 ` [PATCH 04/28] staging: ft1000-pcmcia: get rid of ft1000_dev.h Ondrej Zary
2011-06-30 22:03 ` [PATCH 05/28] staging: ft1000-pcmcia: remove PSEUDO_HDR typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 06/28] staging: ft1000-pcmcia: remove DRVMSG typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 07/28] staging: ft1000-pcmcia: remove MEDIAMSG typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 08/28] staging: ft1000-pcmcia: delete unused TIMEMSG typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 09/28] staging: ft1000-pcmcia: remove DSPINITMSG typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 10/28] staging: ft1000-pcmcia: delete unused DSPHIBERNATE typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 11/28] staging: ft1000-pcmcia: delete unused APP_INFO_BLOCK typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 12/28] staging: ft1000-pcmcia: remove PROV_RECORD typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 13/28] staging: ft1000-pcmcia: remove FT1000_INFO typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 14/28] staging: ft1000-pcmcia: delete unused DPRAM_BLK typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 15/28] staging: ft1000-pcmcia: delete local_info_t typedef Ondrej Zary
2011-06-30 22:03 ` [PATCH 16/28] staging: ft1000-pcmcia: remove firmware download typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 17/28] staging: ft1000-pcmcia: remove unused fields from struct ft1000_info Ondrej Zary
2011-06-30 22:03 ` [PATCH 18/28] staging: ft1000-pcmcia: remove custom defines for standard types Ondrej Zary
2011-06-30 22:03 ` [PATCH 19/28] staging: ft1000-pcmcia: remove useless defines from ft1000_cs.c Ondrej Zary
2011-06-30 22:03 ` [PATCH 20/28] staging: ft1000-pcmcia: remove useless debugging " Ondrej Zary
2011-06-30 22:03 ` [PATCH 21/28] staging: ft1000-pcmcia: remove misleading and template comments " Ondrej Zary
2011-06-30 22:03 ` [PATCH 22/28] staging: ft1000-pcmcia: remove unused ft1000_asic_read and ft1000_asic_write functions Ondrej Zary
2011-06-30 22:03 ` [PATCH 23/28] staging: ft1000-pcmcia: coding style fixes in ft1000_cs.c Ondrej Zary
2011-06-30 22:03 ` [PATCH 24/28] staging: ft1000-pcmcia: remove unused includes from ft1000_cs.c Ondrej Zary
2011-06-30 22:03 ` [PATCH 25/28] staging: ft1000-pcmcia: remove useless ft1000_release() function Ondrej Zary
2011-06-30 22:03 ` [PATCH 26/28] staging: ft1000-pcmcia: CodingStyle fixes in ft1000.h Ondrej Zary
2011-06-30 22:03 ` Ondrej Zary [this message]
2011-06-30 22:03 ` [PATCH 28/28] staging: ft1000-pcmcia: remove support for v5 firmware Ondrej Zary
2011-07-05 17:35 ` [PATCH 00/28] staging: ft1000-pcmcia: various fixes Greg KH

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=1309471437-12633-28-git-send-email-linux@rainbow-software.org \
    --to=linux@rainbow-software.org \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marek.belisko@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