Commit ad5645d7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'pci200syn-cleanups' 



Peng Li says:

====================
net: pci200syn: clean up some code style issues

This patchset clean up some code style issues.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5938b227 6855d301

drivers/net/wan/pci200syn.c

+15 −36
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ 
static int pci_clock_freq = 33000000;

#define CLOCK_BASE pci_clock_freq



/*

 *      PLX PCI9052 local configuration and shared runtime registers.

/*      PLX PCI9052 local configuration and shared runtime registers.

 *      This structure can be used to access 9052 registers (memory mapped).

 */

typedef struct {
@@ -58,8 +57,6 @@ typedef struct { 
	u32 init_ctrl;		/* 50h : EEPROM ctrl, Init Ctrl, etc */

} plx9052;







typedef struct port_s {

	struct napi_struct napi;

	struct net_device *netdev;
@@ -76,8 +73,6 @@ typedef struct port_s { 
	u8 chan;		/* physical port # - 0 or 1 */

} port_t;







typedef struct card_s {

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

	u8 __iomem *scabase;	/* SCA memory base (virtual) */
@@ -90,13 +85,13 @@ typedef struct card_s { 
	port_t ports[2];

} card_t;





#define get_port(card, port)	     (&card->ports[port])

#define get_port(card, port)	     (&(card)->ports[port])

#define sca_flush(card)		     (sca_in(IER0, card))



static inline void new_memcpy_toio(char __iomem *dest, char *src, int length)

{

	int len;



	do {

		len = length > 256 ? 256 : length;

		memcpy_toio(dest, src, len);
@@ -112,7 +107,6 @@ static inline void new_memcpy_toio(char __iomem *dest, char *src, int length) 


#include "hd64572.c"





static void pci200_set_iface(port_t *port)

{

	card_t *card = port->card;
@@ -151,13 +145,11 @@ static void pci200_set_iface(port_t *port) 
	sca_set_port(port);

}







static int pci200_open(struct net_device *dev)

{

	port_t *port = dev_to_port(dev);



	int result = hdlc_open(dev);



	if (result)

		return result;
@@ -167,8 +159,6 @@ static int pci200_open(struct net_device *dev) 
	return 0;

}







static int pci200_close(struct net_device *dev)

{

	sca_close(dev);
@@ -177,8 +167,6 @@ static int pci200_close(struct net_device *dev) 
	return 0;

}







static int pci200_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

{

	const size_t size = sizeof(sync_serial_settings);
@@ -233,8 +221,6 @@ static int pci200_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
	}

}







static void pci200_pci_remove_one(struct pci_dev *pdev)

{

	int i;
@@ -292,7 +278,7 @@ static int pci200_pci_init_one(struct pci_dev *pdev, 
	}



	card = kzalloc(sizeof(card_t), GFP_KERNEL);

	if (card == NULL) {

	if (!card) {

		pci_release_regions(pdev);

		pci_disable_device(pdev);

		return -ENOBUFS;
@@ -323,9 +309,7 @@ static int pci200_pci_init_one(struct pci_dev *pdev, 
	ramphys = pci_resource_start(pdev, 3) & PCI_BASE_ADDRESS_MEM_MASK;

	card->rambase = pci_ioremap_bar(pdev, 3);



	if (card->plxbase == NULL ||

	    card->scabase == NULL ||

	    card->rambase == NULL) {

	if (!card->plxbase || !card->scabase || !card->rambase) {

		pr_err("ioremap() failed\n");

		pci200_pci_remove_one(pdev);

		return -EFAULT;
@@ -380,6 +364,7 @@ static int pci200_pci_init_one(struct pci_dev *pdev, 
		port_t *port = &card->ports[i];

		struct net_device *dev = port->netdev;

		hdlc_device *hdlc = dev_to_hdlc(dev);



		port->chan = i;



		spin_lock_init(&port->lock);
@@ -407,15 +392,12 @@ static int pci200_pci_init_one(struct pci_dev *pdev, 
	return 0;

}







static const struct pci_device_id pci200_pci_tbl[] = {

	{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX,

	  PCI_DEVICE_ID_PLX_PCI200SYN, 0, 0, 0 },

	{ 0, }

};





static struct pci_driver pci200_pci_driver = {

	.name		= "PCI200SYN",

	.id_table	= pci200_pci_tbl,
@@ -423,7 +405,6 @@ static struct pci_driver pci200_pci_driver = { 
	.remove		= pci200_pci_remove_one,

};





static int __init pci200_init_module(void)

{

	if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) {
@@ -433,8 +414,6 @@ static int __init pci200_init_module(void) 
	return pci_register_driver(&pci200_pci_driver);

}







static void __exit pci200_cleanup_module(void)

{

	pci_unregister_driver(&pci200_pci_driver);