summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorAndrew Sharp <andywyse6@gmail.com>2012-08-01 12:27:16 +0000
committerWolfgang Denk <wd@denx.de>2012-09-02 14:17:42 +0200
commitaf778c6d9e2b945ee03cbc53bb976238a3374f33 (patch)
tree0be98cc2a10c668a3e0571bf10a83aa81b56580f /drivers/pci/pci.c
parent6e2fbdea1b26d75314d87c380a36b0015bf824cf (diff)
downloadtalos-obmc-uboot-af778c6d9e2b945ee03cbc53bb976238a3374f33.tar.gz
talos-obmc-uboot-af778c6d9e2b945ee03cbc53bb976238a3374f33.zip
pci: fix errant data types and corresponding access functions
In a couple of places, unsigned int and pci_config_*_dword were being used when u16 and _word should be used. Unsigned int was also being used in a couple of places that should be pci_addr_t. Signed-off-by: Andrew Sharp <andywyse6@gmail.com>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 398542b9e2..cd78312205 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -118,11 +118,11 @@ PCI_WRITE_VIA_DWORD_OP(word, u16, 0x02, 0x0000ffff)
void *pci_map_bar(pci_dev_t pdev, int bar, int flags)
{
pci_addr_t pci_bus_addr;
- u32 bar_response;
+ pci_addr_t bar_response;
/* read BAR address */
pci_read_config_dword(pdev, bar, &bar_response);
- pci_bus_addr = (pci_addr_t)(bar_response & ~0xf);
+ pci_bus_addr = bar_response & ~0xf;
/*
* Pass "0" as the length argument to pci_bus_to_virt. The arg
@@ -385,7 +385,8 @@ int pci_hose_config_device(struct pci_controller *hose,
pci_addr_t mem,
unsigned long command)
{
- unsigned int bar_response, old_command;
+ pci_addr_t bar_response;
+ unsigned int old_command;
pci_addr_t bar_value;
pci_size_t bar_size;
unsigned char pin;
OpenPOWER on IntegriCloud