xen/pciback: Drop two backends, squash and cleanup some code.
- Remove the slot and controller controller backend as they
are not used.
- Document the find pciback_[read|write]_config_[byte|word|dword]
to make it easier to find.
- Collapse the code from conf_space_capability_msi into pciback_ops.c
- Collapse conf_space_capability_[pm|vpd].c in conf_space_capability.c
[and remove the conf_space_capability.h file]
- Rename all visible functions from pciback to xen_pcibk.
- Rename all the printk/pr_info, etc that use the "pciback" to say
"xen-pciback".
- Convert functions that are not referenced outside the code to be
static to save on name space.
- Do the same thing for structures that are internal to the driver.
- Run checkpatch.pl after the renames and fixup its warnings and
fix any compile errors caused by the variable rename
- Cleanup any structs that checkpath.pl commented about or just
look odd.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
diff --git a/drivers/xen/xen-pciback/conf_space.c b/drivers/xen/xen-pciback/conf_space.c
index eb6bba0..a803144 100644
--- a/drivers/xen/xen-pciback/conf_space.c
+++ b/drivers/xen/xen-pciback/conf_space.c
@@ -15,11 +15,14 @@
#include "conf_space.h"
#include "conf_space_quirks.h"
+#define DRV_NAME "xen-pciback"
static int permissive;
module_param(permissive, bool, 0644);
+/* This is where xen_pcibk_read_config_byte, xen_pcibk_read_config_word,
+ * xen_pcibk_write_config_word, and xen_pcibk_write_config_byte are created. */
#define DEFINE_PCI_CONFIG(op, size, type) \
-int pciback_##op##_config_##size \
+int xen_pcibk_##op##_config_##size \
(struct pci_dev *dev, int offset, type value, void *data) \
{ \
return pci_##op##_config_##size(dev, offset, value); \
@@ -138,11 +141,11 @@
return err;
}
-int pciback_config_read(struct pci_dev *dev, int offset, int size,
- u32 *ret_val)
+int xen_pcibk_config_read(struct pci_dev *dev, int offset, int size,
+ u32 *ret_val)
{
int err = 0;
- struct pciback_dev_data *dev_data = pci_get_drvdata(dev);
+ struct xen_pcibk_dev_data *dev_data = pci_get_drvdata(dev);
const struct config_field_entry *cfg_entry;
const struct config_field *field;
int req_start, req_end, field_start, field_end;
@@ -151,7 +154,7 @@
u32 value = 0, tmp_val;
if (unlikely(verbose_request))
- printk(KERN_DEBUG "pciback: %s: read %d bytes at 0x%x\n",
+ printk(KERN_DEBUG DRV_NAME ": %s: read %d bytes at 0x%x\n",
pci_name(dev), size, offset);
if (!valid_request(offset, size)) {
@@ -195,17 +198,17 @@
out:
if (unlikely(verbose_request))
- printk(KERN_DEBUG "pciback: %s: read %d bytes at 0x%x = %x\n",
+ printk(KERN_DEBUG DRV_NAME ": %s: read %d bytes at 0x%x = %x\n",
pci_name(dev), size, offset, value);
*ret_val = value;
return pcibios_err_to_errno(err);
}
-int pciback_config_write(struct pci_dev *dev, int offset, int size, u32 value)
+int xen_pcibk_config_write(struct pci_dev *dev, int offset, int size, u32 value)
{
int err = 0, handled = 0;
- struct pciback_dev_data *dev_data = pci_get_drvdata(dev);
+ struct xen_pcibk_dev_data *dev_data = pci_get_drvdata(dev);
const struct config_field_entry *cfg_entry;
const struct config_field *field;
u32 tmp_val;
@@ -213,7 +216,7 @@
if (unlikely(verbose_request))
printk(KERN_DEBUG
- "pciback: %s: write request %d bytes at 0x%x = %x\n",
+ DRV_NAME ": %s: write request %d bytes at 0x%x = %x\n",
pci_name(dev), size, offset, value);
if (!valid_request(offset, size))
@@ -231,7 +234,7 @@
|| (req_end > field_start && req_end <= field_end)) {
tmp_val = 0;
- err = pciback_config_read(dev, field_start,
+ err = xen_pcibk_config_read(dev, field_start,
field->size, &tmp_val);
if (err)
break;
@@ -290,9 +293,9 @@
return pcibios_err_to_errno(err);
}
-void pciback_config_free_dyn_fields(struct pci_dev *dev)
+void xen_pcibk_config_free_dyn_fields(struct pci_dev *dev)
{
- struct pciback_dev_data *dev_data = pci_get_drvdata(dev);
+ struct xen_pcibk_dev_data *dev_data = pci_get_drvdata(dev);
struct config_field_entry *cfg_entry, *t;
const struct config_field *field;
@@ -316,9 +319,9 @@
}
}
-void pciback_config_reset_dev(struct pci_dev *dev)
+void xen_pcibk_config_reset_dev(struct pci_dev *dev)
{
- struct pciback_dev_data *dev_data = pci_get_drvdata(dev);
+ struct xen_pcibk_dev_data *dev_data = pci_get_drvdata(dev);
const struct config_field_entry *cfg_entry;
const struct config_field *field;
@@ -334,9 +337,9 @@
}
}
-void pciback_config_free_dev(struct pci_dev *dev)
+void xen_pcibk_config_free_dev(struct pci_dev *dev)
{
- struct pciback_dev_data *dev_data = pci_get_drvdata(dev);
+ struct xen_pcibk_dev_data *dev_data = pci_get_drvdata(dev);
struct config_field_entry *cfg_entry, *t;
const struct config_field *field;
@@ -356,12 +359,12 @@
}
}
-int pciback_config_add_field_offset(struct pci_dev *dev,
+int xen_pcibk_config_add_field_offset(struct pci_dev *dev,
const struct config_field *field,
unsigned int base_offset)
{
int err = 0;
- struct pciback_dev_data *dev_data = pci_get_drvdata(dev);
+ struct xen_pcibk_dev_data *dev_data = pci_get_drvdata(dev);
struct config_field_entry *cfg_entry;
void *tmp;
@@ -376,7 +379,7 @@
cfg_entry->base_offset = base_offset;
/* silently ignore duplicate fields */
- err = pciback_field_is_dup(dev, OFFSET(cfg_entry));
+ err = xen_pcibk_field_is_dup(dev, OFFSET(cfg_entry));
if (err)
goto out;
@@ -406,30 +409,30 @@
* certain registers (like the base address registers (BARs) so that we can
* keep the client from manipulating them directly.
*/
-int pciback_config_init_dev(struct pci_dev *dev)
+int xen_pcibk_config_init_dev(struct pci_dev *dev)
{
int err = 0;
- struct pciback_dev_data *dev_data = pci_get_drvdata(dev);
+ struct xen_pcibk_dev_data *dev_data = pci_get_drvdata(dev);
dev_dbg(&dev->dev, "initializing virtual configuration space\n");
INIT_LIST_HEAD(&dev_data->config_fields);
- err = pciback_config_header_add_fields(dev);
+ err = xen_pcibk_config_header_add_fields(dev);
if (err)
goto out;
- err = pciback_config_capability_add_fields(dev);
+ err = xen_pcibk_config_capability_add_fields(dev);
if (err)
goto out;
- err = pciback_config_quirks_init(dev);
+ err = xen_pcibk_config_quirks_init(dev);
out:
return err;
}
-int pciback_config_init(void)
+int xen_pcibk_config_init(void)
{
- return pciback_config_capability_init();
+ return xen_pcibk_config_capability_init();
}