Remove unnecessary kmalloc casts

PATCH Applied Joe Perches 6 participants 30 messages Jun 1, 2010 – Jun 2, 2010

Subsystems (21)

Networking Network drivers DRM drivers Media (V4L/DVB) +17 more subsystems

lore

Share & tools

lore

Joe Perches

author

2010-06-01 03:23 UTC #2 lore raw

PATCH 2/21 arch/powerpc: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 arch/powerpc/kernel/nvram_64.c |    3 +--
 arch/powerpc/kvm/book3s.c      |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

arch/powerpc/kernel/nvram_64.c +1 -2

index 9cf197f..99c6dab 100644
@@ -502,8 +502,7 @@ static int __init nvram_scan_partitions(void)
 			       "detected: 0-length partition\n");
 			goto out;
 		}
-		tmp_part = (struct nvram_partition *)
-			kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);
+		tmp_part = kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);
 		err = -ENOMEM;
 		if (!tmp_part) {
 			printk(KERN_ERR "nvram_scan_partitions: kmalloc failed\n");

arch/powerpc/kvm/book3s.c +2 -2

index b998abf..2a8b9b6 100644
@@ -1248,8 +1248,8 @@ struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
 
 	memset(vcpu_book3s, 0, sizeof(struct kvmppc_vcpu_book3s));
 
-	vcpu_book3s->shadow_vcpu = (struct kvmppc_book3s_shadow_vcpu *)
-		kzalloc(sizeof(*vcpu_book3s->shadow_vcpu), GFP_KERNEL);
+	vcpu_book3s->shadow_vcpu = kzalloc(sizeof(*vcpu_book3s->shadow_vcpu),
+					   GFP_KERNEL);
 	if (!vcpu_book3s->shadow_vcpu)
 		goto free_vcpu;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:23 UTC #6 lore raw

PATCH 5/21 drivers/gpu/drm: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 drivers/gpu/drm/drm_sman.c      |    4 +---
 drivers/gpu/drm/i915/i915_dma.c |    3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

drivers/gpu/drm/drm_sman.c +1 -3

index 463aed9..3466458 100644
@@ -59,9 +59,7 @@ drm_sman_init(struct drm_sman * sman, unsigned int num_managers,
 {
 	int ret = 0;
 
-	sman->mm = (struct drm_sman_mm *) kcalloc(num_managers,
-						  sizeof(*sman->mm),
-						  GFP_KERNEL);
+	sman->mm = kcalloc(num_managers, sizeof(*sman->mm), GFP_KERNEL);
 	if (!sman->mm) {
 		ret = -ENOMEM;
 		goto out;

drivers/gpu/drm/i915/i915_dma.c +1 -2

index 2a6b5de..f3d5d9f 100644
@@ -1821,8 +1821,7 @@ int i915_driver_open(struct drm_device *dev, struct drm_file *file_priv)
 	struct drm_i915_file_private *i915_file_priv;
 
 	DRM_DEBUG_DRIVER("\n");
-	i915_file_priv = (struct drm_i915_file_private *)
-	    kmalloc(sizeof(*i915_file_priv), GFP_KERNEL);
+	i915_file_priv = kmalloc(sizeof(*i915_file_priv), GFP_KERNEL);
 
 	if (!i915_file_priv)
 		return -ENOMEM;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:23 UTC #7 lore raw

PATCH 6/21 drivers/i2c/i2c-dev.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 drivers/i2c/i2c-dev.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

drivers/i2c/i2c-dev.c +1 -3

index e0694e4..b3fcb59 100644
@@ -219,9 +219,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
 	if (rdwr_arg.nmsgs > I2C_RDRW_IOCTL_MAX_MSGS)
 		return -EINVAL;
 
-	rdwr_pa = (struct i2c_msg *)
-		kmalloc(rdwr_arg.nmsgs * sizeof(struct i2c_msg),
-		GFP_KERNEL);
+	rdwr_pa = kmalloc(rdwr_arg.nmsgs * sizeof(struct i2c_msg), GFP_KERNEL);
 	if (!rdwr_pa)
 		return -ENOMEM;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:23 UTC #12 lore raw

PATCH 10/21 drivers/net/gianfar.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 drivers/net/gianfar.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

drivers/net/gianfar.c +4 -4

index 1830f31..ab54821 100644
@@ -681,8 +681,8 @@ static int gfar_of_init(struct of_device *ofdev, struct net_device **pdev)
 		priv->rx_queue[i] = NULL;
 
 	for (i = 0; i < priv->num_tx_queues; i++) {
-		priv->tx_queue[i] =  (struct gfar_priv_tx_q *)kzalloc(
-				sizeof (struct gfar_priv_tx_q), GFP_KERNEL);
+		priv->tx_queue[i] = kzalloc(sizeof(struct gfar_priv_tx_q),
+					    GFP_KERNEL);
 		if (!priv->tx_queue[i]) {
 			err = -ENOMEM;
 			goto tx_alloc_failed;

@@ -694,8 +694,8 @@ static int gfar_of_init(struct of_device *ofdev, struct net_device **pdev)
 	}
 
 	for (i = 0; i < priv->num_rx_queues; i++) {
-		priv->rx_queue[i] = (struct gfar_priv_rx_q *)kzalloc(
-					sizeof (struct gfar_priv_rx_q), GFP_KERNEL);
+		priv->rx_queue[i] = kzalloc(sizeof(struct gfar_priv_rx_q),
+					    GFP_KERNEL);
 		if (!priv->rx_queue[i]) {
 			err = -ENOMEM;
 			goto rx_alloc_failed;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:23 UTC #18 lore raw

PATCH 14/21 drivers/parisc/iosapic.c: Remove unnecessary kzalloc cast

In reply to Joe Perches

Convert kzalloc to kcalloc

Signed-off-by Joe Perches <[email protected]>

---
 drivers/parisc/iosapic.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/parisc/iosapic.c +2 -2

index c768367..3e6f56c 100644
@@ -891,8 +891,8 @@ void *iosapic_register(unsigned long hpa)
 	isi->isi_version = iosapic_rd_version(isi);
 	isi->isi_num_vectors = IOSAPIC_IRDT_MAX_ENTRY(isi->isi_version) + 1;
 
-	vip = isi->isi_vector = (struct vector_info *)
-		kzalloc(sizeof(struct vector_info) * isi->isi_num_vectors, GFP_KERNEL);
+	vip = isi->isi_vector = kcalloc(isi->isi_num_vectors,
+					sizeof(struct vector_info), GFP_KERNEL);
 	if (vip == NULL) {
 		kfree(isi);
 		return NULL;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:23 UTC #26 lore raw

PATCH 20/21 net/ipv6/mcast.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 net/ipv6/mcast.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

net/ipv6/mcast.c +1 -2

index 59f1881..7b5fb43 100644
@@ -1995,8 +1995,7 @@ static int sf_setstate(struct ifmcaddr6 *pmc)
 				    &psf->sf_addr))
 					break;
 			if (!dpsf) {
-				dpsf = (struct ip6_sf_list *)
-					kmalloc(sizeof(*dpsf), GFP_ATOMIC);
+				dpsf = kmalloc(sizeof(*dpsf), GFP_ATOMIC);
 				if (!dpsf)
 					continue;
 				*dpsf = *psf;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:23 UTC #28 lore raw

PATCH 21/21 net/sctp/protocol.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 net/sctp/protocol.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

net/sctp/protocol.c +1 -2

index 1827498..fef38be 100644
@@ -1216,8 +1216,7 @@ SCTP_STATIC __init int sctp_init(void)
 
 	/* Allocate and initialize the endpoint hash table.  */
 	sctp_ep_hashsize = 64;
-	sctp_ep_hashtable = (struct sctp_hashbucket *)
-		kmalloc(64 * sizeof(struct sctp_hashbucket), GFP_KERNEL);
+	sctp_ep_hashtable = kmalloc(64 * sizeof(struct sctp_hashbucket), GFP_KERNEL);
 	if (!sctp_ep_hashtable) {
 		printk(KERN_ERR "SCTP: Failed endpoint_hash alloc.\n");
 		status = -ENOMEM;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:23 UTC #0 lore raw

cover Remove unnecessary kmalloc casts

Joe Perches (21):
arch/cris: Remove unnecessary kmalloc casts
arch/powerpc: Remove unnecessary kmalloc casts arch/x86/kernel/tlb_uv.c: Remove unnecessary kmalloc casts drivers/block/cciss_scsi.c: Remove unnecessary kmalloc casts drivers/gpu/drm: Remove unnecessary kmalloc casts drivers/i2c/i2c-dev.c: Remove unnecessary kmalloc casts drivers/isdn/capi/capidrv.c: Remove unnecessary kmalloc casts drivers/media: Remove unnecesary kmalloc casts drivers/message/i2o/i20_config.c: Remove unnecessary kmalloc casts drivers/net/gianfar.c: Remove unnecessary kmalloc casts drivers/net/tulip/eeprom.c: Remove unnecessary kmalloc casts drivers/net/vxge/vxge-main.c: Remove unnecessary kmalloc casts drivers/net/wireless/ipw2x00/ipw2100.c: Remove unnecessary kmalloc casts drivers/parisc/iosapic.c: Remove unnecessary kzalloc cast drivers/s390: Remove unnecessary kmalloc casts drivers/serial/icom.c: Remove unnecessary kmalloc casts drivers/usb/storage/isd200.c: Remove unnecessary kmalloc casts fs/ufs/util.c: Remove unnecessary kmalloc casts net/ipv4/igmp.c: Remove unnecessary kmalloc casts net/ipv6/mcast.c: Remove unnecessary kmalloc casts net/sctp/protocol.c: Remove unnecessary kmalloc casts

 arch/cris/arch-v32/mm/intmem.c         |   13 +++++--------
 arch/powerpc/kernel/nvram_64.c         |    3 +--
 arch/powerpc/kvm/book3s.c              |    4 ++--
 arch/x86/kernel/tlb_uv.c               |   15 +++++++--------
 drivers/block/cciss_scsi.c             |    3 +--
 drivers/gpu/drm/drm_sman.c             |    4 +---
 drivers/gpu/drm/i915/i915_dma.c        |    3 +--
 drivers/i2c/i2c-dev.c                  |    4 +---
 drivers/isdn/capi/capidrv.c            |    3 +--
 drivers/media/dvb/siano/smscoreapi.c   |    4 +---
 drivers/media/video/w9968cf.c          |    3 +--
 drivers/message/i2o/i2o_config.c       |    3 +--
 drivers/net/gianfar.c                  |    8 ++++----
 drivers/net/tulip/eeprom.c             |   10 +++++-----
 drivers/net/vxge/vxge-main.c           |    4 +---
 drivers/net/wireless/ipw2x00/ipw2100.c |   18 +++++++-----------
 drivers/parisc/iosapic.c               |    4 ++--
 drivers/s390/block/dasd_devmap.c       |    3 +--
 drivers/s390/char/con3215.c            |    4 ++--
 drivers/serial/icom.c                  |    3 +--
 drivers/usb/storage/isd200.c           |    3 +--
 fs/ufs/util.c                          |    3 +--
 net/ipv4/igmp.c                        |    3 +--
 net/ipv6/mcast.c                       |    3 +--
 net/sctp/protocol.c                    |    3 +--
 25 files changed, 51 insertions(+), 80 deletions(-)

Joe Perches

author

2010-06-01 03:23 UTC #1 lore raw

PATCH 1/21 arch/cris: Remove unnecessary kmalloc casts

And separate declaration from allocation
Still no error checking on failure, but it probably doesn't matter.

Signed-off-by Joe Perches <[email protected]>

---
 arch/cris/arch-v32/mm/intmem.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

arch/cris/arch-v32/mm/intmem.c +5 -8

index 9e8b69c..1b17d92 100644
@@ -33,8 +33,8 @@ static void crisv32_intmem_init(void)
 {
 	static int initiated = 0;
 	if (!initiated) {
-		struct intmem_allocation* alloc =
-		  (struct intmem_allocation*)kmalloc(sizeof *alloc, GFP_KERNEL);
+		struct intmem_allocation* alloc;
+		alloc = kmalloc(sizeof *alloc, GFP_KERNEL);
 		INIT_LIST_HEAD(&intmem_allocations);
 		intmem_virtual = ioremap(MEM_INTMEM_START + RESERVED_SIZE,
 					 MEM_INTMEM_SIZE - RESERVED_SIZE);

@@ -62,9 +62,8 @@ void* crisv32_intmem_alloc(unsigned size, unsigned align)
 		if (allocation->status == STATUS_FREE &&
 		    allocation->size >= size + alignment) {
 			if (allocation->size > size + alignment) {
-				struct intmem_allocation* alloc =
-					(struct intmem_allocation*)
-					kmalloc(sizeof *alloc, GFP_ATOMIC);
+				struct intmem_allocation* alloc;
+				alloc = kmalloc(sizeof *alloc, GFP_ATOMIC);
 				alloc->status = STATUS_FREE;
 				alloc->size = allocation->size - size -
 					alignment;

@@ -74,9 +73,7 @@ void* crisv32_intmem_alloc(unsigned size, unsigned align)
 
 				if (alignment) {
 					struct intmem_allocation *tmp;
-					tmp = (struct intmem_allocation *)
-						kmalloc(sizeof *tmp,
-							GFP_ATOMIC);
+					tmp = kmalloc(sizeof *tmp, GFP_ATOMIC);
 					tmp->offset = allocation->offset;
 					tmp->size = alignment;
 					tmp->status = STATUS_FREE;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:23 UTC #10 lore raw

PATCH 8/21 drivers/media: Remove unnecesary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 drivers/media/dvb/siano/smscoreapi.c |    4 +---
 drivers/media/video/w9968cf.c        |    3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

drivers/media/dvb/siano/smscoreapi.c +1 -3

index 0c87a3c..828bcc2 100644
@@ -116,9 +116,7 @@ static struct smscore_registry_entry_t *smscore_find_registry(char *devpath)
 			return entry;
 		}
 	}
-	entry = (struct smscore_registry_entry_t *)
-			kmalloc(sizeof(struct smscore_registry_entry_t),
-				GFP_KERNEL);
+	entry = kmalloc(sizeof(struct smscore_registry_entry_t), GFP_KERNEL);
 	if (entry) {
 		entry->mode = default_mode;
 		strcpy(entry->devpath, devpath);

drivers/media/video/w9968cf.c +1 -2

index d807eea..591fc6d 100644
@@ -3429,8 +3429,7 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
 	else
 		return -ENODEV;
 
-	cam = (struct w9968cf_device*)
-		  kzalloc(sizeof(struct w9968cf_device), GFP_KERNEL);
+	cam = kzalloc(sizeof(struct w9968cf_device), GFP_KERNEL);
 	if (!cam)
 		return -ENOMEM;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:23 UTC #14 lore raw

PATCH 11/21 drivers/net/tulip/eeprom.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 drivers/net/tulip/eeprom.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

drivers/net/tulip/eeprom.c +5 -5

index 6002e65..3031ed9 100644
@@ -120,8 +120,8 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp)
 			  0x00, 0x06  /* ttm bit map */
 			};
 
-		tp->mtable = (struct mediatable *)
-			kmalloc(sizeof(struct mediatable) + sizeof(struct medialeaf), GFP_KERNEL);
+		tp->mtable = kmalloc(sizeof(struct mediatable) +
+				     sizeof(struct medialeaf), GFP_KERNEL);
 
 		if (tp->mtable == NULL)
 			return; /* Horrible, impossible failure. */

@@ -227,9 +227,9 @@ subsequent_board:
 		        return;
 		}
 
-		mtable = (struct mediatable *)
-			kmalloc(sizeof(struct mediatable) + count*sizeof(struct medialeaf),
-					GFP_KERNEL);
+		mtable = kmalloc(sizeof(struct mediatable) +
+				 count * sizeof(struct medialeaf),
+				 GFP_KERNEL);
 		if (mtable == NULL)
 			return;				/* Horrible, impossible failure. */
 		last_mediatable = tp->mtable = mtable;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:23 UTC #17 lore raw

PATCH 13/21 drivers/net/wireless/ipw2x00/ipw2100.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 drivers/net/wireless/ipw2x00/ipw2100.c |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

drivers/net/wireless/ipw2x00/ipw2100.c +7 ~~-11~~

index 0bd4dfa..18ebd60 100644
@@ -3467,10 +3467,8 @@ static int ipw2100_msg_allocate(struct ipw2100_priv *priv)
 	dma_addr_t p;
 
 	priv->msg_buffers =
-	    (struct ipw2100_tx_packet *)kmalloc(IPW_COMMAND_POOL_SIZE *
-						sizeof(struct
-						       ipw2100_tx_packet),
-						GFP_KERNEL);
+	    kmalloc(IPW_COMMAND_POOL_SIZE * sizeof(struct ipw2100_tx_packet),
+		    GFP_KERNEL);
 	if (!priv->msg_buffers) {
 		printk(KERN_ERR DRV_NAME ": %s: PCI alloc failed for msg "
 		       "buffers.\n", priv->net_dev->name);

@@ -4499,10 +4497,8 @@ static int ipw2100_tx_allocate(struct ipw2100_priv *priv)
 	}
 
 	priv->tx_buffers =
-	    (struct ipw2100_tx_packet *)kmalloc(TX_PENDED_QUEUE_LENGTH *
-						sizeof(struct
-						       ipw2100_tx_packet),
-						GFP_ATOMIC);
+	    kmalloc(TX_PENDED_QUEUE_LENGTH * sizeof(struct ipw2100_tx_packet),
+		    GFP_ATOMIC);
 	if (!priv->tx_buffers) {
 		printk(KERN_ERR DRV_NAME
 		       ": %s: alloc failed form tx buffers.\n",

@@ -4651,9 +4647,9 @@ static int ipw2100_rx_allocate(struct ipw2100_priv *priv)
 	/*
 	 * allocate packets
 	 */
-	priv->rx_buffers = (struct ipw2100_rx_packet *)
-	    kmalloc(RX_QUEUE_LENGTH * sizeof(struct ipw2100_rx_packet),
-		    GFP_KERNEL);
+	priv->rx_buffers = kmalloc(RX_QUEUE_LENGTH *
+				   sizeof(struct ipw2100_rx_packet),
+				   GFP_KERNEL);
 	if (!priv->rx_buffers) {
 		IPW_DEBUG_INFO("can't allocate rx packet buffer table\n");

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:23 UTC #24 lore raw

PATCH 19/21 net/ipv4/igmp.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 net/ipv4/igmp.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

net/ipv4/igmp.c +1 -2

index 5fff865..250cb5e 100644
@@ -1646,8 +1646,7 @@ static int sf_setstate(struct ip_mc_list *pmc)
 				if (dpsf->sf_inaddr == psf->sf_inaddr)
 					break;
 			if (!dpsf) {
-				dpsf = (struct ip_sf_list *)
-					kmalloc(sizeof(*dpsf), GFP_ATOMIC);
+				dpsf = kmalloc(sizeof(*dpsf), GFP_ATOMIC);
 				if (!dpsf)
 					continue;
 				*dpsf = *psf;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:23 UTC #22 lore raw

PATCH 17/21 drivers/usb/storage/isd200.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 drivers/usb/storage/isd200.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

drivers/usb/storage/isd200.c +1 -2

index e9cbc14..6b9982c 100644
@@ -1456,8 +1456,7 @@ static int isd200_init_info(struct us_data *us)
 	int retStatus = ISD200_GOOD;
 	struct isd200_info *info;
 
-	info = (struct isd200_info *)
-			kzalloc(sizeof(struct isd200_info), GFP_KERNEL);
+	info = kzalloc(sizeof(struct isd200_info), GFP_KERNEL);
 	if (!info)
 		retStatus = ISD200_ERROR;
 	else {

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:24 UTC #23 lore raw

PATCH 18/21 fs/ufs/util.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 fs/ufs/util.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

fs/ufs/util.c +1 -2

index 85a7fc9..9c44f32 100644
@@ -26,8 +26,7 @@ struct ufs_buffer_head * _ubh_bread_ (struct ufs_sb_private_info * uspi,
 	count = size >> uspi->s_fshift;
 	if (count > UFS_MAXFRAG)
 		return NULL;
-	ubh = (struct ufs_buffer_head *)
-		kmalloc (sizeof (struct ufs_buffer_head), GFP_KERNEL);
+	ubh = kmalloc(sizeof(struct ufs_buffer_head), GFP_KERNEL);
 	if (!ubh)
 		return NULL;
 	ubh->fragment = fragment;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:24 UTC #21 lore raw

PATCH 16/21 drivers/serial/icom.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 drivers/serial/icom.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

drivers/serial/icom.c +1 -2

index 53a4682..105e25c 100644
@@ -1416,8 +1416,7 @@ static int __devinit icom_alloc_adapter(struct icom_adapter
 	struct icom_adapter *cur_adapter_entry;
 	struct list_head *tmp;
 
-	icom_adapter = (struct icom_adapter *)
-	    kzalloc(sizeof(struct icom_adapter), GFP_KERNEL);
+	icom_adapter = kzalloc(sizeof(struct icom_adapter), GFP_KERNEL);
 
 	if (!icom_adapter) {
 		return -ENOMEM;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:25 UTC #20 lore raw

PATCH 15/21 drivers/s390: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 drivers/s390/block/dasd_devmap.c |    3 +--
 drivers/s390/char/con3215.c      |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

drivers/s390/block/dasd_devmap.c +1 -2

index 34d51dd..8c962dc 100644
@@ -409,8 +409,7 @@ dasd_add_busid(const char *bus_id, int features)
 	struct dasd_devmap *devmap, *new, *tmp;
 	int hash;
 
-	new = (struct dasd_devmap *)
-		kzalloc(sizeof(struct dasd_devmap), GFP_KERNEL);
+	new = kzalloc(sizeof(struct dasd_devmap), GFP_KERNEL);
 	if (!new)
 		return ERR_PTR(-ENOMEM);
 	spin_lock(&dasd_devmap_lock);

drivers/s390/char/con3215.c +2 -2

index 59ec073..6752c42 100644
@@ -888,8 +888,8 @@ static int __init con3215_init(void)
 	if (IS_ERR(cdev))
 		return -ENODEV;
 
-	raw3215[0] = raw = (struct raw3215_info *)
-		kzalloc(sizeof(struct raw3215_info), GFP_KERNEL | GFP_DMA);
+	raw3215[0] = raw = kzalloc(sizeof(struct raw3215_info),
+				   GFP_KERNEL | GFP_DMA);
 	raw->buffer = kzalloc(RAW3215_BUFFER_SIZE, GFP_KERNEL | GFP_DMA);
 	raw->inbuf = kzalloc(RAW3215_INBUF_SIZE, GFP_KERNEL | GFP_DMA);
 	raw->cdev = cdev;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:26 UTC #16 lore raw

PATCH 12/21 drivers/net/vxge/vxge-main.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 drivers/net/vxge/vxge-main.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

drivers/net/vxge/vxge-main.c +1 -3

index b504bd5..3c43430 100644
@@ -4350,9 +4350,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
 
 	/* Copy the station mac address to the list */
 	for (i = 0; i < vdev->no_of_vpath; i++) {
-		entry =	(struct vxge_mac_addrs *)
-				kzalloc(sizeof(struct vxge_mac_addrs),
-					GFP_KERNEL);
+		entry =	kzalloc(sizeof(struct vxge_mac_addrs), GFP_KERNEL);
 		if (NULL == entry) {
 			vxge_debug_init(VXGE_ERR,
 				"%s: mac_addr_list : memory allocation failed",

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:26 UTC #11 lore raw

PATCH 9/21 drivers/message/i2o/i20_config.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 drivers/message/i2o/i2o_config.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

drivers/message/i2o/i2o_config.c +1 -2

index c4b117f..3be46c5 100644
@@ -1041,8 +1041,7 @@ static long i2o_cfg_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
 
 static int cfg_open(struct inode *inode, struct file *file)
 {
-	struct i2o_cfg_info *tmp =
-	    (struct i2o_cfg_info *)kmalloc(sizeof(struct i2o_cfg_info),
+	struct i2o_cfg_info *tmp = kmalloc(sizeof(struct i2o_cfg_info),
 					   GFP_KERNEL);
 	unsigned long flags;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:27 UTC #9 lore raw

PATCH 7/21 drivers/isdn/capi/capidrv.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 drivers/isdn/capi/capidrv.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

drivers/isdn/capi/capidrv.c +1 -2

index bf55ed5..02e0182 100644
@@ -469,8 +469,7 @@ static int capidrv_add_ack(struct capidrv_ncci *nccip,
 {
 	struct ncci_datahandle_queue *n, **pp;
 
-	n = (struct ncci_datahandle_queue *)
-		kmalloc(sizeof(struct ncci_datahandle_queue), GFP_ATOMIC);
+	n = kmalloc(sizeof(struct ncci_datahandle_queue), GFP_ATOMIC);
 	if (!n) {
 	   printk(KERN_ERR "capidrv: kmalloc ncci_datahandle failed\n");
 	   return -1;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:27 UTC #4 lore raw

PATCH 4/21 drivers/block/cciss_scsi.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 drivers/block/cciss_scsi.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

drivers/block/cciss_scsi.c +1 -2

index e1d0e2c..ffd8470 100644
@@ -702,8 +702,7 @@ cciss_scsi_setup(int cntl_num)
 	struct cciss_scsi_adapter_data_t * shba;
 
 	ccissscsi[cntl_num].ndevices = 0;
-	shba = (struct cciss_scsi_adapter_data_t *)
-		kmalloc(sizeof(*shba), GFP_KERNEL);	
+	shba = kmalloc(sizeof(*shba), GFP_KERNEL);
 	if (shba == NULL)
 		return;
 	shba->scsi_host = NULL;

Signature · 1 line

1.7.0.3.311.g6a6955

Joe Perches

author

2010-06-01 03:27 UTC #3 lore raw

PATCH 3/21 arch/x86/kernel/tlb_uv.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

And convert a kmalloc/memset to kzalloc

Signed-off-by Joe Perches <[email protected]>

---
 arch/x86/kernel/tlb_uv.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

arch/x86/kernel/tlb_uv.c +7 -8

index 7fea555..4c0a5e8 100644
@@ -1141,8 +1141,9 @@ uv_activation_descriptor_init(int node, int pnode)
 	 * each bau_desc is 64 bytes; there are 8 (UV_ITEMS_PER_DESCRIPTOR)
 	 * per cpu; and up to 32 (UV_ADP_SIZE) cpu's per uvhub
 	 */
-	bau_desc = (struct bau_desc *)kmalloc_node(sizeof(struct bau_desc)*
-		UV_ADP_SIZE*UV_ITEMS_PER_DESCRIPTOR, GFP_KERNEL, node);
+	bau_desc = kmalloc_node(sizeof(struct bau_desc) *
+				UV_ADP_SIZE * UV_ITEMS_PER_DESCRIPTOR,
+				GFP_KERNEL, node);
 	BUG_ON(!bau_desc);
 
 	pa = uv_gpa(bau_desc); /* need the real nasid*/

@@ -1200,9 +1201,9 @@ uv_payload_queue_init(int node, int pnode)
 	struct bau_payload_queue_entry *pqp_malloc;
 	struct bau_control *bcp;
 
-	pqp = (struct bau_payload_queue_entry *) kmalloc_node(
-		(DEST_Q_SIZE + 1) * sizeof(struct bau_payload_queue_entry),
-		GFP_KERNEL, node);
+	pqp = kmalloc_node((DEST_Q_SIZE + 1) *
+			   sizeof(struct bau_payload_queue_entry),
+			   GFP_KERNEL, node);
 	BUG_ON(!pqp);
 	pqp_malloc = pqp;

@@ -1286,9 +1287,7 @@ static void uv_init_per_cpu(int nuvhubs)
 	};
 	struct uvhub_desc *uvhub_descs;
 
-	uvhub_descs = (struct uvhub_desc *)
-		kmalloc(nuvhubs * sizeof(struct uvhub_desc), GFP_KERNEL);
-	memset(uvhub_descs, 0, nuvhubs * sizeof(struct uvhub_desc));
+	uvhub_descs = kzalloc(nuvhubs * sizeof(struct uvhub_desc), GFP_KERNEL);
 	for_each_present_cpu(cpu) {
 		bcp = &per_cpu(bau_control, cpu);
 		memset(bcp, 0, sizeof(struct bau_control));

Signature · 1 line

1.7.0.3.311.g6a6955

David Miller

maintainer Applied

2010-06-01 07:17 UTC #25 lore raw

Re: [PATCH 19/21] net/ipv4/igmp.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

From: Joe Perches <[email protected]>
Date: Mon, 31 May 2010 20:23:21 -0700

Quoted 1 line

Signed-off-by Joe Perches <[email protected]>

Applied.

David Miller

maintainer Applied

2010-06-01 07:17 UTC #27 lore raw

Re: [PATCH 20/21] net/ipv6/mcast.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

From: Joe Perches <[email protected]>
Date: Mon, 31 May 2010 20:23:22 -0700

Quoted 1 line

Signed-off-by Joe Perches <[email protected]>

Applied.

David Miller

maintainer Applied

2010-06-01 07:17 UTC #13 lore raw

Re: [PATCH 10/21] drivers/net/gianfar.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

From: Joe Perches <[email protected]>
Date: Mon, 31 May 2010 20:23:12 -0700

Quoted 1 line

Signed-off-by Joe Perches <[email protected]>

Applied.

David Miller

maintainer Applied

2010-06-01 07:17 UTC #15 lore raw

Re: [PATCH 11/21] drivers/net/tulip/eeprom.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

From: Joe Perches <[email protected]>
Date: Mon, 31 May 2010 20:23:13 -0700

Quoted 1 line

Signed-off-by Joe Perches <[email protected]>

Applied.

Jean Delvare

Applied

2010-06-01 10:57 UTC #8 lore raw

Re: [PATCH 06/21] drivers/i2c/i2c-dev.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Hi Joe,

Quoted 10 lines · Joe Perches

Signed-off-by Joe Perches <[email protected]>
---
 drivers/i2c/i2c-dev.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/i2c/i2c-dev.c +0 -0
index e0694e4..b3fcb59 100644

drivers/i2c/i2c-dev.c static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client, · line 225

Quoted 10 lines

drivers/i2c/i2c-dev.c +1 -3

@@ -219,9 +219,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
 	if (rdwr_arg.nmsgs > I2C_RDRW_IOCTL_MAX_MSGS)
 		return -EINVAL;
 
-	rdwr_pa = (struct i2c_msg *)
-		kmalloc(rdwr_arg.nmsgs * sizeof(struct i2c_msg),
-		GFP_KERNEL);
+	rdwr_pa = kmalloc(rdwr_arg.nmsgs * sizeof(struct i2c_msg), GFP_KERNEL);
 	if (!rdwr_pa)
 		return -ENOMEM;

Applied, thanks.

Signature · 1 line

Jean Delvare

Miller, Mike (OS Dev)

Acked-by on v1 4/21

2010-06-01 15:35 UTC #5 lore raw

RE: [PATCH 04/21] drivers/block/cciss_scsi.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

Quoted 11 lines

-----Original Message-----
From: Joe Perches [mailto:[email protected]]
Sent: Monday, May 31, 2010 10:23 PM
To: [email protected]
Cc: Miller, Mike (OS Dev); ISS StorageDev
Subject: [PATCH 04/21] drivers/block/cciss_scsi.c: Remove unnecessary kmalloc casts
Signed-off-by Joe Perches <[email protected]>

Acked-by Mike Miller <[email protected]>

Quoted 22 lines

---
 drivers/block/cciss_scsi.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

(quoted diff) +0 -0

b/drivers/block/cciss_scsi.c index e1d0e2c..ffd8470 100644

drivers/block/cciss_scsi.c +1 -3

@@ -702,8 +702,7 @@ cciss_scsi_setup(int cntl_num)
 	struct cciss_scsi_adapter_data_t * shba;
 
 	ccissscsi[cntl_num].ndevices = 0;
-	shba = (struct cciss_scsi_adapter_data_t *)
-		kmalloc(sizeof(*shba), GFP_KERNEL);	
+	shba = kmalloc(sizeof(*shba), GFP_KERNEL);
 	if (shba == NULL)
 		return;
 	shba->scsi_host = NULL;
--

1.7.0.3.311.g6a6955

Grant Grundler

Reviewed-by on v1 14/21

2010-06-01 21:02 UTC #19 lore raw

Re: [PATCH 14/21] drivers/parisc/iosapic.c: Remove unnecessary kzalloc cast

In reply to Joe Perches

Quoted 3 lines · Joe Perches

Convert kzalloc to kcalloc
Signed-off-by Joe Perches <[email protected]>

Reviewed-by Grant Grundler <[email protected]>

thanks,
grant

Quoted 26 lines

---
 drivers/parisc/iosapic.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/parisc/iosapic.c +2 -2

index c768367..3e6f56c 100644
@@ -891,8 +891,8 @@ void *iosapic_register(unsigned long hpa)
 	isi->isi_version = iosapic_rd_version(isi);
 	isi->isi_num_vectors = IOSAPIC_IRDT_MAX_ENTRY(isi->isi_version) + 1;
 
-	vip = isi->isi_vector = (struct vector_info *)
-		kzalloc(sizeof(struct vector_info) * isi->isi_num_vectors, GFP_KERNEL);
+	vip = isi->isi_vector = kcalloc(isi->isi_num_vectors,
+					sizeof(struct vector_info), GFP_KERNEL);
 	if (vip == NULL) {
 		kfree(isi);
 		return NULL;

Signature · 6 lines

1.7.0.3.311.g6a6955

--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Vlad Yasevich

2010-06-02 17:30 UTC #29 lore raw

Re: [PATCH 21/21] net/sctp/protocol.c: Remove unnecessary kmalloc casts

In reply to Joe Perches

ACK

-vlad

Quoted 19 lines · Joe Perches

Signed-off-by Joe Perches <[email protected]>

---
 net/sctp/protocol.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

net/sctp/protocol.c +1 -2

index 1827498..fef38be 100644
@@ -1216,8 +1216,7 @@ SCTP_STATIC __init int sctp_init(void)
 
 	/* Allocate and initialize the endpoint hash table.  */
 	sctp_ep_hashsize = 64;
-	sctp_ep_hashtable = (struct sctp_hashbucket *)
-		kmalloc(64 * sizeof(struct sctp_hashbucket), GFP_KERNEL);
+	sctp_ep_hashtable = kmalloc(64 * sizeof(struct sctp_hashbucket), GFP_KERNEL);
 	if (!sctp_ep_hashtable) {
 		printk(KERN_ERR "SCTP: Failed endpoint_hash alloc.\n");
 		status = -ENOMEM;