From: jacliburn@bellsouth.net
To: jeff@garzik.org
Cc: csnook@redhat.com, linux-kernel@vger.kernel.org,
atl1-devel@lists.sourceforge.net,
Jay Cliburn <jacliburn@bellsouth.net>
Subject: [PATCH 14/26] atl1: move stray defines to header file
Date: Mon, 31 Dec 2007 19:59:52 -0600 [thread overview]
Message-ID: <1199152804-3889-15-git-send-email-jacliburn@bellsouth.net> (raw)
In-Reply-To: <1199152804-3889-1-git-send-email-jacliburn@bellsouth.net>
From: Jay Cliburn <jacliburn@bellsouth.net>
Move some stray defines out to a header file. Improve indentation from
ghastly to horrid.
Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
---
drivers/net/atlx/atl1.c | 29 ++++++++++++-----------------
drivers/net/atlx/atl1.h | 6 ++++++
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 9c86ef4..f40cc6e 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -217,12 +217,6 @@ static s32 atl1_read_phy_reg(struct atl1_hw *hw, u16 reg_addr, u16 *phy_data)
return ATLX_ERR_PHY;
}
-#define CUSTOM_SPI_CS_SETUP 2
-#define CUSTOM_SPI_CLK_HI 2
-#define CUSTOM_SPI_CLK_LO 2
-#define CUSTOM_SPI_CS_HOLD 2
-#define CUSTOM_SPI_CS_HI 3
-
static bool atl1_spi_read(struct atl1_hw *hw, u32 addr, u32 *buf)
{
int i;
@@ -232,17 +226,18 @@ static bool atl1_spi_read(struct atl1_hw *hw, u32 addr, u32 *buf)
iowrite32(addr, hw->hw_addr + REG_SPI_ADDR);
value = SPI_FLASH_CTRL_WAIT_READY |
- (CUSTOM_SPI_CS_SETUP & SPI_FLASH_CTRL_CS_SETUP_MASK) <<
- SPI_FLASH_CTRL_CS_SETUP_SHIFT | (CUSTOM_SPI_CLK_HI &
- SPI_FLASH_CTRL_CLK_HI_MASK) <<
- SPI_FLASH_CTRL_CLK_HI_SHIFT | (CUSTOM_SPI_CLK_LO &
- SPI_FLASH_CTRL_CLK_LO_MASK) <<
- SPI_FLASH_CTRL_CLK_LO_SHIFT | (CUSTOM_SPI_CS_HOLD &
- SPI_FLASH_CTRL_CS_HOLD_MASK) <<
- SPI_FLASH_CTRL_CS_HOLD_SHIFT | (CUSTOM_SPI_CS_HI &
- SPI_FLASH_CTRL_CS_HI_MASK) <<
- SPI_FLASH_CTRL_CS_HI_SHIFT | (1 & SPI_FLASH_CTRL_INS_MASK) <<
- SPI_FLASH_CTRL_INS_SHIFT;
+ (CUSTOM_SPI_CS_SETUP & SPI_FLASH_CTRL_CS_SETUP_MASK) <<
+ SPI_FLASH_CTRL_CS_SETUP_SHIFT |
+ (CUSTOM_SPI_CLK_HI & SPI_FLASH_CTRL_CLK_HI_MASK) <<
+ SPI_FLASH_CTRL_CLK_HI_SHIFT |
+ (CUSTOM_SPI_CLK_LO & SPI_FLASH_CTRL_CLK_LO_MASK) <<
+ SPI_FLASH_CTRL_CLK_LO_SHIFT |
+ (CUSTOM_SPI_CS_HOLD & SPI_FLASH_CTRL_CS_HOLD_MASK) <<
+ SPI_FLASH_CTRL_CS_HOLD_SHIFT |
+ (CUSTOM_SPI_CS_HI & SPI_FLASH_CTRL_CS_HI_MASK) <<
+ SPI_FLASH_CTRL_CS_HI_SHIFT |
+ (1 & SPI_FLASH_CTRL_INS_MASK) <<
+ SPI_FLASH_CTRL_INS_SHIFT;
iowrite32(value, hw->hw_addr + REG_SPI_FLASH_CTRL);
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h
index 8198f82..3db9a34 100644
--- a/drivers/net/atlx/atl1.h
+++ b/drivers/net/atlx/atl1.h
@@ -335,6 +335,12 @@ extern const struct ethtool_ops atl1_ethtool_ops;
#define ATL1_EEDUMP_LEN 48
+#define CUSTOM_SPI_CS_SETUP 2
+#define CUSTOM_SPI_CLK_HI 2
+#define CUSTOM_SPI_CLK_LO 2
+#define CUSTOM_SPI_CS_HOLD 2
+#define CUSTOM_SPI_CS_HI 3
+
/* Statistics counters collected by the MAC */
struct stats_msg_block {
/* rx */
--
1.5.3.3
next prev parent reply other threads:[~2008-01-01 2:14 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-01 1:59 [PATCH 00/26] atl1: divide and modernize jacliburn
2008-01-01 1:59 ` [PATCH 01/26] atl1: relocate atl1 driver to /drivers/net/atlx jacliburn
2008-01-01 1:59 ` [PATCH 02/26] atl1: move common functions to atlx files jacliburn
2008-01-01 1:59 ` [PATCH 03/26] atl1: fix broken TSO jacliburn
2008-01-01 1:59 ` [PATCH 04/26] atl1: add ethtool register dump jacliburn
2008-01-22 9:54 ` Jeff Garzik
2008-01-01 1:59 ` [PATCH 05/26] atl1: print debug info if rrd error jacliburn
2008-01-22 9:55 ` Jeff Garzik
2008-01-01 1:59 ` [PATCH 06/26] atl1: update initialization parameters jacliburn
2008-01-22 9:56 ` Jeff Garzik
2008-01-23 2:13 ` Jay Cliburn
2008-01-23 2:19 ` Jeff Garzik
2008-01-23 2:30 ` Chris Snook
2008-01-01 1:59 ` [PATCH 07/26] atl1: clarify max rx frame size jacliburn
2008-01-01 1:59 ` [PATCH 08/26] atl1: additional DMA engine configuration jacliburn
2008-01-01 1:59 ` [PATCH 09/26] atl1: refactor tx processing jacliburn
2008-01-22 9:58 ` Jeff Garzik
2008-01-23 0:31 ` Jay Cliburn
2008-01-25 1:00 ` Jay Cliburn
2008-01-25 1:08 ` Chris Snook
2008-01-25 3:01 ` Jeff Garzik
2008-01-01 1:59 ` [PATCH 10/26] atl1: use csum_start jacliburn
2008-01-01 1:59 ` [PATCH 11/26] atl1: refactor initialization and startup jacliburn
2008-01-01 1:59 ` [PATCH 12/26] atl1: refactor atl1_probe jacliburn
2008-01-01 1:59 ` [PATCH 13/26] atl1: refactor interrupt handling jacliburn
2008-01-22 9:59 ` Jeff Garzik
2008-01-01 1:59 ` jacliburn [this message]
2008-01-01 1:59 ` [PATCH 15/26] atl1: tidy up ring management jacliburn
2008-01-01 1:59 ` [PATCH 16/26] atl1: modernize check link function jacliburn
2008-01-01 1:59 ` [PATCH 17/26] atl1: update phy config function jacliburn
2008-01-01 1:59 ` [PATCH 18/26] atl1: make function static jacliburn
2008-01-01 1:59 ` [PATCH 19/26] atl1: modernize down/up functions jacliburn
2008-01-22 10:01 ` Jeff Garzik
2008-01-01 1:59 ` [PATCH 20/26] atl1: update change mtu jacliburn
2008-01-01 1:59 ` [PATCH 21/26] atl1: update atl1_close jacliburn
2008-01-01 2:00 ` [PATCH 22/26] atl1: update netpoll jacliburn
2008-01-01 2:00 ` [PATCH 23/26] atl1: update shutdown and remove functions jacliburn
2008-01-01 2:00 ` [PATCH 24/26] atl1: update wake-on-lan jacliburn
2008-01-01 2:00 ` [PATCH 25/26] atl1: add NAPI support jacliburn
2008-01-01 6:09 ` Joonwoo Park
2008-01-01 18:15 ` [PATCH 25/26] [REVISED] " Jay Cliburn
2008-01-02 2:56 ` Joonwoo Park
2008-01-02 3:07 ` David Miller
2008-01-01 2:00 ` [PATCH 26/26] atl1: remove experimental tag and clean up comments jacliburn
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=1199152804-3889-15-git-send-email-jacliburn@bellsouth.net \
--to=jacliburn@bellsouth.net \
--cc=atl1-devel@lists.sourceforge.net \
--cc=csnook@redhat.com \
--cc=jeff@garzik.org \
--cc=linux-kernel@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
all inboxes | Powered by JetHome®