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

Merge branch 'wan-cleanups' 



Guangbin Huang says:

====================
net: wan: 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 0d56e5c1 a3f3e831

drivers/net/wan/c101.c

+11 −28
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 


#include "hd64570.h"





static const char *version = "Moxa C101 driver version: 1.15";

static const char *devname = "C101";
@@ -51,7 +50,6 @@ static const char* devname = "C101"; 


static char *hw;		/* pointer to hw=xxx command line string */





typedef struct card_s {

	struct net_device *dev;

	spinlock_t lock;	/* TX lock */
@@ -79,7 +77,6 @@ typedef card_t port_t; 
static card_t *first_card;

static card_t **new_card = &first_card;





#define sca_in(reg, card)	   readb((card)->win0base + C101_SCA + (reg))

#define sca_out(value, reg, card)  writeb(value, (card)->win0base + C101_SCA + (reg))

#define sca_inw(reg, card)	   readw((card)->win0base + C101_SCA + (reg))
@@ -99,7 +96,6 @@ static card_t **new_card = &first_card; 
#define get_port(card, port)	   (card)

static void sca_msci_intr(port_t *port);





static inline u8 sca_get_page(card_t *card)

{

	return card->page;
@@ -111,10 +107,8 @@ static inline void openwin(card_t *card, u8 page) 
	writeb(page, card->win0base + C101_PAGE);

}





#include "hd64570.c"





static inline void set_carrier(port_t *port)

{

	if (!(sca_in(MSCI1_OFFSET + ST3, port) & ST3_DCD))
@@ -123,7 +117,6 @@ static inline void set_carrier(port_t *port) 
		netif_carrier_off(port_to_dev(port));

}





static void sca_msci_intr(port_t *port)

{

	u8 stat = sca_in(MSCI0_OFFSET + ST1, port); /* read MSCI ST1 status */
@@ -145,7 +138,6 @@ static void sca_msci_intr(port_t *port) 
		set_carrier(port);

}





static void c101_set_iface(port_t *port)

{

	u8 rxs = port->rxs & CLK_BRG_MASK;
@@ -179,7 +171,6 @@ static void c101_set_iface(port_t *port) 
	sca_set_port(port);

}





static int c101_open(struct net_device *dev)

{

	port_t *port = dev_to_port(dev);
@@ -206,7 +197,6 @@ static int c101_open(struct net_device *dev) 
	return 0;

}





static int c101_close(struct net_device *dev)

{

	port_t *port = dev_to_port(dev);
@@ -218,7 +208,6 @@ static int c101_close(struct net_device *dev) 
	return 0;

}





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

{

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

}







static void c101_destroy_card(card_t *card)

{

	readb(card->win0base + C101_PAGE); /* Resets SCA? */
@@ -392,8 +379,6 @@ static int __init c101_run(unsigned long irq, unsigned long winbase) 
	return 0;

}







static int __init c101_init(void)

{

	if (hw == NULL) {
@@ -425,7 +410,6 @@ static int __init c101_init(void) 
	return first_card ? 0 : -EINVAL;

}





static void __exit c101_cleanup(void)

{

	card_t *card = first_card;
@@ -438,7 +422,6 @@ static void __exit c101_cleanup(void) 
	}

}





module_init(c101_init);

module_exit(c101_cleanup);

drivers/net/wan/fsl_ucc_hdlc.c

+1 −2
Original line number Diff line number Diff line
@@ -1171,9 +1171,8 @@ static int ucc_hdlc_probe(struct platform_device *pdev) 
	ut_info->uf_info.irq = irq_of_parse_and_map(np, 0);



	uhdlc_priv = kzalloc(sizeof(*uhdlc_priv), GFP_KERNEL);

	if (!uhdlc_priv) {

	if (!uhdlc_priv)

		return -ENOMEM;

	}



	dev_set_drvdata(&pdev->dev, uhdlc_priv);

	uhdlc_priv->dev = &pdev->dev;