Commit 128296fc authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller

sh_eth: coding style fixes

Running 'scripts/checkpatch.pl' on the driver files gives numerous warnings:

- block comments using empty /* line;

- unneeded \ at end of lines;

- message string split across lines;

- use of __attribute__((aligned(n))) instead of __aligned(n) macro;

- use of __attribute__((packed)) instead of __packed macro.

Additionally, running 'scripts/checkpatch.pl --strict' gives more complaints:

- including the paragraph about writing to FSF into the heading comment;

- alignment not matching open paren;

- multiple assignments on one line;

- use of CamelCase names;

- missing {} on one of the *if* arms where another has them;

- spinlock definition without a comment.

While fixing these, also do some more style cleanups:

- remove useless () around expressions;

- add {} around multi-line *if* operator's arm;

- remove space before comma;

- add spaces after /* and before */;

- properly align continuation lines of broken up expressions;

- realign comments to the structure fields.
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 45ea3932
This diff is collapsed.
/* /* SuperH Ethernet device driver
* SuperH Ethernet device driver
* *
* Copyright (C) 2006-2012 Nobuhiro Iwamatsu * Copyright (C) 2006-2012 Nobuhiro Iwamatsu
* Copyright (C) 2008-2012 Renesas Solutions Corp. * Copyright (C) 2008-2012 Renesas Solutions Corp.
...@@ -12,9 +11,6 @@ ...@@ -12,9 +11,6 @@
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details. * more details.
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
* *
* The full GNU General Public License is included in this distribution in * The full GNU General Public License is included in this distribution in
* the file called "COPYING". * the file called "COPYING".
...@@ -171,8 +167,7 @@ enum { ...@@ -171,8 +167,7 @@ enum {
#define SH2_SH3_SKB_RX_ALIGN 2 #define SH2_SH3_SKB_RX_ALIGN 2
#endif #endif
/* /* Register's bits
* Register's bits
*/ */
/* EDSR : sh7734, sh7757, sh7763, and r8a7740 only */ /* EDSR : sh7734, sh7757, sh7763, and r8a7740 only */
enum EDSR_BIT { enum EDSR_BIT {
...@@ -199,7 +194,7 @@ enum DMAC_T_BIT { ...@@ -199,7 +194,7 @@ enum DMAC_T_BIT {
EDTRR_TRNS_ETHER = 0x01, EDTRR_TRNS_ETHER = 0x01,
}; };
/* EDRRR*/ /* EDRRR */
enum EDRRR_R_BIT { enum EDRRR_R_BIT {
EDRRR_R = 0x01, EDRRR_R = 0x01,
}; };
...@@ -422,8 +417,7 @@ enum TSU_FWSLC_BIT { ...@@ -422,8 +417,7 @@ enum TSU_FWSLC_BIT {
#define TSU_VTAG_ENABLE 0x80000000 #define TSU_VTAG_ENABLE 0x80000000
#define TSU_VTAG_VID_MASK 0x00000fff #define TSU_VTAG_VID_MASK 0x00000fff
/* /* The sh ether Tx buffer descriptors.
* The sh ether Tx buffer descriptors.
* This structure should be 20 bytes. * This structure should be 20 bytes.
*/ */
struct sh_eth_txdesc { struct sh_eth_txdesc {
...@@ -437,10 +431,9 @@ struct sh_eth_txdesc { ...@@ -437,10 +431,9 @@ struct sh_eth_txdesc {
#endif #endif
u32 addr; /* TD2 */ u32 addr; /* TD2 */
u32 pad1; /* padding data */ u32 pad1; /* padding data */
} __attribute__((aligned(2), packed)); } __aligned(2) __packed;
/* /* The sh ether Rx buffer descriptors.
* The sh ether Rx buffer descriptors.
* This structure should be 20 bytes. * This structure should be 20 bytes.
*/ */
struct sh_eth_rxdesc { struct sh_eth_rxdesc {
...@@ -454,7 +447,7 @@ struct sh_eth_rxdesc { ...@@ -454,7 +447,7 @@ struct sh_eth_rxdesc {
#endif #endif
u32 addr; /* RD2 */ u32 addr; /* RD2 */
u32 pad0; /* padding data */ u32 pad0; /* padding data */
} __attribute__((aligned(2), packed)); } __aligned(2) __packed;
/* This structure is used by each CPU dependency handling. */ /* This structure is used by each CPU dependency handling. */
struct sh_eth_cpu_data { struct sh_eth_cpu_data {
...@@ -480,16 +473,16 @@ struct sh_eth_cpu_data { ...@@ -480,16 +473,16 @@ struct sh_eth_cpu_data {
unsigned long eesr_err_check; unsigned long eesr_err_check;
/* hardware features */ /* hardware features */
unsigned long irq_flags; /* IRQ configuration flags */ unsigned long irq_flags; /* IRQ configuration flags */
unsigned no_psr:1; /* EtherC DO NOT have PSR */ unsigned no_psr:1; /* EtherC DO NOT have PSR */
unsigned apr:1; /* EtherC have APR */ unsigned apr:1; /* EtherC have APR */
unsigned mpr:1; /* EtherC have MPR */ unsigned mpr:1; /* EtherC have MPR */
unsigned tpauser:1; /* EtherC have TPAUSER */ unsigned tpauser:1; /* EtherC have TPAUSER */
unsigned bculr:1; /* EtherC have BCULR */ unsigned bculr:1; /* EtherC have BCULR */
unsigned tsu:1; /* EtherC have TSU */ unsigned tsu:1; /* EtherC have TSU */
unsigned hw_swap:1; /* E-DMAC have DE bit in EDMR */ unsigned hw_swap:1; /* E-DMAC have DE bit in EDMR */
unsigned rpadir:1; /* E-DMAC have RPADIR */ unsigned rpadir:1; /* E-DMAC have RPADIR */
unsigned no_trimd:1; /* E-DMAC DO NOT have TRIMD */ unsigned no_trimd:1; /* E-DMAC DO NOT have TRIMD */
unsigned no_ade:1; /* E-DMAC DO NOT have ADE bit in EESR */ unsigned no_ade:1; /* E-DMAC DO NOT have ADE bit in EESR */
unsigned hw_crc:1; /* E-DMAC have CSMR */ unsigned hw_crc:1; /* E-DMAC have CSMR */
unsigned select_mii:1; /* EtherC have RMII_MII (MII select register) */ unsigned select_mii:1; /* EtherC have RMII_MII (MII select register) */
...@@ -511,14 +504,14 @@ struct sh_eth_private { ...@@ -511,14 +504,14 @@ struct sh_eth_private {
struct sh_eth_txdesc *tx_ring; struct sh_eth_txdesc *tx_ring;
struct sk_buff **rx_skbuff; struct sk_buff **rx_skbuff;
struct sk_buff **tx_skbuff; struct sk_buff **tx_skbuff;
spinlock_t lock; spinlock_t lock; /* Register access lock */
u32 cur_rx, dirty_rx; /* Producer/consumer ring indices */ u32 cur_rx, dirty_rx; /* Producer/consumer ring indices */
u32 cur_tx, dirty_tx; u32 cur_tx, dirty_tx;
u32 rx_buf_sz; /* Based on MTU+slack. */ u32 rx_buf_sz; /* Based on MTU+slack. */
int edmac_endian; int edmac_endian;
struct napi_struct napi; struct napi_struct napi;
/* MII transceiver section. */ /* MII transceiver section. */
u32 phy_id; /* PHY ID */ u32 phy_id; /* PHY ID */
struct mii_bus *mii_bus; /* MDIO bus control */ struct mii_bus *mii_bus; /* MDIO bus control */
struct phy_device *phydev; /* PHY device control */ struct phy_device *phydev; /* PHY device control */
int link; int link;
...@@ -526,8 +519,8 @@ struct sh_eth_private { ...@@ -526,8 +519,8 @@ struct sh_eth_private {
int msg_enable; int msg_enable;
int speed; int speed;
int duplex; int duplex;
int port; /* for TSU */ int port; /* for TSU */
int vlan_num_ids; /* for VLAN tag filter */ int vlan_num_ids; /* for VLAN tag filter */
unsigned no_ether_link:1; unsigned no_ether_link:1;
unsigned ether_link_active_low:1; unsigned ether_link_active_low:1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment