Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 554a6037 authored by Geliang Tang's avatar Geliang Tang Committed by Bjorn Helgaas
Browse files

PCI: Use kobj_to_dev() instead of open-coding it 



Use kobj_to_dev() instead of open-coding it.

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent f3d2f165

drivers/pci/pci-label.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -77,7 +77,7 @@ static umode_t smbios_instance_string_exist(struct kobject *kobj, 
	struct device *dev;

	struct device *dev;

	struct pci_dev *pdev;

	struct pci_dev *pdev;





	dev = container_of(kobj, struct device, kobj);

	dev = kobj_to_dev(kobj);

	pdev = to_pci_dev(dev);

	pdev = to_pci_dev(dev);





	return find_smbios_instance_string(pdev, NULL, SMBIOS_ATTR_NONE) ?

	return find_smbios_instance_string(pdev, NULL, SMBIOS_ATTR_NONE) ?
@@ -221,7 +221,7 @@ static umode_t acpi_index_string_exist(struct kobject *kobj, 
{

{

	struct device *dev;

	struct device *dev;





	dev = container_of(kobj, struct device, kobj);

	dev = kobj_to_dev(kobj);





	if (device_has_dsm(dev))

	if (device_has_dsm(dev))

		return S_IRUGO;

		return S_IRUGO;

drivers/pci/pci-sysfs.c

+15 −25
Original line number Original line Diff line number Diff line
@@ -627,8 +627,7 @@ static ssize_t pci_read_config(struct file *filp, struct kobject *kobj, 
			       struct bin_attribute *bin_attr, char *buf,

			       struct bin_attribute *bin_attr, char *buf,

			       loff_t off, size_t count)

			       loff_t off, size_t count)

{

{

	struct pci_dev *dev = to_pci_dev(container_of(kobj, struct device,

	struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj));

						      kobj));

	unsigned int size = 64;

	unsigned int size = 64;

	loff_t init_off = off;

	loff_t init_off = off;

	u8 *data = (u8 *) buf;

	u8 *data = (u8 *) buf;
@@ -704,8 +703,7 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj, 
				struct bin_attribute *bin_attr, char *buf,

				struct bin_attribute *bin_attr, char *buf,

				loff_t off, size_t count)

				loff_t off, size_t count)

{

{

	struct pci_dev *dev = to_pci_dev(container_of(kobj, struct device,

	struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj));

						      kobj));

	unsigned int size = count;

	unsigned int size = count;

	loff_t init_off = off;

	loff_t init_off = off;

	u8 *data = (u8 *) buf;

	u8 *data = (u8 *) buf;
@@ -766,8 +764,7 @@ static ssize_t read_vpd_attr(struct file *filp, struct kobject *kobj, 
			     struct bin_attribute *bin_attr, char *buf,

			     struct bin_attribute *bin_attr, char *buf,

			     loff_t off, size_t count)

			     loff_t off, size_t count)

{

{

	struct pci_dev *dev =

	struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj));

		to_pci_dev(container_of(kobj, struct device, kobj));





	if (off > bin_attr->size)

	if (off > bin_attr->size)

		count = 0;

		count = 0;
@@ -781,8 +778,7 @@ static ssize_t write_vpd_attr(struct file *filp, struct kobject *kobj, 
			      struct bin_attribute *bin_attr, char *buf,

			      struct bin_attribute *bin_attr, char *buf,

			      loff_t off, size_t count)

			      loff_t off, size_t count)

{

{

	struct pci_dev *dev =

	struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj));

		to_pci_dev(container_of(kobj, struct device, kobj));





	if (off > bin_attr->size)

	if (off > bin_attr->size)

		count = 0;

		count = 0;
@@ -809,8 +805,7 @@ static ssize_t pci_read_legacy_io(struct file *filp, struct kobject *kobj, 
				  struct bin_attribute *bin_attr, char *buf,

				  struct bin_attribute *bin_attr, char *buf,

				  loff_t off, size_t count)

				  loff_t off, size_t count)

