Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 184123db authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] pc300too annotation fixes 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 68f50e52

drivers/net/wan/pc300too.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -101,8 +101,8 @@ typedef struct port_s { 
typedef struct card_s {

typedef struct card_s {

	int type;		/* RSV, X21, etc. */

	int type;		/* RSV, X21, etc. */

	int n_ports;		/* 1 or 2 ports */

	int n_ports;		/* 1 or 2 ports */

	u8* __iomem rambase;	/* buffer memory base (virtual) */

	u8 __iomem *rambase;	/* buffer memory base (virtual) */

	u8* __iomem scabase;	/* SCA memory base (virtual) */

	u8 __iomem *scabase;	/* SCA memory base (virtual) */

	plx9050 __iomem *plxbase; /* PLX registers memory base (virtual) */

	plx9050 __iomem *plxbase; /* PLX registers memory base (virtual) */

	u32 init_ctrl_value;	/* Saved value - 9050 bug workaround */

	u32 init_ctrl_value;	/* Saved value - 9050 bug workaround */

	u16 rx_ring_buffers;	/* number of buffers in a ring */

	u16 rx_ring_buffers;	/* number of buffers in a ring */
@@ -134,7 +134,7 @@ typedef struct card_s { 
static void pc300_set_iface(port_t *port)

static void pc300_set_iface(port_t *port)

{

{

	card_t *card = port->card;

	card_t *card = port->card;

	u32* init_ctrl = &card->plxbase->init_ctrl;

	u32 __iomem * init_ctrl = &card->plxbase->init_ctrl;

	u16 msci = get_msci(port);

	u16 msci = get_msci(port);

	u8 rxs = port->rxs & CLK_BRG_MASK;

	u8 rxs = port->rxs & CLK_BRG_MASK;

	u8 txs = port->txs & CLK_BRG_MASK;

	u8 txs = port->txs & CLK_BRG_MASK;
@@ -393,7 +393,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev, 




	/* PLX PCI 9050 workaround for local configuration register read bug */

	/* PLX PCI 9050 workaround for local configuration register read bug */

	pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, scaphys);

	pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, scaphys);

	card->init_ctrl_value = readl(&((plx9050*)card->scabase)->init_ctrl);

	card->init_ctrl_value = readl(&((plx9050 __iomem *)card->scabase)->init_ctrl);

	pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, plxphys);

	pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, plxphys);





	/* Reset PLX */

	/* Reset PLX */
@@ -519,10 +519,10 @@ static struct pci_device_id pc300_pci_tbl[] __devinitdata = { 








static struct pci_driver pc300_pci_driver = {

static struct pci_driver pc300_pci_driver = {

	name:           "PC300",

	.name =          "PC300",

	id_table:       pc300_pci_tbl,

	.id_table =      pc300_pci_tbl,

	probe:          pc300_pci_init_one,

	.probe =         pc300_pci_init_one,

	remove:         pc300_pci_remove_one,

	.remove =        pc300_pci_remove_one,

};

};