Commit 3b0a6d1a authored by Bjorn Helgaas's avatar Bjorn Helgaas

PCI/AER: Rename pci_ops_aer to aer_inj_pci_ops

Rename

  pci_ops_aer     to aer_inj_pci_ops
  pci_read_aer()  to aer_inj_read_config()
  pci_write_aer() to aer_inj_write_config()

This is more conventional and more informative.  No functional change.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 92e963f5
...@@ -181,8 +181,8 @@ static u32 *find_pci_config_dword(struct aer_error *err, int where, ...@@ -181,8 +181,8 @@ static u32 *find_pci_config_dword(struct aer_error *err, int where,
return target; return target;
} }
static int pci_read_aer(struct pci_bus *bus, unsigned int devfn, int where, static int aer_inj_read_config(struct pci_bus *bus, unsigned int devfn,
int size, u32 *val) int where, int size, u32 *val)
{ {
u32 *sim; u32 *sim;
struct aer_error *err; struct aer_error *err;
...@@ -212,8 +212,8 @@ static int pci_read_aer(struct pci_bus *bus, unsigned int devfn, int where, ...@@ -212,8 +212,8 @@ static int pci_read_aer(struct pci_bus *bus, unsigned int devfn, int where,
return ops->read(bus, devfn, where, size, val); return ops->read(bus, devfn, where, size, val);
} }
static int pci_write_aer(struct pci_bus *bus, unsigned int devfn, int where, static int aer_inj_write_config(struct pci_bus *bus, unsigned int devfn,
int size, u32 val) int where, int size, u32 val)
{ {
u32 *sim; u32 *sim;
struct aer_error *err; struct aer_error *err;
...@@ -247,9 +247,9 @@ static int pci_write_aer(struct pci_bus *bus, unsigned int devfn, int where, ...@@ -247,9 +247,9 @@ static int pci_write_aer(struct pci_bus *bus, unsigned int devfn, int where,
return ops->write(bus, devfn, where, size, val); return ops->write(bus, devfn, where, size, val);
} }
static struct pci_ops pci_ops_aer = { static struct pci_ops aer_inj_pci_ops = {
.read = pci_read_aer, .read = aer_inj_read_config,
.write = pci_write_aer, .write = aer_inj_write_config,
}; };
static void pci_bus_ops_init(struct pci_bus_ops *bus_ops, static void pci_bus_ops_init(struct pci_bus_ops *bus_ops,
...@@ -270,9 +270,9 @@ static int pci_bus_set_aer_ops(struct pci_bus *bus) ...@@ -270,9 +270,9 @@ static int pci_bus_set_aer_ops(struct pci_bus *bus)
bus_ops = kmalloc(sizeof(*bus_ops), GFP_KERNEL); bus_ops = kmalloc(sizeof(*bus_ops), GFP_KERNEL);
if (!bus_ops) if (!bus_ops)
return -ENOMEM; return -ENOMEM;
ops = pci_bus_set_ops(bus, &pci_ops_aer); ops = pci_bus_set_ops(bus, &aer_inj_pci_ops);
spin_lock_irqsave(&inject_lock, flags); spin_lock_irqsave(&inject_lock, flags);
if (ops == &pci_ops_aer) if (ops == &aer_inj_pci_ops)
goto out; goto out;
pci_bus_ops_init(bus_ops, bus, ops); pci_bus_ops_init(bus_ops, bus, ops);
list_add(&bus_ops->list, &pci_bus_ops_list); list_add(&bus_ops->list, &pci_bus_ops_list);
......
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