Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
26da9f9f
Commit
26da9f9f
authored
May 20, 2003
by
Jeb J. Cramer
Committed by
Jeff Garzik
May 20, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] Whitespace cleanup
* Whitespace cleanup
parent
5326bbc6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
8 deletions
+6
-8
drivers/net/e1000/e1000_ethtool.c
drivers/net/e1000/e1000_ethtool.c
+2
-2
drivers/net/e1000/e1000_hw.h
drivers/net/e1000/e1000_hw.h
+2
-1
drivers/net/e1000/e1000_main.c
drivers/net/e1000/e1000_main.c
+2
-5
No files found.
drivers/net/e1000/e1000_ethtool.c
View file @
26da9f9f
...
...
@@ -352,7 +352,7 @@ e1000_ethtool_seeprom(struct e1000_adapter *adapter,
first_word
=
eeprom
->
offset
>>
1
;
last_word
=
(
eeprom
->
offset
+
eeprom
->
len
-
1
)
>>
1
;
eeprom_buff
=
kmalloc
(
max_len
,
GFP_KERNEL
);
if
(
eeprom_buff
==
NULL
)
if
(
!
eeprom_buff
)
return
-
ENOMEM
;
ptr
=
(
void
*
)
eeprom_buff
;
...
...
drivers/net/e1000/e1000_hw.h
View file @
26da9f9f
...
...
@@ -603,7 +603,7 @@ struct e1000_ffvt_entry {
#define E1000_EECD 0x00010
/* EEPROM/Flash Control - RW */
#define E1000_EERD 0x00014
/* EEPROM Read - RW */
#define E1000_CTRL_EXT 0x00018
/* Extended Device Control - RW */
#define E1000_FLA 0x0001C
/* Flash Access
Register
- RW */
#define E1000_FLA 0x0001C
/* Flash Access - RW */
#define E1000_MDIC 0x00020
/* MDI Control - RW */
#define E1000_FCAL 0x00028
/* Flow Control Address Low - RW */
#define E1000_FCAH 0x0002C
/* Flow Control Address High -RW */
...
...
@@ -732,6 +732,7 @@ struct e1000_ffvt_entry {
* the registers function in the same manner.
*/
#define E1000_82542_CTRL E1000_CTRL
#define E1000_82542_CTRL_DUP E1000_CTRL_DUP
#define E1000_82542_STATUS E1000_STATUS
#define E1000_82542_EECD E1000_EECD
#define E1000_82542_EERD E1000_EERD
...
...
drivers/net/e1000/e1000_main.c
View file @
26da9f9f
...
...
@@ -168,7 +168,6 @@ struct notifier_block e1000_notifier_reboot = {
.
priority
=
0
};
/* Exported from other modules */
extern
void
e1000_check_options
(
struct
e1000_adapter
*
adapter
);
...
...
@@ -207,8 +206,9 @@ e1000_init_module(void)
printk
(
KERN_INFO
"%s
\n
"
,
e1000_copyright
);
ret
=
pci_module_init
(
&
e1000_driver
);
if
(
ret
>=
0
)
if
(
ret
>=
0
)
{
register_reboot_notifier
(
&
e1000_notifier_reboot
);
}
return
ret
;
}
...
...
@@ -539,7 +539,6 @@ e1000_remove(struct pci_dev *pdev)
e1000_phy_hw_reset
(
&
adapter
->
hw
);
iounmap
(
adapter
->
hw
.
hw_addr
);
pci_release_regions
(
pdev
);
...
...
@@ -2206,7 +2205,6 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter)
netif_rx
(
skb
);
}
#endif
/* CONFIG_E1000_NAPI */
netdev
->
last_rx
=
jiffies
;
rx_desc
->
status
=
0
;
...
...
@@ -2659,7 +2657,6 @@ e1000_notify_reboot(struct notifier_block *nb, unsigned long event, void *p)
return
NOTIFY_DONE
;
}
static
int
e1000_suspend
(
struct
pci_dev
*
pdev
,
uint32_t
state
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment