On Thu, 04 Sep 2008 13:56:38 -0700
Stephen Hemminger <shemminger@xxxxxxxxxx> wrote:
> Change PCI VPD API which was only used by sysfs to something usable
> in drivers.
> * move iteration over multiple words to the low level
> * cleanup types of arguments
> * add exportable wrapper
>
> Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
>
> --- a/drivers/pci/access.c 2008-09-04 10:16:52.000000000 -0700
> +++ b/drivers/pci/access.c 2008-09-04 10:19:47.000000000 -0700
> @@ -66,6 +66,39 @@ EXPORT_SYMBOL(pci_bus_write_config_byte)
> EXPORT_SYMBOL(pci_bus_write_config_word);
> EXPORT_SYMBOL(pci_bus_write_config_dword);
>
> +
> +/**
> + * pci_read_vpd - Read one entry from Vital Product Data
> + * @dev: pci device struct
> + * @pos: offset in vpd space
> + * @count: number of bytes to read
> + * @buf: pointer to where to store result
> + *
> + */
> +int pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *buf)
> +{
> + if (!dev->vpd || !dev->vpd->ops)
> + return -ENODEV;
> + return dev->vpd->ops->read(dev, pos, count, buf);
> +}
> +EXPORT_SYMBOL(pci_read_vpd);
"read" functions normally return ssize_t, not int.
>
> ...
>
> static ssize_t
> -pci_read_vpd(struct kobject *kobj, struct bin_attribute *bin_attr,
> - char *buf, loff_t off, size_t count)
> +read_vpd_attr(struct kobject *kobj, struct bin_attribute *bin_attr,
> + char *buf, loff_t off, size_t count)
> {
This returns size_t.
> static ssize_t
> -pci_write_vpd(struct kobject *kobj, struct bin_attribute *bin_attr,
> - char *buf, loff_t off, size_t count)
> +write_vpd_attr(struct kobject *kobj, struct bin_attribute *bin_attr,
> + char *buf, loff_t off, size_t count)
as does this.
> @@ -739,8 +717,8 @@ int __must_check pci_create_sysfs_dev_fi
> attr->size = pdev->vpd->len;
> attr->attr.name = "vpd";
> attr->attr.mode = S_IRUSR | S_IWUSR;
> - attr->read = pci_read_vpd;
> - attr->write = pci_write_vpd;
> + attr->read = read_vpd_attr;
> + attr->write = write_vpd_attr;
But this (I think) is assigning a ssize_t-returning function to an
int-returning function pointer.
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
