Commit 8610cbc5 authored by Amarjargal Gundjalam's avatar Amarjargal Gundjalam Committed by Greg Kroah-Hartman

staging: slicoss: Removes unnecessary space after a cast

This patch fixes the checkpatch.pl check:

CHECK: No space is necessary after a cast
Signed-off-by: default avatarAmarjargal Gundjalam <amarjargal.gundjalam@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dfe45939
...@@ -168,7 +168,7 @@ static void slic_mcast_set_bit(struct adapter *adapter, char *address) ...@@ -168,7 +168,7 @@ static void slic_mcast_set_bit(struct adapter *adapter, char *address)
crcpoly &= 0x3F; crcpoly &= 0x3F;
/* OR in the new bit into our 64 bit mask. */ /* OR in the new bit into our 64 bit mask. */
adapter->mcastmask |= (u64) 1 << crcpoly; adapter->mcastmask |= (u64)1 << crcpoly;
} }
static void slic_mcast_set_mask(struct adapter *adapter) static void slic_mcast_set_mask(struct adapter *adapter)
...@@ -592,11 +592,11 @@ static void slic_mac_address_config(struct adapter *adapter) ...@@ -592,11 +592,11 @@ static void slic_mac_address_config(struct adapter *adapter)
u32 value2; u32 value2;
__iomem struct slic_regs *slic_regs = adapter->slic_regs; __iomem struct slic_regs *slic_regs = adapter->slic_regs;
value = ntohl(*(__be32 *) &adapter->currmacaddr[2]); value = ntohl(*(__be32 *)&adapter->currmacaddr[2]);
slic_reg32_write(&slic_regs->slic_wraddral, value, FLUSH); slic_reg32_write(&slic_regs->slic_wraddral, value, FLUSH);
slic_reg32_write(&slic_regs->slic_wraddrbl, value, FLUSH); slic_reg32_write(&slic_regs->slic_wraddrbl, value, FLUSH);
value2 = (u32) ((adapter->currmacaddr[0] << 8 | value2 = (u32)((adapter->currmacaddr[0] << 8 |
adapter->currmacaddr[1]) & 0xFFFF); adapter->currmacaddr[1]) & 0xFFFF);
slic_reg32_write(&slic_regs->slic_wraddrah, value2, FLUSH); slic_reg32_write(&slic_regs->slic_wraddrah, value2, FLUSH);
...@@ -970,7 +970,7 @@ static void slic_link_upr_complete(struct adapter *adapter, u32 isr) ...@@ -970,7 +970,7 @@ static void slic_link_upr_complete(struct adapter *adapter, u32 isr)
#else #else
slic_upr_queue_request(adapter, slic_upr_queue_request(adapter,
SLIC_UPR_RLSR, SLIC_UPR_RLSR,
(u32) &pshmem->linkstatus, (u32)&pshmem->linkstatus,
SLIC_GET_ADDR_HIGH(pshmem), 0, 0); SLIC_GET_ADDR_HIGH(pshmem), 0, 0);
#endif #endif
return; return;
...@@ -1040,7 +1040,7 @@ static void slic_upr_request_complete(struct adapter *adapter, u32 isr) ...@@ -1040,7 +1040,7 @@ static void slic_upr_request_complete(struct adapter *adapter, u32 isr)
case SLIC_UPR_STATS: case SLIC_UPR_STATS:
{ {
struct slic_stats *slicstats = struct slic_stats *slicstats =
(struct slic_stats *) &adapter->pshmem->inicstats; (struct slic_stats *)&adapter->pshmem->inicstats;
struct slic_stats *newstats = slicstats; struct slic_stats *newstats = slicstats;
struct slic_stats *old = &adapter->inicstats_prev; struct slic_stats *old = &adapter->inicstats_prev;
struct slicnet_stats *stst = &adapter->slic_stats; struct slicnet_stats *stst = &adapter->slic_stats;
...@@ -1146,7 +1146,7 @@ static u16 slic_eeprom_cksum(void *eeprom, unsigned len) ...@@ -1146,7 +1146,7 @@ static u16 slic_eeprom_cksum(void *eeprom, unsigned len)
} }
if (len > 0) if (len > 0)
checksum += *(u8 *) wp; checksum += *(u8 *)wp;
while (checksum >> 16) while (checksum >> 16)
checksum = (checksum & 0xFFFF) + ((checksum >> 16) & 0xFFFF); checksum = (checksum & 0xFFFF) + ((checksum >> 16) & 0xFFFF);
...@@ -1244,7 +1244,7 @@ static void slic_cmdqmem_free(struct adapter *adapter) ...@@ -1244,7 +1244,7 @@ static void slic_cmdqmem_free(struct adapter *adapter)
if (cmdqmem->pages[i]) { if (cmdqmem->pages[i]) {
pci_free_consistent(adapter->pcidev, pci_free_consistent(adapter->pcidev,
PAGE_SIZE, PAGE_SIZE,
(void *) cmdqmem->pages[i], (void *)cmdqmem->pages[i],
cmdqmem->dma_pages[i]); cmdqmem->dma_pages[i]);
} }
} }
...@@ -1324,8 +1324,8 @@ static void slic_cmdq_addcmdpage(struct adapter *adapter, u32 *page) ...@@ -1324,8 +1324,8 @@ static void slic_cmdq_addcmdpage(struct adapter *adapter, u32 *page)
adapter->pfree_slic_handles = pslic_handle->next; adapter->pfree_slic_handles = pslic_handle->next;
spin_unlock_irqrestore(&adapter->handle_lock, flags); spin_unlock_irqrestore(&adapter->handle_lock, flags);
pslic_handle->type = SLIC_HANDLE_CMD; pslic_handle->type = SLIC_HANDLE_CMD;
pslic_handle->address = (void *) cmd; pslic_handle->address = (void *)cmd;
pslic_handle->offset = (ushort) adapter->slic_handle_ix++; pslic_handle->offset = (ushort)adapter->slic_handle_ix++;
pslic_handle->other_handle = NULL; pslic_handle->other_handle = NULL;
pslic_handle->next = NULL; pslic_handle->next = NULL;
...@@ -1735,7 +1735,7 @@ static int slic_link_event_handler(struct adapter *adapter) ...@@ -1735,7 +1735,7 @@ static int slic_link_event_handler(struct adapter *adapter)
0, 0); 0, 0);
#else #else
status = slic_upr_request(adapter, SLIC_UPR_RLSR, status = slic_upr_request(adapter, SLIC_UPR_RLSR,
(u32) &pshmem->linkstatus, /* no 4GB wrap guaranteed */ (u32)&pshmem->linkstatus, /* no 4GB wrap guaranteed */
0, 0, 0); 0, 0, 0);
#endif #endif
return status; return status;
...@@ -1803,7 +1803,7 @@ static void slic_mcast_set_list(struct net_device *dev) ...@@ -1803,7 +1803,7 @@ static void slic_mcast_set_list(struct net_device *dev)
struct netdev_hw_addr *ha; struct netdev_hw_addr *ha;
netdev_for_each_mc_addr(ha, dev) { netdev_for_each_mc_addr(ha, dev) {
addresses = (char *) &ha->addr; addresses = (char *)&ha->addr;
status = slic_mcast_add_list(adapter, addresses); status = slic_mcast_add_list(adapter, addresses);
if (status != 0) if (status != 0)
break; break;
...@@ -1851,8 +1851,8 @@ static void slic_xmit_build_request(struct adapter *adapter, ...@@ -1851,8 +1851,8 @@ static void slic_xmit_build_request(struct adapter *adapter,
ihcmd->u.slic_buffers.bufs[0].paddrh = SLIC_GET_ADDR_HIGH(phys_addr); ihcmd->u.slic_buffers.bufs[0].paddrh = SLIC_GET_ADDR_HIGH(phys_addr);
ihcmd->u.slic_buffers.bufs[0].length = skb->len; ihcmd->u.slic_buffers.bufs[0].length = skb->len;
#if BITS_PER_LONG == 64 #if BITS_PER_LONG == 64
hcmd->cmdsize = (u32) ((((u64)&ihcmd->u.slic_buffers.bufs[1] - hcmd->cmdsize = (u32)((((u64)&ihcmd->u.slic_buffers.bufs[1] -
(u64) hcmd) + 31) >> 5); (u64)hcmd) + 31) >> 5);
#else #else
hcmd->cmdsize = (((u32)&ihcmd->u.slic_buffers.bufs[1] - hcmd->cmdsize = (((u32)&ihcmd->u.slic_buffers.bufs[1] -
(u32)hcmd) + 31) >> 5; (u32)hcmd) + 31) >> 5;
...@@ -2749,7 +2749,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter) ...@@ -2749,7 +2749,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
/* Oasis card */ /* Oasis card */
case SLIC_2GB_DEVICE_ID: case SLIC_2GB_DEVICE_ID:
/* extract EEPROM data and pointers to EEPROM data */ /* extract EEPROM data and pointers to EEPROM data */
pOeeprom = (struct oslic_eeprom *) peeprom; pOeeprom = (struct oslic_eeprom *)peeprom;
eecodesize = pOeeprom->EecodeSize; eecodesize = pOeeprom->EecodeSize;
dramsize = pOeeprom->DramSize; dramsize = pOeeprom->DramSize;
pmac = pOeeprom->MacInfo; pmac = pOeeprom->MacInfo;
...@@ -2782,7 +2782,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter) ...@@ -2782,7 +2782,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
(eecodesize >= MIN_EECODE_SIZE)) { (eecodesize >= MIN_EECODE_SIZE)) {
ee_chksum = ee_chksum =
*(u16 *) ((char *) peeprom + (eecodesize - 2)); *(u16 *)((char *)peeprom + (eecodesize - 2));
/* /*
calculate the EEPROM checksum calculate the EEPROM checksum
*/ */
...@@ -2945,11 +2945,11 @@ static u32 slic_card_locate(struct adapter *adapter) ...@@ -2945,11 +2945,11 @@ static u32 slic_card_locate(struct adapter *adapter)
} }
hostid_reg = hostid_reg =
(u16 __iomem *) (((u8 __iomem *) (adapter->slic_regs)) + (u16 __iomem *)(((u8 __iomem *)(adapter->slic_regs)) +
rdhostid_offset); rdhostid_offset);
/* read the 16 bit hostid from SRAM */ /* read the 16 bit hostid from SRAM */
card_hostid = (ushort) readw(hostid_reg); card_hostid = (ushort)readw(hostid_reg);
/* Initialize a new card structure if need be */ /* Initialize a new card structure if need be */
if (card_hostid == SLIC_HOSTID_DEFAULT) { if (card_hostid == SLIC_HOSTID_DEFAULT) {
...@@ -3130,7 +3130,7 @@ static int slic_entry_probe(struct pci_dev *pcidev, ...@@ -3130,7 +3130,7 @@ static int slic_entry_probe(struct pci_dev *pcidev,
slic_adapter_set_hwaddr(adapter); slic_adapter_set_hwaddr(adapter);
netdev->base_addr = (unsigned long) memmapped_ioaddr; netdev->base_addr = (unsigned long)memmapped_ioaddr;
netdev->irq = adapter->irq; netdev->irq = adapter->irq;
netdev->netdev_ops = &slic_netdev_ops; netdev->netdev_ops = &slic_netdev_ops;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment