aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/e1000
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <dumbbell@FreeBSD.org>2016-08-09 19:32:06 +0000
committerJean-Sébastien Pédron <dumbbell@FreeBSD.org>2016-08-09 19:32:06 +0000
commitbd937497ea2a1111d9cf6ff1cdbe698b3cdd430a (patch)
treecd36a4cc1858d305bf7632b49f8862e1ea5067dc /sys/dev/e1000
parent8e60fa95cb5d4ee7e70601a9b8542240fb1c2522 (diff)
downloadsrc-bd937497ea2a1111d9cf6ff1cdbe698b3cdd430a.tar.gz
src-bd937497ea2a1111d9cf6ff1cdbe698b3cdd430a.zip
Consistently use `device_t`
Several files use the internal name of `struct device` instead of `device_t` which is part of the public API. This patch changes all `struct device *` to `device_t`. The remaining occurrences of `struct device` are those referring to the Linux or OpenBSD version of the structure, or the code is not built on FreeBSD and it's unclear what to do. Submitted by: Matthew Macy <mmacy@nextbsd.org> (previous version) Approved by: emaste, jhibbits, sbruno MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D7447
Notes
Notes: svn path=/head/; revision=303890
Diffstat (limited to 'sys/dev/e1000')
-rw-r--r--sys/dev/e1000/e1000_osdep.h2
-rw-r--r--sys/dev/e1000/if_em.h2
-rw-r--r--sys/dev/e1000/if_igb.h2
-rw-r--r--sys/dev/e1000/if_lem.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/e1000/e1000_osdep.h b/sys/dev/e1000/e1000_osdep.h
index c0bf4182ec62..c7c23e582ca9 100644
--- a/sys/dev/e1000/e1000_osdep.h
+++ b/sys/dev/e1000/e1000_osdep.h
@@ -134,7 +134,7 @@ struct e1000_osdep
bus_space_handle_t io_bus_space_handle;
bus_space_tag_t flash_bus_space_tag;
bus_space_handle_t flash_bus_space_handle;
- struct device *dev;
+ device_t dev;
};
#define E1000_REGISTER(hw, reg) (((hw)->mac.type >= e1000_82543) \
diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h
index c8c98cde6c02..2a2bf2ccb7ab 100644
--- a/sys/dev/e1000/if_em.h
+++ b/sys/dev/e1000/if_em.h
@@ -394,7 +394,7 @@ struct adapter {
/* FreeBSD operating-system-specific structures. */
struct e1000_osdep osdep;
- struct device *dev;
+ device_t dev;
struct cdev *led_dev;
struct resource *memory;
diff --git a/sys/dev/e1000/if_igb.h b/sys/dev/e1000/if_igb.h
index a30fc993230c..e2f2219cc94c 100644
--- a/sys/dev/e1000/if_igb.h
+++ b/sys/dev/e1000/if_igb.h
@@ -429,7 +429,7 @@ struct adapter {
struct e1000_hw hw;
struct e1000_osdep osdep;
- struct device *dev;
+ device_t dev;
struct cdev *led_dev;
struct resource *pci_mem;
diff --git a/sys/dev/e1000/if_lem.h b/sys/dev/e1000/if_lem.h
index 2bdc21a2c335..4a27c34bd772 100644
--- a/sys/dev/e1000/if_lem.h
+++ b/sys/dev/e1000/if_lem.h
@@ -298,7 +298,7 @@ struct adapter {
/* FreeBSD operating-system-specific structures. */
struct e1000_osdep osdep;
- struct device *dev;
+ device_t dev;
struct cdev *led_dev;
struct resource *memory;