From: Julia Lawall <[email protected]>
In each case, the destination of the allocation has type struct **, so the
elements of the array should have pointer type, not structure type.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@disable sizeof_type_expr@
type T;
T **x;
@@
x =
<+...sizeof(
- T
+ *x
)...+>
// </smpl>
Signed-off-by: Julia Lawall <[email protected]>
---
drivers/scsi/aic94xx/aic94xx_init.c | 4 ++--
drivers/scsi/ch.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff -u -p a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -687,9 +687,9 @@ static int asd_register_sas_ha(struct as
{
int i;
struct asd_sas_phy **sas_phys =
- kmalloc(ASD_MAX_PHYS * sizeof(struct asd_sas_phy), GFP_KERNEL);
+ kmalloc(ASD_MAX_PHYS * sizeof(*sas_phys), GFP_KERNEL);
struct asd_sas_port **sas_ports =
- kmalloc(ASD_MAX_PHYS * sizeof(struct asd_sas_port), GFP_KERNEL);
+ kmalloc(ASD_MAX_PHYS * sizeof(*sas_ports), GFP_KERNEL);
if (!sas_phys || !sas_ports) {
kfree(sas_phys);
diff -u -p a/drivers/scsi/ch.c b/drivers/scsi/ch.c
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -351,7 +351,7 @@ ch_readconfig(scsi_changer *ch)
}
/* look up the devices of the data transfer elements */
- ch->dt = kmalloc(ch->counts[CHET_DT]*sizeof(struct scsi_device),
+ ch->dt = kmalloc(ch->counts[CHET_DT]*sizeof(*ch->dt),
GFP_KERNEL);
if (!ch->dt) {
Julia Lawall wrote:
> From: Julia Lawall <[email protected]>
>
> In each case, the destination of the allocation has type struct **, so the
> elements of the array should have pointer type, not structure type.
Maybe they should even by kcalloc'ed?
Eike
On Tue, 29 Dec 2009, Rolf Eike Beer wrote:
> Julia Lawall wrote:
> > From: Julia Lawall <[email protected]>
> >
> > In each case, the destination of the allocation has type struct **, so the
> > elements of the array should have pointer type, not structure type.
>
> Maybe they should even by kcalloc'ed?
I thought about that, but in response to another patch someone seemed to
think kcalloc was not very useful. But I can certainly change it in this
case.
julia
From: Julia Lawall <[email protected]>
In each case, the destination of the allocation has type struct **, so the
elements of the array should have pointer type, not structure type.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@disable sizeof_type_expr@
type T;
T **x;
@@
x =
<+...sizeof(
- T
+ *x
)...+>
// </smpl>
Signed-off-by: Julia Lawall <[email protected]>
---
drivers/scsi/aic94xx/aic94xx_init.c | 4 ++--
drivers/scsi/ch.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff -u -p a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -687,9 +687,9 @@ static int asd_register_sas_ha(struct as
{
int i;
struct asd_sas_phy **sas_phys =
- kmalloc(ASD_MAX_PHYS * sizeof(struct asd_sas_phy), GFP_KERNEL);
+ kcalloc(ASD_MAX_PHYS, sizeof(*sas_phys), GFP_KERNEL);
struct asd_sas_port **sas_ports =
- kmalloc(ASD_MAX_PHYS * sizeof(struct asd_sas_port), GFP_KERNEL);
+ kcalloc(ASD_MAX_PHYS, sizeof(*sas_ports), GFP_KERNEL);
if (!sas_phys || !sas_ports) {
kfree(sas_phys);
diff -u -p a/drivers/scsi/ch.c b/drivers/scsi/ch.c
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -351,7 +351,7 @@ ch_readconfig(scsi_changer *ch)
}
/* look up the devices of the data transfer elements */
- ch->dt = kmalloc(ch->counts[CHET_DT]*sizeof(struct scsi_device),
+ ch->dt = kcalloc(ch->counts[CHET_DT], sizeof(*ch->dt),
GFP_KERNEL);
if (!ch->dt) {
On Tue, 2009-12-29 at 21:04 +0100, Julia Lawall wrote:
> On Tue, 29 Dec 2009, Rolf Eike Beer wrote:
> > Julia Lawall wrote:
> > > From: Julia Lawall <[email protected]>
> > > In each case, the destination of the allocation has type struct **, so the
> > > elements of the array should have pointer type, not structure type.
> > Maybe they should even by kcalloc'ed?
> I thought about that, but in response to another patch someone seemed to
> think kcalloc was not very useful. But I can certainly change it in this
> case.
I think kcalloc is useful and should be used when the
allocated array of elements needs to be zeroed.
It appears the uses in 1/5 and 3/5 don't need it but
maybe patch 2/5 and 4/5 should use kcalloc.
On Tue, 29 Dec 2009, Joe Perches wrote:
> On Tue, 2009-12-29 at 21:04 +0100, Julia Lawall wrote:
> > On Tue, 29 Dec 2009, Rolf Eike Beer wrote:
> > > Julia Lawall wrote:
> > > > From: Julia Lawall <[email protected]>
> > > > In each case, the destination of the allocation has type struct **, so the
> > > > elements of the array should have pointer type, not structure type.
> > > Maybe they should even by kcalloc'ed?
> > I thought about that, but in response to another patch someone seemed to
> > think kcalloc was not very useful. But I can certainly change it in this
> > case.
>
> I think kcalloc is useful and should be used when the
> allocated array of elements needs to be zeroed.
>
> It appears the uses in 1/5 and 3/5 don't need it but
> maybe patch 2/5 and 4/5 should use kcalloc.
I will look into changing them too.
julia