Re: [PATCH 1/2] net: ethernet: dlink: dl2k: fix code style
Such cleanups and tidies are not appropriate to be submitted at this time. Only bug fixes should be going into the tree right now.
[PATCH 1/2] net: ethernet: dlink: dl2k: fix code style
This commit fixed spacing errors and warnings. this output command git diff origin/master -w drivers/net/ethernet/dlink diff --git a/drivers/net/ethernet/dlink/dl2k.c b/drivers/net/ethernet/dlink/dl2k.c index f92b6d9..e635b1e 100644 --- a/drivers/net/ethernet/dlink/dl2k.c +++ b/drivers/net/ethernet/dlink/dl2k.c @@ -1892,4 +1892,3 @@ gcc -D__KERNEL__ -DMODULE -I/usr/src/linux/include -Wall -Wstrict-prototypes -O2 Read Documentation/networking/dl2k.txt for details. Signed-off-by: Maxim Zhukov--- drivers/net/ethernet/dlink/dl2k.c | 491 +++--- 1 file changed, 245 insertions(+), 246 deletions(-) diff --git a/drivers/net/ethernet/dlink/dl2k.c b/drivers/net/ethernet/dlink/dl2k.c index f92b6d9..d128306 100644 --- a/drivers/net/ethernet/dlink/dl2k.c +++ b/drivers/net/ethernet/dlink/dl2k.c @@ -30,16 +30,16 @@ static int mtu[MAX_UNITS]; static int vlan[MAX_UNITS]; static int jumbo[MAX_UNITS]; static char *media[MAX_UNITS]; -static int tx_flow=-1; -static int rx_flow=-1; +static int tx_flow = -1; +static int rx_flow = -1; static int copy_thresh; -static int rx_coalesce=10; /* Rx frame count each interrupt */ -static int rx_timeout=200; /* Rx DMA wait time in 640ns increments */ -static int tx_coalesce=16; /* HW xmit count each TxDMAComplete */ +static int rx_coalesce = 10; /* Rx frame count each interrupt */ +static int rx_timeout = 200; /* Rx DMA wait time in 640ns increments */ +static int tx_coalesce = 16; /* HW xmit count each TxDMAComplete */ -MODULE_AUTHOR ("Edward Peng"); -MODULE_DESCRIPTION ("D-Link DL2000-based Gigabit Ethernet Adapter"); +MODULE_AUTHOR("Edward Peng"); +MODULE_DESCRIPTION("D-Link DL2000-based Gigabit Ethernet Adapter"); MODULE_LICENSE("GPL"); module_param_array(mtu, int, NULL, 0); module_param_array(media, charp, NULL, 0); @@ -54,7 +54,7 @@ module_param(tx_coalesce, int, 0); /* HW xmit count each TxDMAComplete */ /* Enable the default interrupts */ -#define DEFAULT_INTR (RxDMAComplete | HostError | IntRequested | TxDMAComplete| \ +#define DEFAULT_INTR (RxDMAComplete | HostError | IntRequested | TxDMAComplete | \ UpdateStats | LinkEvent) static void dl2k_enable_int(struct netdev_private *np) @@ -67,32 +67,32 @@ static void dl2k_enable_int(struct netdev_private *np) static const int max_intrloop = 50; static const int multicast_filter_limit = 0x40; -static int rio_open (struct net_device *dev); -static void rio_timer (unsigned long data); -static void rio_tx_timeout (struct net_device *dev); -static netdev_tx_t start_xmit (struct sk_buff *skb, struct net_device *dev); -static irqreturn_t rio_interrupt (int irq, void *dev_instance); -static void rio_free_tx (struct net_device *dev, int irq); -static void tx_error (struct net_device *dev, int tx_status); -static int receive_packet (struct net_device *dev); -static void rio_error (struct net_device *dev, int int_status); -static int change_mtu (struct net_device *dev, int new_mtu); -static void set_multicast (struct net_device *dev); -static struct net_device_stats *get_stats (struct net_device *dev); -static int clear_stats (struct net_device *dev); -static int rio_ioctl (struct net_device *dev, struct ifreq *rq, int cmd); -static int rio_close (struct net_device *dev); -static int find_miiphy (struct net_device *dev); -static int parse_eeprom (struct net_device *dev); -static int read_eeprom (struct netdev_private *, int eep_addr); -static int mii_wait_link (struct net_device *dev, int wait); -static int mii_set_media (struct net_device *dev); -static int mii_get_media (struct net_device *dev); -static int mii_set_media_pcs (struct net_device *dev); -static int mii_get_media_pcs (struct net_device *dev); -static int mii_read (struct net_device *dev, int phy_addr, int reg_num); -static int mii_write (struct net_device *dev, int phy_addr, int reg_num, - u16 data); +static int rio_open(struct net_device *dev); +static void rio_timer(unsigned long data); +static void rio_tx_timeout(struct net_device *dev); +static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev); +static irqreturn_t rio_interrupt(int irq, void *dev_instance); +static void rio_free_tx(struct net_device *dev, int irq); +static void tx_error(struct net_device *dev, int tx_status); +static int receive_packet(struct net_device *dev); +static void rio_error(struct net_device *dev, int int_status); +static int change_mtu(struct net_device *dev, int new_mtu); +static void set_multicast(struct net_device *dev); +static struct net_device_stats *get_stats(struct net_device *dev); +static int clear_stats(struct net_device *dev); +static int rio_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); +static int rio_close(struct net_device *dev); +static int find_miiphy(struct net_device *dev); +static int parse_eeprom(struct net_device *dev); +static int read_eeprom(struct netdev_private *, int eep_addr); +static int
Re: [PATCH 1/2] net: ethernet: dlink: dl2k: fix code style
On Wed, 2016-03-23 at 17:36 +0300, Maxim Zhukov wrote: > This commit fixed spacing errors and warnings. This commit log should show that you've tested this by stating something like: "git diff -w shows no difference" and "objdiff shows no changes" If objdiff shows changes, you need to be show why it's OK.
[PATCH 1/2] net: ethernet: dlink: dl2k: fix code style
This commit fixed spacing errors and warnings. Signed-off-by: Maxim Zhukov--- drivers/net/ethernet/dlink/dl2k.c | 491 +++--- 1 file changed, 245 insertions(+), 246 deletions(-) diff --git a/drivers/net/ethernet/dlink/dl2k.c b/drivers/net/ethernet/dlink/dl2k.c index f92b6d9..d128306 100644 --- a/drivers/net/ethernet/dlink/dl2k.c +++ b/drivers/net/ethernet/dlink/dl2k.c @@ -30,16 +30,16 @@ static int mtu[MAX_UNITS]; static int vlan[MAX_UNITS]; static int jumbo[MAX_UNITS]; static char *media[MAX_UNITS]; -static int tx_flow=-1; -static int rx_flow=-1; +static int tx_flow = -1; +static int rx_flow = -1; static int copy_thresh; -static int rx_coalesce=10; /* Rx frame count each interrupt */ -static int rx_timeout=200; /* Rx DMA wait time in 640ns increments */ -static int tx_coalesce=16; /* HW xmit count each TxDMAComplete */ +static int rx_coalesce = 10; /* Rx frame count each interrupt */ +static int rx_timeout = 200; /* Rx DMA wait time in 640ns increments */ +static int tx_coalesce = 16; /* HW xmit count each TxDMAComplete */ -MODULE_AUTHOR ("Edward Peng"); -MODULE_DESCRIPTION ("D-Link DL2000-based Gigabit Ethernet Adapter"); +MODULE_AUTHOR("Edward Peng"); +MODULE_DESCRIPTION("D-Link DL2000-based Gigabit Ethernet Adapter"); MODULE_LICENSE("GPL"); module_param_array(mtu, int, NULL, 0); module_param_array(media, charp, NULL, 0); @@ -54,7 +54,7 @@ module_param(tx_coalesce, int, 0); /* HW xmit count each TxDMAComplete */ /* Enable the default interrupts */ -#define DEFAULT_INTR (RxDMAComplete | HostError | IntRequested | TxDMAComplete| \ +#define DEFAULT_INTR (RxDMAComplete | HostError | IntRequested | TxDMAComplete | \ UpdateStats | LinkEvent) static void dl2k_enable_int(struct netdev_private *np) @@ -67,32 +67,32 @@ static void dl2k_enable_int(struct netdev_private *np) static const int max_intrloop = 50; static const int multicast_filter_limit = 0x40; -static int rio_open (struct net_device *dev); -static void rio_timer (unsigned long data); -static void rio_tx_timeout (struct net_device *dev); -static netdev_tx_t start_xmit (struct sk_buff *skb, struct net_device *dev); -static irqreturn_t rio_interrupt (int irq, void *dev_instance); -static void rio_free_tx (struct net_device *dev, int irq); -static void tx_error (struct net_device *dev, int tx_status); -static int receive_packet (struct net_device *dev); -static void rio_error (struct net_device *dev, int int_status); -static int change_mtu (struct net_device *dev, int new_mtu); -static void set_multicast (struct net_device *dev); -static struct net_device_stats *get_stats (struct net_device *dev); -static int clear_stats (struct net_device *dev); -static int rio_ioctl (struct net_device *dev, struct ifreq *rq, int cmd); -static int rio_close (struct net_device *dev); -static int find_miiphy (struct net_device *dev); -static int parse_eeprom (struct net_device *dev); -static int read_eeprom (struct netdev_private *, int eep_addr); -static int mii_wait_link (struct net_device *dev, int wait); -static int mii_set_media (struct net_device *dev); -static int mii_get_media (struct net_device *dev); -static int mii_set_media_pcs (struct net_device *dev); -static int mii_get_media_pcs (struct net_device *dev); -static int mii_read (struct net_device *dev, int phy_addr, int reg_num); -static int mii_write (struct net_device *dev, int phy_addr, int reg_num, - u16 data); +static int rio_open(struct net_device *dev); +static void rio_timer(unsigned long data); +static void rio_tx_timeout(struct net_device *dev); +static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev); +static irqreturn_t rio_interrupt(int irq, void *dev_instance); +static void rio_free_tx(struct net_device *dev, int irq); +static void tx_error(struct net_device *dev, int tx_status); +static int receive_packet(struct net_device *dev); +static void rio_error(struct net_device *dev, int int_status); +static int change_mtu(struct net_device *dev, int new_mtu); +static void set_multicast(struct net_device *dev); +static struct net_device_stats *get_stats(struct net_device *dev); +static int clear_stats(struct net_device *dev); +static int rio_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); +static int rio_close(struct net_device *dev); +static int find_miiphy(struct net_device *dev); +static int parse_eeprom(struct net_device *dev); +static int read_eeprom(struct netdev_private *, int eep_addr); +static int mii_wait_link(struct net_device *dev, int wait); +static int mii_set_media(struct net_device *dev); +static int mii_get_media(struct net_device *dev); +static int mii_set_media_pcs(struct net_device *dev); +static int mii_get_media_pcs(struct net_device *dev); +static int mii_read(struct net_device *dev, int phy_addr, int reg_num); +static int mii_write(struct net_device *dev, int phy_addr, int reg_num, +u16 data);