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

Commit 5b9f2081 authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

s390/pci: add sparse annotations 



Fix the following warnings from the sparse code checker:

arch/s390/include/asm/pci_io.h:165:49: warning: cast removes address space of expression
arch/s390/pci/pci.c:476:44: warning: cast removes address space of expression
arch/s390/pci/pci.c:491:36: warning: incorrect type in argument 2 (different address spaces)
arch/s390/pci/pci.c:491:36:    expected void [noderef] <asn:2>*addr
arch/s390/pci/pci.c:491:36:    got void *<noident>

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent b19148f6

arch/s390/include/asm/pci_io.h

+4 −2
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ static inline int zpci_memcpy_fromio(void *dst, 
	int size, rc = 0;



	while (n > 0) {

		size = zpci_get_max_write_size((u64) src, (u64) dst, n, 8);

		size = zpci_get_max_write_size((u64 __force) src,

					       (u64) dst, n, 8);

		req = ZPCI_CREATE_REQ(entry->fh, entry->bar, size);

		rc = zpci_read_single(req, dst, offset, size);

		if (rc)
@@ -162,7 +163,8 @@ static inline int zpci_memcpy_toio(volatile void __iomem *dst, 
		return -EINVAL;



	while (n > 0) {

		size = zpci_get_max_write_size((u64) dst, (u64) src, n, 128);

		size = zpci_get_max_write_size((u64 __force) dst,

					       (u64) src, n, 128);

		req = ZPCI_CREATE_REQ(entry->fh, entry->bar, size);



		if (size > 8) /* main path */

arch/s390/pci/pci.c

+4 −2
Original line number Diff line number Diff line
@@ -473,7 +473,8 @@ static void zpci_map_resources(struct zpci_dev *zdev) 
		len = pci_resource_len(pdev, i);

		if (!len)

			continue;

		pdev->resource[i].start = (resource_size_t) pci_iomap(pdev, i, 0);

		pdev->resource[i].start =

			(resource_size_t __force) pci_iomap(pdev, i, 0);

		pdev->resource[i].end = pdev->resource[i].start + len - 1;

	}

}
@@ -488,7 +489,8 @@ static void zpci_unmap_resources(struct zpci_dev *zdev) 
		len = pci_resource_len(pdev, i);

		if (!len)

			continue;

		pci_iounmap(pdev, (void *) pdev->resource[i].start);

		pci_iounmap(pdev, (void __iomem __force *)

			    pdev->resource[i].start);

	}

}