mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 00:39:48 +00:00
PCI: Remove struct pci_vpd_ops.release function pointer
The struct pci_vpd_ops.release function pointer is always pci_vpd_pci22_release(), so there's no need for the flexibility of a function pointer. Inline the pci_vpd_pci22_release() body into pci_vpd_release() and remove pci_vpd_pci22_release() and the struct pci_vpd_ops.release function pointer. Tested-by: Shane Seymour <shane.seymour@hpe.com> Tested-by: Babu Moger <babu.moger@oracle.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Hannes Reinecke <hare@suse.com>
This commit is contained in:
parent
64379079a9
commit
da00684723
2 changed files with 1 additions and 9 deletions
|
@ -508,15 +508,9 @@ static ssize_t pci_vpd_pci22_write(struct pci_dev *dev, loff_t pos, size_t count
|
||||||
return ret ? ret : count;
|
return ret ? ret : count;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pci_vpd_pci22_release(struct pci_dev *dev)
|
|
||||||
{
|
|
||||||
kfree(container_of(dev->vpd, struct pci_vpd_pci22, base));
|
|
||||||
}
|
|
||||||
|
|
||||||
static const struct pci_vpd_ops pci_vpd_pci22_ops = {
|
static const struct pci_vpd_ops pci_vpd_pci22_ops = {
|
||||||
.read = pci_vpd_pci22_read,
|
.read = pci_vpd_pci22_read,
|
||||||
.write = pci_vpd_pci22_write,
|
.write = pci_vpd_pci22_write,
|
||||||
.release = pci_vpd_pci22_release,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static ssize_t pci_vpd_f0_read(struct pci_dev *dev, loff_t pos, size_t count,
|
static ssize_t pci_vpd_f0_read(struct pci_dev *dev, loff_t pos, size_t count,
|
||||||
|
@ -552,7 +546,6 @@ static ssize_t pci_vpd_f0_write(struct pci_dev *dev, loff_t pos, size_t count,
|
||||||
static const struct pci_vpd_ops pci_vpd_f0_ops = {
|
static const struct pci_vpd_ops pci_vpd_f0_ops = {
|
||||||
.read = pci_vpd_f0_read,
|
.read = pci_vpd_f0_read,
|
||||||
.write = pci_vpd_f0_write,
|
.write = pci_vpd_f0_write,
|
||||||
.release = pci_vpd_pci22_release,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
int pci_vpd_pci22_init(struct pci_dev *dev)
|
int pci_vpd_pci22_init(struct pci_dev *dev)
|
||||||
|
@ -584,7 +577,7 @@ int pci_vpd_pci22_init(struct pci_dev *dev)
|
||||||
void pci_vpd_release(struct pci_dev *dev)
|
void pci_vpd_release(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
if (dev->vpd)
|
if (dev->vpd)
|
||||||
dev->vpd->ops->release(dev);
|
kfree(container_of(dev->vpd, struct pci_vpd_pci22, base));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -97,7 +97,6 @@ static inline bool pci_has_subordinate(struct pci_dev *pci_dev)
|
||||||
struct pci_vpd_ops {
|
struct pci_vpd_ops {
|
||||||
ssize_t (*read)(struct pci_dev *dev, loff_t pos, size_t count, void *buf);
|
ssize_t (*read)(struct pci_dev *dev, loff_t pos, size_t count, void *buf);
|
||||||
ssize_t (*write)(struct pci_dev *dev, loff_t pos, size_t count, const void *buf);
|
ssize_t (*write)(struct pci_dev *dev, loff_t pos, size_t count, const void *buf);
|
||||||
void (*release)(struct pci_dev *dev);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct pci_vpd {
|
struct pci_vpd {
|
||||||
|
|
Loading…
Reference in a new issue