diff options
author | Amarjargal Gundjalam <amarjargal.gundjalam@gmail.com> | 2015-10-25 07:48:54 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 14:43:31 +0900 |
commit | dfe459398f8098e819ba993782b2c63ef4c339cf (patch) | |
tree | dc4ca2423a8e5222723a38b5e57b43f2c618b586 | |
parent | 3c7b67f9065d0b83e8501318003551e63c6b48b4 (diff) | |
download | talos-obmc-linux-dfe459398f8098e819ba993782b2c63ef4c339cf.tar.gz talos-obmc-linux-dfe459398f8098e819ba993782b2c63ef4c339cf.zip |
staging: slicoss: Removes multiple blank lines
This patch fixes the checkpatch.pl check:
CHECK: Please don't use multiple blank lines
Signed-off-by: Amarjargal Gundjalam <amarjargal.gundjalam@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/slicoss/slic.h | 2 | ||||
-rw-r--r-- | drivers/staging/slicoss/slicoss.c | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/staging/slicoss/slic.h b/drivers/staging/slicoss/slic.h index 00b8af63e7ff..6ccd1d5394e9 100644 --- a/drivers/staging/slicoss/slic.h +++ b/drivers/staging/slicoss/slic.h @@ -166,7 +166,6 @@ struct slic_cmdqueue { #define SLIC_MAX_CARDS 32 #define SLIC_MAX_PORTS 4 /* Max # of ports per card */ - struct mcast_address { unsigned char address[6]; struct mcast_address *next; @@ -485,7 +484,6 @@ struct adapter { struct slicnet_stats slic_stats; }; - #define UPDATE_STATS(largestat, newstat, oldstat) \ { \ if ((newstat) < (oldstat)) \ diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index 36001762fe20..a226055ef264 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -54,7 +54,6 @@ * IS-NIC driver. */ - #define KLUDGE_FOR_4GB_BOUNDARY 1 #define DEBUG_MICROCODE 1 #define DBG 1 @@ -1149,7 +1148,6 @@ static u16 slic_eeprom_cksum(void *eeprom, unsigned len) if (len > 0) checksum += *(u8 *) wp; - while (checksum >> 16) checksum = (checksum & 0xFFFF) + ((checksum >> 16) & 0xFFFF); @@ -2131,7 +2129,6 @@ static void slic_interrupt_card_up(u32 isr, struct adapter *adapter, } } - static irqreturn_t slic_interrupt(int irq, void *dev_id) { struct net_device *dev = dev_id; @@ -2228,7 +2225,6 @@ xmit_fail: goto xmit_done; } - static void slic_adapter_freeresources(struct adapter *adapter) { slic_init_cleanup(adapter); @@ -3099,7 +3095,6 @@ static int slic_entry_probe(struct pci_dev *pcidev, mmio_start = pci_resource_start(pcidev, 0); mmio_len = pci_resource_len(pcidev, 0); - /* memmapped_ioaddr = (u32)ioremap_nocache(mmio_start, mmio_len);*/ memmapped_ioaddr = ioremap(mmio_start, mmio_len); if (!memmapped_ioaddr) { |