From: Jack Stone <jwjstone@fastmail.fm>
To: Bert Wesarg <bert.wesarg@googlemail.com>
Cc: linux-kernel@vger.kernel.org, jeff@garzik.org,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH 50/56] drivers/staging: Remove void casts
Date: Wed, 08 Apr 2009 14:59:10 +0100 [thread overview]
Message-ID: <49DCADAE.7050302@fastmail.fm> (raw)
In-Reply-To: <36ca99e90904080509q5c8a62e8t7a41302a0b2ac383@mail.gmail.com>
Fixed patch
Thanks,
Jack
--
drivers/staging: Remove void casts
From: Jack Stone <jwjstone@fastmail.fm>
Remove uneeded void casts
Signed-Off-By: Jack Stone <jwjstone@fastmail.fm>
---
drivers/staging/altpciechdma/altpciechdma.c | 4 ++--
drivers/staging/epl/EplApiLinuxKernel.c | 8 ++------
drivers/staging/et131x/et1310_rx.c | 4 ++--
drivers/staging/rtl8187se/r8180_core.c | 13 ++++++-------
drivers/staging/slicoss/slicoss.c | 3 +--
5 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/altpciechdma/altpciechdma.c
b/drivers/staging/altpciechdma/altpciechdma.c
index 5869e14..f613a1d 100644
--- a/drivers/staging/altpciechdma/altpciechdma.c
+++ b/drivers/staging/altpciechdma/altpciechdma.c
@@ -535,7 +535,7 @@ static int __devinit dma_test(struct ape_dev *ape,
struct pci_dev *dev)
/* allocate and map coherently-cached memory for a DMA-able buffer */
/* @see Documentation/PCI/PCI-DMA-mapping.txt, near line 318 */
- buffer_virt = (u8 *)pci_alloc_consistent(dev, PAGE_SIZE * 4,
&buffer_bus);
+ buffer_virt = pci_alloc_consistent(dev, PAGE_SIZE * 4, &buffer_bus);
if (!buffer_virt) {
printk(KERN_DEBUG "Could not allocate coherent DMA buffer.\n");
goto fail;
@@ -793,7 +793,7 @@ static int __devinit probe(struct pci_dev *dev,
const struct pci_device_id *id)
/* allocate and map coherently-cached memory for a descriptor table */
/* @see LDD3 page 446 */
- ape->table_virt = (struct ape_chdma_table *)pci_alloc_consistent(dev,
+ ape->table_virt = pci_alloc_consistent(dev,
APE_CHDMA_TABLE_SIZE, &ape->table_bus);
/* could not allocate table? */
if (!ape->table_virt) {
diff --git a/drivers/staging/epl/EplApiLinuxKernel.c
b/drivers/staging/epl/EplApiLinuxKernel.c
index cb3e275..4c5dfcd 100644
--- a/drivers/staging/epl/EplApiLinuxKernel.c
+++ b/drivers/staging/epl/EplApiLinuxKernel.c
@@ -655,9 +655,7 @@ static int EplLinIoctl(struct inode
*pDeviceFile_p, // information about the dev
goto Exit;
}
- pBufHeader =
- (tEplLinSdoBufHeader *)
- vmalloc(sizeof(tEplLinSdoBufHeader) +
+ pBufHeader = vmalloc(sizeof(tEplLinSdoBufHeader) +
SdoObject.m_uiSize);
if (pBufHeader == NULL) { // no memory available
iRet = -ENOMEM;
@@ -751,9 +749,7 @@ static int EplLinIoctl(struct inode
*pDeviceFile_p, // information about the dev
goto Exit;
}
- pBufHeader =
- (tEplLinSdoBufHeader *)
- vmalloc(sizeof(tEplLinSdoBufHeader) +
+ pBufHeader = vmalloc(sizeof(tEplLinSdoBufHeader) +
SdoObject.m_uiSize);
if (pBufHeader == NULL) { // no memory available
iRet = -ENOMEM;
diff --git a/drivers/staging/et131x/et1310_rx.c
b/drivers/staging/et131x/et1310_rx.c
index 8dc559a..a3810f5 100644
--- a/drivers/staging/et131x/et1310_rx.c
+++ b/drivers/staging/et131x/et1310_rx.c
@@ -610,8 +610,8 @@ int et131x_init_recv(struct et131x_adapter *adapter)
/* Setup each RFD */
for (RfdCount = 0; RfdCount < rx_ring->NumRfd; RfdCount++) {
- pMpRfd = (MP_RFD *) kmem_cache_alloc(rx_ring->RecvLookaside,
- GFP_ATOMIC | GFP_DMA);
+ pMpRfd = kmem_cache_alloc(rx_ring->RecvLookaside,
+ GFP_ATOMIC | GFP_DMA);
if (!pMpRfd) {
DBG_ERROR(et131x_dbginfo,
diff --git a/drivers/staging/rtl8187se/r8180_core.c
b/drivers/staging/rtl8187se/r8180_core.c
index 6ecd12d..4f35f6d 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -1691,7 +1691,7 @@ int alloc_tx_beacon_desc_ring(struct net_device
*dev, int count)
u32 *tmp;
struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
- priv->txbeaconring = (u32*)pci_alloc_consistent(priv->pdev,
+ priv->txbeaconring = pci_alloc_consistent(priv->pdev,
sizeof(u32)*8*count,
&priv->txbeaconringdma);
if (!priv->txbeaconring) return -1;
@@ -1727,8 +1727,7 @@ short alloc_tx_desc_ring(struct net_device *dev,
int bufsize, int count,
DMESGE ("TX buffer allocation too large");
return 0;
}
- desc = (u32*)pci_alloc_consistent(pdev,
- sizeof(u32)*8*count+256, &dma_desc);
+ desc = pci_alloc_consistent(pdev, sizeof(u32)*8*count+256, &dma_desc);
if(desc==NULL) return -1;
if(dma_desc & 0xff){
@@ -1751,7 +1750,7 @@ short alloc_tx_desc_ring(struct net_device *dev,
int bufsize, int count,
tmp=desc;
for (i=0;i<count;i++)
{
- buf = (void*)pci_alloc_consistent(pdev,bufsize,&dma_tmp);
+ buf = pci_alloc_consistent(pdev,bufsize,&dma_tmp);
if (buf == NULL) return -ENOMEM;
switch(addr) {
@@ -1975,8 +1974,8 @@ short alloc_rx_desc_ring(struct net_device *dev,
u16 bufsize, int count)
return -1;
}
- desc =
(u32*)pci_alloc_consistent(pdev,sizeof(u32)*rx_desc_size*count+256,
- &dma_desc);
+ desc = pci_alloc_consistent(pdev,sizeof(u32)*rx_desc_size*count+256,
+ &dma_desc);
if(dma_desc & 0xff){
@@ -2017,7 +2016,7 @@ short alloc_rx_desc_ring(struct net_device *dev,
u16 bufsize, int count)
for(j=0;j<bufsize;j++) ((u8*)buf)[i] = 0;
#endif
- //buf = (void*)pci_alloc_consistent(pdev,bufsize,&dma_tmp);
+ //buf = pci_alloc_consistent(pdev,bufsize,&dma_tmp);
if(-1 == buffer_add(&(priv->rxbuffer), buf,dma_tmp,
&(priv->rxbufferhead))){
DMESGE("Unable to allocate mem RX buf");
diff --git a/drivers/staging/slicoss/slicoss.c
b/drivers/staging/slicoss/slicoss.c
index 9481563..746034c 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -333,8 +333,7 @@ static void slic_init_adapter(struct net_device *netdev,
pslic_handle->next = adapter->pfree_slic_handles;
adapter->pfree_slic_handles = pslic_handle;
}
- adapter->pshmem = (struct slic_shmem *)
- pci_alloc_consistent(adapter->pcidev,
+ adapter->pshmem = pci_alloc_consistent(adapter->pcidev,
sizeof(struct slic_shmem),
&adapter->
phys_shmem);
next prev parent reply other threads:[~2009-04-08 13:59 UTC|newest]
Thread overview: 174+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-08 11:21 [PATCH 0/56] Remove void casts Jack Stone
2009-04-08 11:21 ` [PATCH 01/56] adfs: " Jack Stone
2009-04-08 11:21 ` [PATCH 02/56] alpha: " Jack Stone
2009-04-08 11:21 ` [PATCH 03/56] atm: " Jack Stone
2009-04-08 11:21 ` [PATCH 04/56] befs: " Jack Stone
2009-04-08 11:21 ` [PATCH 05/56] block: " Jack Stone
2009-04-08 11:21 ` [PATCH 06/56] cifs: " Jack Stone
2009-04-08 11:21 ` [PATCH 07/56] coda: " Jack Stone
2009-04-08 11:21 ` [PATCH 08/56] cris: " Jack Stone
2009-04-08 11:21 ` [PATCH 09/56] efs: " Jack Stone
2009-04-08 11:21 ` [PATCH 10/56] ext2: " Jack Stone
2009-04-08 11:21 ` [PATCH 11/56] freevxfs: " Jack Stone
2009-04-08 11:21 ` [PATCH 12/56] hpfs: " Jack Stone
2009-04-08 11:21 ` [PATCH 13/56] i2c: " Jack Stone
2009-04-08 11:21 ` [PATCH 14/56] ia64: " Jack Stone
2009-04-08 11:21 ` [PATCH 15/56] ide: " Jack Stone
2009-04-08 11:21 ` [PATCH 16/56] idle: " Jack Stone
2009-04-08 11:21 ` [PATCH 17/56] infiniband: " Jack Stone
2009-04-08 11:21 ` [PATCH 18/56] isdn: " Jack Stone
2009-04-08 11:21 ` [PATCH 19/56] kvm: " Jack Stone
2009-04-08 11:21 ` [PATCH 20/56] inflate: " Jack Stone
2009-04-08 11:21 ` [PATCH 21/56] md: " Jack Stone
2009-04-08 11:21 ` [PATCH 22/56] message/fusion: " Jack Stone
2009-04-08 11:21 ` [PATCH 23/56] minix: " Jack Stone
2009-04-08 11:21 ` [PATCH 24/56] mips: " Jack Stone
2009-04-08 11:21 ` [PATCH 25/56] mm: " Jack Stone
2009-04-08 11:21 ` [PATCH 26/56] ncpfs: " Jack Stone
2009-04-08 11:21 ` [PATCH 27/56] ipv4: " Jack Stone
2009-04-08 11:22 ` [PATCH 28/56] ipv6: " Jack Stone
2009-04-08 11:22 ` [PATCH 29/56] irda: " Jack Stone
2009-04-08 11:22 ` [PATCH 30/56] net: " Jack Stone
2009-04-08 11:22 ` [PATCH 31/56] sctp: " Jack Stone
2009-04-08 11:22 ` [PATCH 32/56] sunrpc: " Jack Stone
2009-04-08 11:22 ` [PATCH 33/56] tipc: " Jack Stone
2009-04-08 11:22 ` [PATCH 34/56] nfs: " Jack Stone
2009-04-08 11:22 ` [PATCH 35/56] ntfs: " Jack Stone
2009-04-08 11:22 ` [PATCH 36/56] ocfs2: " Jack Stone
2009-04-08 11:22 ` [PATCH 37/56] oss: " Jack Stone
2009-04-08 11:22 ` [PATCH 38/56] pci: " Jack Stone
2009-04-08 11:22 ` [PATCH 39/56] powerpc: " Jack Stone
2009-04-08 11:22 ` [PATCH 40/56] proc: " Jack Stone
2009-04-08 11:22 ` [PATCH 41/56] reiserfs: " Jack Stone
2009-04-08 11:22 ` [PATCH 42/56] drivers/s390: " Jack Stone
2009-04-08 11:22 ` [PATCH 43/56] s390: " Jack Stone
2009-04-08 11:22 ` [PATCH 44/56] scripts: " Jack Stone
2009-04-08 11:22 ` [PATCH 45/56] scsi: " Jack Stone
2009-04-08 11:22 ` [PATCH 46/56] serial: " Jack Stone
2009-04-08 11:22 ` [PATCH 47/56] sh: " Jack Stone
2009-04-08 11:22 ` [PATCH 48/56] smbfs: " Jack Stone
2009-04-08 11:22 ` [PATCH 49/56] sparc: " Jack Stone
2009-04-08 11:22 ` [PATCH 50/56] drivers/staging: " Jack Stone
2009-04-08 11:22 ` [PATCH 51/56] sysv: " Jack Stone
2009-04-08 11:22 ` [PATCH 52/56] ufs: " Jack Stone
2009-04-08 11:22 ` [PATCH 53/56] usb: " Jack Stone
2009-04-08 11:22 ` [PATCH 54/56] x86: " Jack Stone
2009-04-08 11:22 ` [PATCH 55/56] xen: " Jack Stone
2009-04-08 11:22 ` [PATCH 56/56] xfs: " Jack Stone
2009-04-08 12:15 ` Bert Wesarg
2009-04-08 14:01 ` Jack Stone
2009-04-09 10:39 ` Jack Stone
2009-04-09 17:37 ` Felix Blyakher
2009-04-13 9:32 ` Christoph Hellwig
2009-04-13 9:35 ` Jeff Garzik
2009-04-09 10:39 ` [PATCH 55/56] xen: " Jack Stone
2009-04-09 18:15 ` Jeremy Fitzhardinge
2009-04-08 12:18 ` [PATCH 54/56] x86: " Bert Wesarg
2009-04-08 14:03 ` Jack Stone
2009-04-08 14:06 ` Ingo Molnar
2009-04-08 14:14 ` Jack Stone
2009-04-08 14:40 ` Ingo Molnar
2009-04-08 14:46 ` Jack Stone
2009-04-08 14:48 ` Ingo Molnar
2009-04-08 14:53 ` Jack Stone
2009-04-08 14:57 ` Ingo Molnar
2009-04-08 14:59 ` Jack Stone
2009-04-08 15:05 ` Jack Stone
2009-04-08 15:06 ` Julia Lawall
2009-04-08 15:10 ` Matthew Wilcox
2009-04-08 15:12 ` Julia Lawall
2009-04-08 15:16 ` Ingo Molnar
2009-04-08 20:45 ` Jack Stone
2009-04-08 22:06 ` Joe Perches
2009-04-09 5:12 ` Ingo Molnar
2009-04-09 10:37 ` Jack Stone
2009-04-08 12:11 ` [PATCH 53/56] usb: " Bert Wesarg
2009-04-08 14:00 ` Jack Stone
2009-04-09 10:36 ` Jack Stone
2009-04-09 10:35 ` [PATCH 52/56] ufs: " Jack Stone
2009-04-08 12:02 ` [PATCH 51/56] sysv: " Bert Wesarg
2009-04-08 12:04 ` Bert Wesarg
2009-04-08 12:07 ` Jack Stone
2009-04-08 13:57 ` Jack Stone
2009-04-09 10:34 ` Jack Stone
2009-04-08 12:09 ` [PATCH 50/56] drivers/staging: " Bert Wesarg
2009-04-08 13:59 ` Jack Stone [this message]
2009-04-09 10:32 ` Jack Stone
2009-04-09 10:31 ` [PATCH 49/56] sparc: " Jack Stone
2009-04-08 11:58 ` [PATCH 45/56] scsi: " Bert Wesarg
2009-04-08 13:56 ` Jack Stone
2009-04-09 10:27 ` Jack Stone
2009-04-09 10:26 ` [PATCH 43/56] s390: " Jack Stone
2009-04-09 10:23 ` [PATCH 42/56] drivers/s390: " Jack Stone
2009-04-09 10:22 ` [PATCH 41/56] reiserfs: " Jack Stone
2009-04-09 10:20 ` [PATCH 39/56] powerpc: " Jack Stone
2009-04-09 10:19 ` [PATCH 38/56] pci: " Jack Stone
2009-04-09 10:18 ` [PATCH 37/56] oss: " Jack Stone
2009-04-08 12:19 ` [PATCH 36/56] ocfs2: " Bert Wesarg
2009-04-08 14:04 ` Jack Stone
2009-04-09 10:16 ` Jack Stone
2009-04-08 12:22 ` [PATCH 35/56] ntfs: " Bert Wesarg
2009-04-08 14:04 ` Jack Stone
2009-04-09 10:15 ` Jack Stone
2009-04-09 10:14 ` [PATCH 34/56] nfs: " Jack Stone
2009-04-09 10:13 ` [PATCH 33/56] tipc: " Jack Stone
2009-04-09 10:12 ` [PATCH 32/56] sunrpc: " Jack Stone
2009-04-09 10:11 ` [PATCH 31/56] sctp: " Jack Stone
2009-04-08 12:30 ` [PATCH 30/56] net: " Bert Wesarg
2009-04-08 14:05 ` Jack Stone
2009-04-09 10:10 ` Jack Stone
2009-04-08 12:31 ` [PATCH 29/56] irda: " Bert Wesarg
2009-04-08 14:06 ` Jack Stone
2009-04-09 10:09 ` Jack Stone
2009-04-09 10:08 ` [PATCH 28/56] ipv6: " Jack Stone
2009-04-09 10:08 ` [PATCH 27/56] ipv4: " Jack Stone
2009-04-09 10:07 ` [PATCH 26/56] ncpfs: " Jack Stone
2009-04-09 10:06 ` [PATCH 25/56] mm: " Jack Stone
2009-04-09 10:05 ` [PATCH 24/56] mips: " Jack Stone
2009-04-08 11:43 ` [PATCH 22/56] message/fusion: " Bert Wesarg
2009-04-08 13:55 ` Jack Stone
2009-04-09 10:03 ` [PATCH 21/56] md: " Jack Stone
2009-04-08 11:39 ` [PATCH 20/56] inflate: " Bert Wesarg
2009-04-08 13:54 ` Jack Stone
2009-04-08 14:05 ` Will Newton
2009-04-08 14:12 ` Jack Stone
2009-04-08 14:18 ` Will Newton
2009-04-08 14:19 ` walter harms
2009-04-08 14:27 ` Jack Stone
2009-04-09 10:00 ` [PATCH 19/56] kvm: " Jack Stone
2009-04-08 11:37 ` [PATCH 18/56] isdn: " Bert Wesarg
2009-04-08 13:53 ` Jack Stone
2009-04-09 9:58 ` Jack Stone
2009-04-08 17:48 ` [PATCH 17/56] infiniband: " Roland Dreier
2009-04-09 9:57 ` [PATCH 15/56] ide: " Jack Stone
2009-04-16 19:09 ` Bartlomiej Zolnierkiewicz
2009-04-09 9:56 ` [PATCH 14/56] ia64: " Jack Stone
2009-04-09 9:55 ` [PATCH 13/56] i2c: " Jack Stone
2009-04-09 12:43 ` Jean Delvare
2009-04-09 12:51 ` Alan Cox
2009-04-09 14:52 ` Jean Delvare
2009-04-09 9:54 ` [PATCH 12/56] hpfs: " Jack Stone
2009-04-09 9:53 ` [PATCH 11/56] freevxfs: " Jack Stone
2009-04-09 9:52 ` [PATCH 10/56] ext2: " Jack Stone
2009-04-08 12:34 ` [PATCH 08/56] cris: " Bert Wesarg
2009-04-08 13:36 ` Jesper Nilsson
2009-04-08 13:38 ` Jack Stone
2009-04-08 12:35 ` Jesper Nilsson
2009-04-08 13:36 ` Jack Stone
2009-04-09 9:49 ` Jack Stone
2009-04-09 9:47 ` Jack Stone
2009-04-09 9:45 ` [PATCH 07/56] coda: " Jack Stone
2009-04-08 11:26 ` [PATCH 06/56] cifs: " Bert Wesarg
2009-04-08 13:51 ` Jack Stone
2009-04-09 9:51 ` Jack Stone
2009-04-09 9:44 ` Jack Stone
2009-04-08 11:31 ` [PATCH 05/56] block: " Bert Wesarg
2009-04-08 11:38 ` Jack Stone
2009-04-08 11:48 ` Bert Wesarg
2009-04-09 21:08 ` Al Viro
2009-04-09 9:43 ` Jack Stone
2009-04-08 11:26 ` [PATCH 04/56] befs: " Bert Wesarg
2009-04-08 13:49 ` Jack Stone
2009-04-09 9:39 ` Jack Stone
2009-04-09 9:42 ` [PATCH 03/56] atm: " Jack Stone
2009-04-09 9:41 ` [PATCH 02/56] alpha: " Jack Stone
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49DCADAE.7050302@fastmail.fm \
--to=jwjstone@fastmail.fm \
--cc=bert.wesarg@googlemail.com \
--cc=jeff@garzik.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).