renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 05:04:00 +08:00
Code

staging/rtl8821ae: fix sparse address space warning

Browse Source 
Change the definition of pci_mem_start|end from correct from pci_io(un)map's
point of view.

Signed-off-by: Anders Darander <anders.darander@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Anders Darander 2014-04-23 15:09:50 +02:00 committed by Greg Kroah-Hartman
parent 84fcb4b3a3
commit 4ada11147e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/rtl8821ae/pci.c
View File

@ -2313,16 +2313,16 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
/*shared mem start */
rtlpriv->io.pci_mem_start =
(unsigned long)pci_iomap(pdev,
pci_iomap(pdev,
rtlpriv->cfg->bar_id, pmem_len);
if (rtlpriv->io.pci_mem_start == 0) {
if (rtlpriv->io.pci_mem_start == NULL) {
RT_ASSERT(false, ("Can't map PCI mem\n"));
goto fail2;
}
RT_TRACE(COMP_INIT, DBG_DMESG,
("mem mapped space: start: 0x%08lx len:%08lx "
"flags:%08lx, after map:0x%08lx\n",
"flags:%08lx, after map:0x%p\n",
pmem_start, pmem_len, pmem_flags,
rtlpriv->io.pci_mem_start));
@ -2415,8 +2415,8 @@ fail3:
rtl_deinit_core(hw);
ieee80211_free_hw(hw);
if (rtlpriv->io.pci_mem_start != 0)
pci_iounmap(pdev, (void *)rtlpriv->io.pci_mem_start);
if (rtlpriv->io.pci_mem_start != NULL)
pci_iounmap(pdev, rtlpriv->io.pci_mem_start);
fail2:
pci_release_regions(pdev);
@ -2478,8 +2478,8 @@ void rtl_pci_disconnect(struct pci_dev *pdev)
pci_disable_msi(rtlpci->pdev);
list_del(&rtlpriv->list);
if (rtlpriv->io.pci_mem_start != 0) {
pci_iounmap(pdev, (void *)rtlpriv->io.pci_mem_start);
if (rtlpriv->io.pci_mem_start != NULL) {
pci_iounmap(pdev, rtlpriv->io.pci_mem_start);
pci_release_regions(pdev);
}

4
drivers/staging/rtl8821ae/wifi.h
View File

@ -1086,8 +1086,8 @@ struct rtl_io {
struct device *dev;
/*PCI MEM map */
unsigned long pci_mem_end; /*shared mem end */
unsigned long pci_mem_start; /*shared mem start */
void __iomem *pci_mem_end; /*shared mem end */
void __iomem *pci_mem_start; /*shared mem start */
/*PCI IO map */
unsigned long pci_base_addr; /*device I/O address */