pci: fix some warnings related to assumptions about

The following commit introduced some warnings associated with using pci_addr_t instead of a proper 32-bit data type. commit af778c6d9e2b945ee03cbc53bb976238a3374f33 Author: Andrew Sharp <andywyse6@gmail.com> Date: Wed Aug 1 12:27:16 2012 +0000 pci: fix errant data types and corresponding access functions On some platforms pci_addr_t is defined as a 64-bit data type so its not proper to use with pci_{read,write}_config_dword. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

pci: fix some warnings related to assumptions about
The following commit introduced some warnings associated with using pci_addr_t instead of a proper 32-bit data type. commit af778c6d9e2b945ee03cbc53bb976238a3374f33 Author: Andrew Sharp <andywyse6@gmail.com> Date: Wed Aug 1 12:27:16 2012 +0000 pci: fix errant data types and corresponding access functions On some platforms pci_addr_t is defined as a 64-bit data type so its not proper to use with pci_{read,write}_config_dword. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Kumar Gala · Anatolij Gustschin
1 parent 5bfa78db4f
Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff
drivers/pci/pci.c
drivers/pci/pci_auto.c
@@ -118,11 +118,11 @@
 void *pci_map_bar(pci_dev_t pdev, int bar, int flags)
 {
 	pci_addr_t pci_bus_addr;
-	pci_addr_t bar_response;
+	u32 bar_response;
  
 	/* read BAR address */
 	pci_read_config_dword(pdev, bar, &bar_response);
-	pci_bus_addr = bar_response & ~0xf;
+	pci_bus_addr = (pci_addr_t)(bar_response & ~0xf);
  
 	/*
 	 * Pass "0" as the length argument to pci_bus_to_virt.  The arg
@@ -389,7 +389,7 @@
 			   pci_addr_t mem,
 			   unsigned long command)
 {
-	pci_addr_t bar_response;
+	u32 bar_response;
 	unsigned int old_command;
 	pci_addr_t bar_value;
 	pci_size_t bar_size;
@@ -89,7 +89,7 @@
 			  struct pci_region *prefetch,
 			  struct pci_region *io)
 {
-	pci_addr_t bar_response;
+	u32 bar_response;
 	pci_size_t bar_size;
 	u16 cmdstat = 0;
 	int bar, bar_nr = 0;
...	...	@@ -118,11 +118,11 @@
118	118	void *pci_map_bar(pci_dev_t pdev, int bar, int flags)
119	119	{
120	120	pci_addr_t pci_bus_addr;
121		- pci_addr_t bar_response;
	121	+ u32 bar_response;
122	122
123	123	/* read BAR address */
124	124	pci_read_config_dword(pdev, bar, &bar_response);
125		- pci_bus_addr = bar_response & ~0xf;
	125	+ pci_bus_addr = (pci_addr_t)(bar_response & ~0xf);
126	126
127	127	/*
128	128	* Pass "0" as the length argument to pci_bus_to_virt. The arg
...	...	@@ -389,7 +389,7 @@
389	389	pci_addr_t mem,
390	390	unsigned long command)
391	391	{
392		- pci_addr_t bar_response;
	392	+ u32 bar_response;
393	393	unsigned int old_command;
394	394	pci_addr_t bar_value;
395	395	pci_size_t bar_size;
...	...	@@ -89,7 +89,7 @@
89	89	struct pci_region *prefetch,
90	90	struct pci_region *io)
91	91	{
92		- pci_addr_t bar_response;
	92	+ u32 bar_response;
93	93	pci_size_t bar_size;
94	94	u16 cmdstat = 0;
95	95	int bar, bar_nr = 0;