[rtl818x] Remove broken mmio register support
authorStefan Hajnoczi <stefanha@gmail.com>
Fri, 22 Jan 2010 18:12:48 +0000 (18:12 +0000)
committerMarty Connor <mdc@etherboot.org>
Mon, 25 Jan 2010 22:04:39 +0000 (17:04 -0500)
The rtl818x driver uses programmed I/O but has a fallback to
memory-mapped I/O registers.  The fallback currently will not work since
the registers are accessed using inl()/outl() programmed I/O functions
in the driver.  This patch removes the fallback to we fail cleanly when
programmed I/O is not possible.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Joshua Oreman <oremanj@rwcr.net>
Signed-off-by: Marty Connor <mdc@etherboot.org>
src/drivers/net/rtl818x/rtl818x.c

index 167409d..7c7ca48 100644 (file)
@@ -680,9 +680,6 @@ static int rtl818x_probe(struct pci_device *pdev,
        dev->netdev->dev = &pdev->dev;
 
        priv->map = (struct rtl818x_csr *)pdev->ioaddr;
-       if (!priv->map)
-               priv->map = (struct rtl818x_csr *)pdev->membase;
-
        if (!priv->map) {
                DBG("rtl818x: cannot find device memory\n");
                err = -ENXIO;