Skip to content

Commit

Permalink
[PATCH] pnp: consolidate kmalloc wrappers
Browse files Browse the repository at this point in the history 
ISAPNP, PNPBIOS, and PNPACPI all had their own kmalloc wrappers that
reimplemented kcalloc().  Remove the wrappers and just use kcalloc()
directly.

Note that this also removes the PNPBIOS error message when the kmalloc
fails.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Bjorn Helgaas authored and Linus Torvalds committed Sep 7, 2005
1 parent ea2f159 commit a2822e7
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 75 deletions.
33 changes: 11 additions & 22 deletions drivers/pnp/isapnp/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,17 +142,6 @@ static void isapnp_write_word(unsigned char idx, unsigned short val)
isapnp_write_byte(idx+1, val);
}

static void *isapnp_alloc(long size)
{
void *result;

result = kmalloc(size, GFP_KERNEL);
if (!result)
return NULL;
memset(result, 0, size);
return result;
}

static void isapnp_key(void)
{
unsigned char code = 0x6a, msb;
Expand Down Expand Up @@ -406,7 +395,7 @@ static void isapnp_parse_id(struct pnp_dev * dev, unsigned short vendor, unsigne
struct pnp_id * id;
if (!dev)
return;
id = isapnp_alloc(sizeof(struct pnp_id));
id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
if (!id)
return;
sprintf(id->id, "%c%c%c%x%x%x%x",
Expand All @@ -430,7 +419,7 @@ static struct pnp_dev * __init isapnp_parse_device(struct pnp_card *card, int si
struct pnp_dev *dev;

isapnp_peek(tmp, size);
dev = isapnp_alloc(sizeof(struct pnp_dev));
dev = kcalloc(1, sizeof(struct pnp_dev), GFP_KERNEL);
if (!dev)
return NULL;
dev->number = number;
Expand Down Expand Up @@ -461,7 +450,7 @@ static void __init isapnp_parse_irq_resource(struct pnp_option *option,
unsigned long bits;

isapnp_peek(tmp, size);
irq = isapnp_alloc(sizeof(struct pnp_irq));
irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
if (!irq)
return;
bits = (tmp[1] << 8) | tmp[0];
Expand All @@ -485,7 +474,7 @@ static void __init isapnp_parse_dma_resource(struct pnp_option *option,
struct pnp_dma *dma;

isapnp_peek(tmp, size);
dma = isapnp_alloc(sizeof(struct pnp_dma));
dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
if (!dma)
return;
dma->map = tmp[0];
Expand All @@ -505,7 +494,7 @@ static void __init isapnp_parse_port_resource(struct pnp_option *option,
struct pnp_port *port;

isapnp_peek(tmp, size);
port = isapnp_alloc(sizeof(struct pnp_port));
port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
if (!port)
return;
port->min = (tmp[2] << 8) | tmp[1];
Expand All @@ -528,7 +517,7 @@ static void __init isapnp_parse_fixed_port_resource(struct pnp_option *option,
struct pnp_port *port;

isapnp_peek(tmp, size);
port = isapnp_alloc(sizeof(struct pnp_port));
port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
if (!port)
return;
port->min = port->max = (tmp[1] << 8) | tmp[0];
Expand All @@ -550,7 +539,7 @@ static void __init isapnp_parse_mem_resource(struct pnp_option *option,
struct pnp_mem *mem;

isapnp_peek(tmp, size);
mem = isapnp_alloc(sizeof(struct pnp_mem));
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
if (!mem)
return;
mem->min = ((tmp[2] << 8) | tmp[1]) << 8;
Expand All @@ -573,7 +562,7 @@ static void __init isapnp_parse_mem32_resource(struct pnp_option *option,
struct pnp_mem *mem;

isapnp_peek(tmp, size);
mem = isapnp_alloc(sizeof(struct pnp_mem));
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
if (!mem)
return;
mem->min = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1];
Expand All @@ -595,7 +584,7 @@ static void __init isapnp_parse_fixed_mem32_resource(struct pnp_option *option,
struct pnp_mem *mem;

isapnp_peek(tmp, size);
mem = isapnp_alloc(sizeof(struct pnp_mem));
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
if (!mem)
return;
mem->min = mem->max = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1];
Expand Down Expand Up @@ -838,7 +827,7 @@ static unsigned char __init isapnp_checksum(unsigned char *data)

static void isapnp_parse_card_id(struct pnp_card * card, unsigned short vendor, unsigned short device)
{
struct pnp_id * id = isapnp_alloc(sizeof(struct pnp_id));
struct pnp_id * id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
if (!id)
return;
sprintf(id->id, "%c%c%c%x%x%x%x",
Expand Down Expand Up @@ -874,7 +863,7 @@ static int __init isapnp_build_device_list(void)
header[4], header[5], header[6], header[7], header[8]);
printk(KERN_DEBUG "checksum = 0x%x\n", checksum);
#endif
if ((card = isapnp_alloc(sizeof(struct pnp_card))) == NULL)
if ((card = kcalloc(1, sizeof(struct pnp_card), GFP_KERNEL)) == NULL)
continue;

card->number = csn;
Expand Down
15 changes: 3 additions & 12 deletions drivers/pnp/pnpacpi/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@ static inline int is_exclusive_device(struct acpi_device *dev)
return (!acpi_match_ids(dev, excluded_id_list));
}

void *pnpacpi_kmalloc(size_t size, int f)
{
void *p = kmalloc(size, f);
if (p)
memset(p, 0, size);
return p;
}

/*
* Compatible Device IDs
*/
Expand Down Expand Up @@ -143,7 +135,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
return 0;

pnp_dbg("ACPI device : hid %s", acpi_device_hid(device));
dev = pnpacpi_kmalloc(sizeof(struct pnp_dev), GFP_KERNEL);
dev = kcalloc(1, sizeof(struct pnp_dev), GFP_KERNEL);
if (!dev) {
pnp_err("Out of memory");
return -ENOMEM;
Expand Down Expand Up @@ -173,7 +165,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
dev->number = num;

/* set the initial values for the PnP device */
dev_id = pnpacpi_kmalloc(sizeof(struct pnp_id), GFP_KERNEL);
dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
if (!dev_id)
goto err;
pnpidacpi_to_pnpid(acpi_device_hid(device), dev_id->id);
Expand Down Expand Up @@ -205,8 +197,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
for (i = 0; i < cid_list->count; i++) {
if (!ispnpidacpi(cid_list->id[i].value))
continue;
dev_id = pnpacpi_kmalloc(sizeof(struct pnp_id),
GFP_KERNEL);
dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
if (!dev_id)
continue;

Expand Down
1 change: 0 additions & 1 deletion drivers/pnp/pnpacpi/pnpacpi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <linux/acpi.h>
#include <linux/pnp.h>

void *pnpacpi_kmalloc(size_t size, int f);
acpi_status pnpacpi_parse_allocated_resource(acpi_handle, struct pnp_resource_table*);
acpi_status pnpacpi_parse_resource_option_data(acpi_handle, struct pnp_dev*);
int pnpacpi_encode_resources(struct pnp_resource_table *, struct acpi_buffer *);
Expand Down
18 changes: 9 additions & 9 deletions drivers/pnp/pnpacpi/rsparser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ static void pnpacpi_parse_dma_option(struct pnp_option *option, struct acpi_reso

if (p->number_of_channels == 0)
return;
dma = pnpacpi_kmalloc(sizeof(struct pnp_dma), GFP_KERNEL);
dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
if (!dma)
return;

Expand Down Expand Up @@ -300,7 +300,7 @@ static void pnpacpi_parse_irq_option(struct pnp_option *option,

if (p->number_of_interrupts == 0)
return;
irq = pnpacpi_kmalloc(sizeof(struct pnp_irq), GFP_KERNEL);
irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
if (!irq)
return;

Expand All @@ -321,7 +321,7 @@ static void pnpacpi_parse_ext_irq_option(struct pnp_option *option,

if (p->number_of_interrupts == 0)
return;
irq = pnpacpi_kmalloc(sizeof(struct pnp_irq), GFP_KERNEL);
irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
if (!irq)
return;

Expand All @@ -342,7 +342,7 @@ pnpacpi_parse_port_option(struct pnp_option *option,

if (io->range_length == 0)
return;
port = pnpacpi_kmalloc(sizeof(struct pnp_port), GFP_KERNEL);
port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
if (!port)
return;
port->min = io->min_base_address;
Expand All @@ -363,7 +363,7 @@ pnpacpi_parse_fixed_port_option(struct pnp_option *option,

if (io->range_length == 0)
return;
port = pnpacpi_kmalloc(sizeof(struct pnp_port), GFP_KERNEL);
port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
if (!port)
return;
port->min = port->max = io->base_address;
Expand All @@ -382,7 +382,7 @@ pnpacpi_parse_mem24_option(struct pnp_option *option,

if (p->range_length == 0)
return;
mem = pnpacpi_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
if (!mem)
return;
mem->min = p->min_base_address;
Expand All @@ -405,7 +405,7 @@ pnpacpi_parse_mem32_option(struct pnp_option *option,

if (p->range_length == 0)
return;
mem = pnpacpi_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
if (!mem)
return;
mem->min = p->min_base_address;
Expand All @@ -428,7 +428,7 @@ pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,

if (p->range_length == 0)
return;
mem = pnpacpi_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
if (!mem)
return;
mem->min = mem->max = p->range_base_address;
Expand Down Expand Up @@ -612,7 +612,7 @@ int pnpacpi_build_resource_template(acpi_handle handle,
if (!res_cnt)
return -EINVAL;
buffer->length = sizeof(struct acpi_resource) * (res_cnt + 1) + 1;
buffer->pointer = pnpacpi_kmalloc(buffer->length - 1, GFP_KERNEL);
buffer->pointer = kcalloc(1, buffer->length - 1, GFP_KERNEL);
if (!buffer->pointer)
return -ENOMEM;
pnp_dbg("Res cnt %d", res_cnt);
Expand Down
26 changes: 8 additions & 18 deletions drivers/pnp/pnpbios/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,6 @@ int pnp_bios_present(void)

struct pnp_dev_node_info node_info;

void *pnpbios_kmalloc(size_t size, int f)
{
void *p = kmalloc( size, f );
if ( p == NULL )
printk(KERN_ERR "PnPBIOS: kmalloc() failed\n");
else
memset(p, 0, size);
return p;
}

/*
*
* DOCKING FUNCTIONS
Expand All @@ -121,10 +111,10 @@ static int pnp_dock_event(int dock, struct pnp_docking_station_info *info)
if (!current->fs->root) {
return -EAGAIN;
}
if (!(envp = (char **) pnpbios_kmalloc (20 * sizeof (char *), GFP_KERNEL))) {
if (!(envp = (char **) kcalloc (20, sizeof (char *), GFP_KERNEL))) {
return -ENOMEM;
}
if (!(buf = pnpbios_kmalloc (256, GFP_KERNEL))) {
if (!(buf = kcalloc (1, 256, GFP_KERNEL))) {
kfree (envp);
return -ENOMEM;
}
Expand Down Expand Up @@ -231,7 +221,7 @@ static int pnpbios_get_resources(struct pnp_dev * dev, struct pnp_resource_table
if(!pnpbios_is_dynamic(dev))
return -EPERM;

node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
if (!node)
return -1;
if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) {
Expand All @@ -254,7 +244,7 @@ static int pnpbios_set_resources(struct pnp_dev * dev, struct pnp_resource_table
if (!pnpbios_is_dynamic(dev))
return -EPERM;

node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
if (!node)
return -1;
if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) {
Expand Down Expand Up @@ -305,7 +295,7 @@ static int pnpbios_disable_resources(struct pnp_dev *dev)
if(dev->flags & PNPBIOS_NO_DISABLE || !pnpbios_is_dynamic(dev))
return -EPERM;

node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
if (!node)
return -ENOMEM;

Expand Down Expand Up @@ -347,7 +337,7 @@ static int insert_device(struct pnp_dev *dev, struct pnp_bios_node * node)
}

/* set the initial values for the PnP device */
dev_id = pnpbios_kmalloc(sizeof(struct pnp_id), GFP_KERNEL);
dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
if (!dev_id)
return -1;
pnpid32_to_pnpid(node->eisa_id,id);
Expand Down Expand Up @@ -385,7 +375,7 @@ static void __init build_devlist(void)
struct pnp_bios_node *node;
struct pnp_dev *dev;

node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
if (!node)
return;

Expand All @@ -402,7 +392,7 @@ static void __init build_devlist(void)
break;
}
nodes_got++;
dev = pnpbios_kmalloc(sizeof (struct pnp_dev), GFP_KERNEL);
dev = kcalloc(1, sizeof (struct pnp_dev), GFP_KERNEL);
if (!dev)
break;
if(insert_device(dev,node)<0)
Expand Down
1 change: 0 additions & 1 deletion drivers/pnp/pnpbios/pnpbios.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ union pnp_bios_install_struct {

extern int pnp_bios_present(void);
extern int pnpbios_dont_use_current_config;
extern void *pnpbios_kmalloc(size_t size, int f);

extern int pnpbios_parse_data_stream(struct pnp_dev *dev, struct pnp_bios_node * node);
extern int pnpbios_read_resources_from_node(struct pnp_resource_table *res, struct pnp_bios_node * node);
Expand Down
8 changes: 4 additions & 4 deletions drivers/pnp/pnpbios/proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ static int proc_read_escd(char *buf, char **start, off_t pos,
return -EFBIG;
}

tmpbuf = pnpbios_kmalloc(escd.escd_size, GFP_KERNEL);
tmpbuf = kcalloc(1, escd.escd_size, GFP_KERNEL);
if (!tmpbuf) return -ENOMEM;

if (pnp_bios_read_escd(tmpbuf, escd.nv_storage_base)) {
Expand Down Expand Up @@ -133,7 +133,7 @@ static int proc_read_devices(char *buf, char **start, off_t pos,
if (pos >= 0xff)
return 0;

node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
if (!node) return -ENOMEM;

for (nodenum=pos; nodenum<0xff; ) {
Expand Down Expand Up @@ -168,7 +168,7 @@ static int proc_read_node(char *buf, char **start, off_t pos,
u8 nodenum = (long)data;
int len;

node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
if (!node) return -ENOMEM;
if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
kfree(node);
Expand All @@ -188,7 +188,7 @@ static int proc_write_node(struct file *file, const char __user *buf,
u8 nodenum = (long)data;
int ret = count;

node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
if (!node)
return -ENOMEM;
if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
Expand Down
Loading

0 comments on commit a2822e7

Please sign in to comment.