aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wan/pc300too.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index 79b2d5454d6b..bc156b51678a 100644
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -101,8 +101,8 @@ typedef struct port_s {
101typedef struct card_s { 101typedef struct card_s {
102 int type; /* RSV, X21, etc. */ 102 int type; /* RSV, X21, etc. */
103 int n_ports; /* 1 or 2 ports */ 103 int n_ports; /* 1 or 2 ports */
104 u8* __iomem rambase; /* buffer memory base (virtual) */ 104 u8 __iomem *rambase; /* buffer memory base (virtual) */
105 u8* __iomem scabase; /* SCA memory base (virtual) */ 105 u8 __iomem *scabase; /* SCA memory base (virtual) */
106 plx9050 __iomem *plxbase; /* PLX registers memory base (virtual) */ 106 plx9050 __iomem *plxbase; /* PLX registers memory base (virtual) */
107 u32 init_ctrl_value; /* Saved value - 9050 bug workaround */ 107 u32 init_ctrl_value; /* Saved value - 9050 bug workaround */
108 u16 rx_ring_buffers; /* number of buffers in a ring */ 108 u16 rx_ring_buffers; /* number of buffers in a ring */
@@ -134,7 +134,7 @@ typedef struct card_s {
134static void pc300_set_iface(port_t *port) 134static void pc300_set_iface(port_t *port)
135{ 135{
136 card_t *card = port->card; 136 card_t *card = port->card;
137 u32* init_ctrl = &card->plxbase->init_ctrl; 137 u32 __iomem * init_ctrl = &card->plxbase->init_ctrl;
138 u16 msci = get_msci(port); 138 u16 msci = get_msci(port);
139 u8 rxs = port->rxs & CLK_BRG_MASK; 139 u8 rxs = port->rxs & CLK_BRG_MASK;
140 u8 txs = port->txs & CLK_BRG_MASK; 140 u8 txs = port->txs & CLK_BRG_MASK;
@@ -393,7 +393,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
393 393
394 /* PLX PCI 9050 workaround for local configuration register read bug */ 394 /* PLX PCI 9050 workaround for local configuration register read bug */
395 pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, scaphys); 395 pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, scaphys);
396 card->init_ctrl_value = readl(&((plx9050*)card->scabase)->init_ctrl); 396 card->init_ctrl_value = readl(&((plx9050 __iomem *)card->scabase)->init_ctrl);
397 pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, plxphys); 397 pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, plxphys);
398 398
399 /* Reset PLX */ 399 /* Reset PLX */
@@ -519,10 +519,10 @@ static struct pci_device_id pc300_pci_tbl[] __devinitdata = {
519 519
520 520
521static struct pci_driver pc300_pci_driver = { 521static struct pci_driver pc300_pci_driver = {
522 name: "PC300", 522 .name = "PC300",
523 id_table: pc300_pci_tbl, 523 .id_table = pc300_pci_tbl,
524 probe: pc300_pci_init_one, 524 .probe = pc300_pci_init_one,
525 remove: pc300_pci_remove_one, 525 .remove = pc300_pci_remove_one,
526}; 526};
527 527
528 528