From a8ae1d4fb99391722ca792bf886a4a75b7ed3944 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 18 Oct 2005 06:07:39 +0000 Subject: [PATCH] Drop useless cast on kmalloc return (backport from Linux 2.6). git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@3126 7894878c-1315-0410-8ee3-d5d059ff63e0 --- kernel/busses/i2c-amd8111.c | 2 +- kernel/busses/i2c-keywest.c | 2 +- kernel/busses/i2c-nforce2.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/kernel/busses/i2c-amd8111.c b/kernel/busses/i2c-amd8111.c index 20509254..a9014862 100644 --- a/kernel/busses/i2c-amd8111.c +++ b/kernel/busses/i2c-amd8111.c @@ -362,7 +362,7 @@ static int __devinit amd8111_probe(struct pci_dev *dev, const struct pci_device_ if (~pci_resource_flags(dev, 0) & IORESOURCE_IO) return -1; - if (!(smbus = (void*)kmalloc(sizeof(struct amd_smbus), GFP_KERNEL))) + if (!(smbus = kmalloc(sizeof(struct amd_smbus), GFP_KERNEL))) return -1; memset(smbus, 0, sizeof(struct amd_smbus)); diff --git a/kernel/busses/i2c-keywest.c b/kernel/busses/i2c-keywest.c index 56e1f2d4..02ee7245 100644 --- a/kernel/busses/i2c-keywest.c +++ b/kernel/busses/i2c-keywest.c @@ -462,7 +462,7 @@ create_iface(struct device_node* np) tsize = sizeof(struct keywest_iface) + (sizeof(struct keywest_chan) + 4) * nchan; - iface = (struct keywest_iface *) kmalloc(tsize, GFP_KERNEL); + iface = kmalloc(tsize, GFP_KERNEL); if (iface == NULL) { printk(KERN_ERR "i2c-keywest: can't allocate inteface !\n"); return -ENOMEM; diff --git a/kernel/busses/i2c-nforce2.c b/kernel/busses/i2c-nforce2.c index fccb79ff..fd4354b7 100644 --- a/kernel/busses/i2c-nforce2.c +++ b/kernel/busses/i2c-nforce2.c @@ -348,8 +348,7 @@ static int __devinit nforce2_probe(struct pci_dev *dev, const struct pci_device_ int res1, res2; /* we support 2 SMBus adapters */ - if (!(smbuses = (void *)kmalloc(2*sizeof(struct nforce2_smbus), - GFP_KERNEL))) + if (!(smbuses = kmalloc(2*sizeof(struct nforce2_smbus), GFP_KERNEL))) return -ENOMEM; memset (smbuses, 0, 2*sizeof(struct nforce2_smbus)); pci_set_drvdata(dev, smbuses);