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

Commit 9294896e authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390/pci: use to_pci_dev 



Use the to_pci_dev macro to fetch a pci_dev from a struct device
pointer.

Reviewed-by: default avatarGerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 1e876e3b

arch/s390/pci/pci_dma.c

+3 −3
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page, 
				     enum dma_data_direction direction,

				     struct dma_attrs *attrs)

{

	struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));

	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));

	unsigned long nr_pages, iommu_page_index;

	unsigned long pa = page_to_phys(page) + offset;

	int flags = ZPCI_PTE_VALID;
@@ -304,7 +304,7 @@ static void s390_dma_unmap_pages(struct device *dev, dma_addr_t dma_addr, 
				 size_t size, enum dma_data_direction direction,

				 struct dma_attrs *attrs)

{

	struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));

	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));

	unsigned long iommu_page_index;

	int npages;
@@ -323,7 +323,7 @@ static void *s390_dma_alloc(struct device *dev, size_t size, 
			    dma_addr_t *dma_handle, gfp_t flag,

			    struct dma_attrs *attrs)

{

	struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));

	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));

	struct page *page;

	unsigned long pa;

	dma_addr_t map;

arch/s390/pci/pci_sysfs.c

+4 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
static ssize_t show_fid(struct device *dev, struct device_attribute *attr,

			char *buf)

{

	struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));

	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));



	sprintf(buf, "0x%08x\n", zdev->fid);

	return strlen(buf);
@@ -25,7 +25,7 @@ static DEVICE_ATTR(function_id, S_IRUGO, show_fid, NULL); 
static ssize_t show_fh(struct device *dev, struct device_attribute *attr,

		       char *buf)

{

	struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));

	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));



	sprintf(buf, "0x%08x\n", zdev->fh);

	return strlen(buf);
@@ -35,7 +35,7 @@ static DEVICE_ATTR(function_handle, S_IRUGO, show_fh, NULL); 
static ssize_t show_pchid(struct device *dev, struct device_attribute *attr,

			  char *buf)

{

	struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));

	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));



	sprintf(buf, "0x%04x\n", zdev->pchid);

	return strlen(buf);
@@ -45,7 +45,7 @@ static DEVICE_ATTR(pchid, S_IRUGO, show_pchid, NULL); 
static ssize_t show_pfgid(struct device *dev, struct device_attribute *attr,

			  char *buf)

{

	struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));

	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));



	sprintf(buf, "0x%02x\n", zdev->pfgid);

	return strlen(buf);