From 9677ca13855e30e46c73b161f7173fabc678d082 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 17 Oct 2005 23:12:36 +0200 Subject: [PATCH] --- yaml --- r: 10639 b: refs/heads/master c: 078d9fe4fe8dada13e37d2e2790b0ad780324097 h: refs/heads/master i: 10637: 54bd80b9d8b2a923aaec77a80f2d51b919683e4b 10635: a3f056cfbd77c4de190bf90f006c6bab3cfef6d2 10631: 4f1f5103535b6637cf2edaa5c89b0f5f5be5a3f4 10623: 1598fbfe52c4d8b0742a2361fccf7362720d1ba7 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-keywest.c | 2 +- trunk/drivers/i2c/busses/i2c-nforce2.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a91b15576c04..0e6a4049af63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5263ebb51eb098b01caf229498c954999117e4a7 +refs/heads/master: 078d9fe4fe8dada13e37d2e2790b0ad780324097 diff --git a/trunk/drivers/i2c/busses/i2c-keywest.c b/trunk/drivers/i2c/busses/i2c-keywest.c index ef281e0c567b..d61f748278fc 100644 --- a/trunk/drivers/i2c/busses/i2c-keywest.c +++ b/trunk/drivers/i2c/busses/i2c-keywest.c @@ -535,7 +535,7 @@ create_iface(struct device_node *np, struct device *dev) tsize = sizeof(struct keywest_iface) + (sizeof(struct keywest_chan) + 4) * nchan; - iface = (struct keywest_iface *) kzalloc(tsize, GFP_KERNEL); + iface = kzalloc(tsize, GFP_KERNEL); if (iface == NULL) { printk(KERN_ERR "i2c-keywest: can't allocate inteface !\n"); pmac_low_i2c_unlock(np); diff --git a/trunk/drivers/i2c/busses/i2c-nforce2.c b/trunk/drivers/i2c/busses/i2c-nforce2.c index 87b6e26aa8a0..9b4247610815 100644 --- a/trunk/drivers/i2c/busses/i2c-nforce2.c +++ b/trunk/drivers/i2c/busses/i2c-nforce2.c @@ -313,8 +313,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 *)kzalloc(2*sizeof(struct nforce2_smbus), - GFP_KERNEL))) + if (!(smbuses = kzalloc(2*sizeof(struct nforce2_smbus), GFP_KERNEL))) return -ENOMEM; pci_set_drvdata(dev, smbuses);