Skip to content

Commit 41d5ffe

Browse files
Nobuhiro Iwamatsudavem330
authored andcommitted
sh_eth: remove #ifdef around EDSR and GECMR bit definitions
Remove #ifdef around 'enum EDSR_BIT' and 'enum GECMR_BIT', replacing it with the comments on which SoCs these registers exist. SH7757 also has EDSR, so add a comment about it to 'enum EDSR_BIT'. Signed-off-by: Nobuhiro Iwamatsu <[email protected]> [Sergei: folded in the former patch #2, updated the changelog, reworded the subject, changing the prefix.] Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 143554a commit 41d5ffe

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

drivers/net/ethernet/renesas/sh_eth.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,19 +166,16 @@ enum {
166166
/*
167167
* Register's bits
168168
*/
169-
#if defined(CONFIG_CPU_SUBTYPE_SH7734) || defined(CONFIG_CPU_SUBTYPE_SH7763) ||\
170-
defined(CONFIG_ARCH_R8A7740)
171-
/* EDSR */
169+
/* EDSR : sh7734, sh7757, sh7763, and r8a7740 only */
172170
enum EDSR_BIT {
173171
EDSR_ENT = 0x01, EDSR_ENR = 0x02,
174172
};
175173
#define EDSR_ENALL (EDSR_ENT|EDSR_ENR)
176174

177-
/* GECMR */
175+
/* GECMR : sh7734, sh7763 and r8a7740 only */
178176
enum GECMR_BIT {
179177
GECMR_10 = 0x0, GECMR_100 = 0x04, GECMR_1000 = 0x01,
180178
};
181-
#endif
182179

183180
/* EDMR */
184181
enum DMAC_M_BIT {

0 commit comments

Comments
 (0)