Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst...

[~andy/linux] / drivers / staging / rtl8192e / r8180_93cx6.c

diff --git a/drivers/staging/rtl8192e/r8180_93cx6.c b/drivers/staging/rtl8192e/r8180_93cx6.c
index 262ed5fd086ad500233d0dfbab9934e0128ec834..c38dd176987d46186778ee6cd77eda7a8cbde24c 100644 (file)
--- a/drivers/staging/rtl8192e/r8180_93cx6.c
+++ b/drivers/staging/rtl8192e/r8180_93cx6.c
@@ -24,13 +24,12 @@ static void eprom_cs(struct net_device *dev, short bit)
 {
        if (bit)
                write_nic_byte(dev, EPROM_CMD,
-                              (1<<EPROM_CS_SHIFT) | \
+                              (1<<EPROM_CS_SHIFT) |
                               read_nic_byte(dev, EPROM_CMD)); //enable EPROM
        else
-               write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev, EPROM_CMD)\
+               write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev, EPROM_CMD)
                               &~(1<<EPROM_CS_SHIFT)); //disable EPROM
 
-       force_pci_posting(dev);
        udelay(EPROM_DELAY);
 }
 
@@ -39,11 +38,9 @@ static void eprom_ck_cycle(struct net_device *dev)
 {
        write_nic_byte(dev, EPROM_CMD,
                       (1<<EPROM_CK_SHIFT) | read_nic_byte(dev, EPROM_CMD));
-       force_pci_posting(dev);
        udelay(EPROM_DELAY);
        write_nic_byte(dev, EPROM_CMD,
                       read_nic_byte(dev, EPROM_CMD) & ~(1<<EPROM_CK_SHIFT));
-       force_pci_posting(dev);
        udelay(EPROM_DELAY);
 }
 
@@ -51,13 +48,12 @@ static void eprom_ck_cycle(struct net_device *dev)
 static void eprom_w(struct net_device *dev, short bit)
 {
        if (bit)
-               write_nic_byte(dev, EPROM_CMD, (1<<EPROM_W_SHIFT) | \
+               write_nic_byte(dev, EPROM_CMD, (1<<EPROM_W_SHIFT) |
                               read_nic_byte(dev, EPROM_CMD));
        else
-               write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev, EPROM_CMD)\
+               write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev, EPROM_CMD)
                               &~(1<<EPROM_W_SHIFT));
 
-       force_pci_posting(dev);
        udelay(EPROM_DELAY);
 }
 
@@ -99,7 +95,6 @@ u32 eprom_read(struct net_device *dev, u32 addr)
         //enable EPROM programming
        write_nic_byte(dev, EPROM_CMD,
                       (EPROM_CMD_PROGRAM<<EPROM_CMD_OPERATING_MODE_SHIFT));
-       force_pci_posting(dev);
        udelay(EPROM_DELAY);
 
        if (priv->epromtype == EPROM_93c56) {