{

{

	struct pci_bus *bus = to_pci_bus(container_of(kobj, struct device,

	struct pci_bus *bus = to_pci_bus(kobj_to_dev(kobj));

						      kobj));





	/* Only support 1, 2 or 4 byte accesses */

	/* Only support 1, 2 or 4 byte accesses */

	if (count != 1 && count != 2 && count != 4)

	if (count != 1 && count != 2 && count != 4)
@@ -835,8 +830,7 @@ static ssize_t pci_write_legacy_io(struct file *filp, struct kobject *kobj, 
				   struct bin_attribute *bin_attr, char *buf,

				   struct bin_attribute *bin_attr, char *buf,

				   loff_t off, size_t count)

				   loff_t off, size_t count)

{

{

	struct pci_bus *bus = to_pci_bus(container_of(kobj, struct device,

	struct pci_bus *bus = to_pci_bus(kobj_to_dev(kobj));

						      kobj));





	/* Only support 1, 2 or 4 byte accesses */

	/* Only support 1, 2 or 4 byte accesses */

	if (count != 1 && count != 2 && count != 4)

	if (count != 1 && count != 2 && count != 4)
@@ -860,8 +854,7 @@ static int pci_mmap_legacy_mem(struct file *filp, struct kobject *kobj, 
			       struct bin_attribute *attr,

			       struct bin_attribute *attr,

			       struct vm_area_struct *vma)

			       struct vm_area_struct *vma)

{

{

	struct pci_bus *bus = to_pci_bus(container_of(kobj, struct device,

	struct pci_bus *bus = to_pci_bus(kobj_to_dev(kobj));

						      kobj));





	return pci_mmap_legacy_page_range(bus, vma, pci_mmap_mem);

	return pci_mmap_legacy_page_range(bus, vma, pci_mmap_mem);

}

}
@@ -881,8 +874,7 @@ static int pci_mmap_legacy_io(struct file *filp, struct kobject *kobj, 
			      struct bin_attribute *attr,

			      struct bin_attribute *attr,

			      struct vm_area_struct *vma)

			      struct vm_area_struct *vma)

{

{

	struct pci_bus *bus = to_pci_bus(container_of(kobj, struct device,

	struct pci_bus *bus = to_pci_bus(kobj_to_dev(kobj));

						      kobj));





	return pci_mmap_legacy_page_range(bus, vma, pci_mmap_io);

	return pci_mmap_legacy_page_range(bus, vma, pci_mmap_io);

}

}
@@ -997,8 +989,7 @@ int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vma, 
static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,

static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,

			     struct vm_area_struct *vma, int write_combine)

			     struct vm_area_struct *vma, int write_combine)

{

{

	struct pci_dev *pdev = to_pci_dev(container_of(kobj,

	struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj));

						       struct device, kobj));

	struct resource *res = attr->private;

	struct resource *res = attr->private;

	enum pci_mmap_state mmap_type;

	enum pci_mmap_state mmap_type;

	resource_size_t start, end;

	resource_size_t start, end;
@@ -1051,8 +1042,7 @@ static ssize_t pci_resource_io(struct file *filp, struct kobject *kobj, 
			       struct bin_attribute *attr, char *buf,

			       struct bin_attribute *attr, char *buf,

			       loff_t off, size_t count, bool write)

			       loff_t off, size_t count, bool write)

{

{

	struct pci_dev *pdev = to_pci_dev(container_of(kobj,

	struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj));

						       struct device, kobj));

	struct resource *res = attr->private;

	struct resource *res = attr->private;

	unsigned long port = off;

	unsigned long port = off;

	int i;

	int i;
@@ -1222,7 +1212,7 @@ static ssize_t pci_write_rom(struct file *filp, struct kobject *kobj, 
			     struct bin_attribute *bin_attr, char *buf,

			     struct bin_attribute *bin_attr, char *buf,

			     loff_t off, size_t count)

			     loff_t off, size_t count)

{

{

	struct pci_dev *pdev = to_pci_dev(container_of(kobj, struct device, kobj));

	struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj));





	if ((off ==  0) && (*buf == '0') && (count == 2))

	if ((off ==  0) && (*buf == '0') && (count == 2))

		pdev->rom_attr_enabled = 0;

		pdev->rom_attr_enabled = 0;
@@ -1248,7 +1238,7 @@ static ssize_t pci_read_rom(struct file *filp, struct kobject *kobj, 
			    struct bin_attribute *bin_attr, char *buf,

			    struct bin_attribute *bin_attr, char *buf,

			    loff_t off, size_t count)

			    loff_t off, size_t count)

{

{

	struct pci_dev *pdev = to_pci_dev(container_of(kobj, struct device, kobj));

	struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj));

	void __iomem *rom;

	void __iomem *rom;

	size_t size;

	size_t size;
@@ -1508,7 +1498,7 @@ static struct attribute *pci_dev_dev_attrs[] = { 
static umode_t pci_dev_attrs_are_visible(struct kobject *kobj,

static umode_t pci_dev_attrs_are_visible(struct kobject *kobj,

					 struct attribute *a, int n)

					 struct attribute *a, int n)

{

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct device *dev = kobj_to_dev(kobj);

	struct pci_dev *pdev = to_pci_dev(dev);

	struct pci_dev *pdev = to_pci_dev(dev);





	if (a == &vga_attr.attr)

	if (a == &vga_attr.attr)
@@ -1527,7 +1517,7 @@ static struct attribute *pci_dev_hp_attrs[] = { 
static umode_t pci_dev_hp_attrs_are_visible(struct kobject *kobj,

static umode_t pci_dev_hp_attrs_are_visible(struct kobject *kobj,

					    struct attribute *a, int n)

					    struct attribute *a, int n)

{

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct device *dev = kobj_to_dev(kobj);

	struct pci_dev *pdev = to_pci_dev(dev);

	struct pci_dev *pdev = to_pci_dev(dev);





	if (pdev->is_virtfn)

	if (pdev->is_virtfn)
@@ -1551,7 +1541,7 @@ static struct attribute *sriov_dev_attrs[] = { 
static umode_t sriov_attrs_are_visible(struct kobject *kobj,

static umode_t sriov_attrs_are_visible(struct kobject *kobj,

				       struct attribute *a, int n)

				       struct attribute *a, int n)

{

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct device *dev = kobj_to_dev(kobj);





	if (!dev_is_pf(dev))

	if (!dev_is_pf(dev))

		return 0;

		return 0;