mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 09:10:28 +00:00
vmd: Use bus_read/write_* instead of bus_space_read/write_*
Using an explicit bus space tag and handle is deprecated. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D43885
This commit is contained in:
parent
962b0bcbd9
commit
76c6786886
|
@ -184,14 +184,11 @@ vmd_read_config(device_t dev, u_int b, u_int s, u_int f, u_int reg, int width)
|
|||
|
||||
switch (width) {
|
||||
case 4:
|
||||
return (bus_space_read_4(sc->vmd_btag, sc->vmd_bhandle,
|
||||
offset));
|
||||
return (bus_read_4(sc->vmd_regs_res[0], offset));
|
||||
case 2:
|
||||
return (bus_space_read_2(sc->vmd_btag, sc->vmd_bhandle,
|
||||
offset));
|
||||
return (bus_read_2(sc->vmd_regs_res[0], offset));
|
||||
case 1:
|
||||
return (bus_space_read_1(sc->vmd_btag, sc->vmd_bhandle,
|
||||
offset));
|
||||
return (bus_read_1(sc->vmd_regs_res[0], offset));
|
||||
default:
|
||||
__assert_unreachable();
|
||||
return (0xffffffff);
|
||||
|
@ -213,14 +210,11 @@ vmd_write_config(device_t dev, u_int b, u_int s, u_int f, u_int reg,
|
|||
|
||||
switch (width) {
|
||||
case 4:
|
||||
return (bus_space_write_4(sc->vmd_btag, sc->vmd_bhandle,
|
||||
offset, val));
|
||||
return (bus_write_4(sc->vmd_regs_res[0], offset, val));
|
||||
case 2:
|
||||
return (bus_space_write_2(sc->vmd_btag, sc->vmd_bhandle,
|
||||
offset, val));
|
||||
return (bus_write_2(sc->vmd_regs_res[0], offset, val));
|
||||
case 1:
|
||||
return (bus_space_write_1(sc->vmd_btag, sc->vmd_bhandle,
|
||||
offset, val));
|
||||
return (bus_write_1(sc->vmd_regs_res[0], offset, val));
|
||||
default:
|
||||
__assert_unreachable();
|
||||
}
|
||||
|
@ -282,9 +276,6 @@ vmd_attach(device_t dev)
|
|||
}
|
||||
}
|
||||
|
||||
sc->vmd_btag = rman_get_bustag(sc->vmd_regs_res[0]);
|
||||
sc->vmd_bhandle = rman_get_bushandle(sc->vmd_regs_res[0]);
|
||||
|
||||
vid = pci_get_vendor(dev);
|
||||
did = pci_get_device(dev);
|
||||
for (t = vmd_devs; t->vmd_name != NULL; t++) {
|
||||
|
|
|
@ -53,8 +53,6 @@ struct vmd_softc {
|
|||
#define VMD_MAX_BAR 3
|
||||
int vmd_regs_rid[VMD_MAX_BAR];
|
||||
struct resource *vmd_regs_res[VMD_MAX_BAR];
|
||||
bus_space_handle_t vmd_bhandle;
|
||||
bus_space_tag_t vmd_btag;
|
||||
struct vmd_irq *vmd_irq;
|
||||
LIST_HEAD(,vmd_irq_user) vmd_users;
|
||||
int vmd_fist_vector;
|
||||
|
|
Loading…
Reference in a new issue