From: Stefan Hajnoczi Date: Fri, 22 Jan 2010 18:12:48 +0000 (+0000) Subject: [rtl818x] Remove broken mmio register support X-Git-Tag: v1.0.0-rc1~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5835ed5746590960d99a6366b13347046fbade82;p=thirdparty%2Fipxe.git [rtl818x] Remove broken mmio register support 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 Signed-off-by: Joshua Oreman Signed-off-by: Marty Connor --- diff --git a/src/drivers/net/rtl818x/rtl818x.c b/src/drivers/net/rtl818x/rtl818x.c index 167409d8e..7c7ca488a 100644 --- a/src/drivers/net/rtl818x/rtl818x.c +++ b/src/drivers/net/rtl818x/rtl818x.c @@ -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;