pnp: Remove pnp_alloc
Subsystems (2)
PATCH 1/1 pnp: Remove pnp_alloc
Kernel will complain anyway if it runs out of memory. Therefore we don't need the error message in pnp_alloc() and hence can remove it and use kzalloc() directly.
Signed-off-by Heiner Kallweit <[email protected]>
--- drivers/pnp/base.h | 1 - drivers/pnp/card.c | 2 +- drivers/pnp/core.c | 12 ------------ drivers/pnp/interface.c | 4 ++-- 4 files changed, 3 insertions(+), 16 deletions(-)
drivers/pnp/base.h +0 -1
@@ -6,7 +6,6 @@extern struct mutex pnp_lock;extern const struct attribute_group *pnp_dev_groups[]; -void *pnp_alloc (long size);int pnp_register_protocol (struct pnp_protocol *protocol);void pnp_unregister_protocol (struct pnp_protocol *protocol);
drivers/pnp/card.c +1 -1
@@ -80,7 +80,7 @@ static int card_probe(struct pnp_card *card, struct pnp_card_driver *drv)if (!id)return 0 ; - clink =pnp_alloc (sizeof (*clink)); + clink =kzalloc (sizeof (*clink),GFP_KERNEL );if (!clink)return 0 ; clink->card = card;
drivers/pnp/core.c +0 -12
@@ -31,18 +31,6 @@ DEFINE_MUTEX(pnp_lock);int pnp_platform_devices;EXPORT_SYMBOL (pnp_platform_devices); -void *pnp_alloc (long size) -{ -void *result; - - result =kzalloc (size,GFP_KERNEL ); -if (!result) { -printk (KERN_ERR "pnp: Out of Memory\n" ); -return NULL ; - } -return result; -} -static void pnp_remove_protocol (struct pnp_protocol *protocol) {mutex_lock (&pnp_lock);
drivers/pnp/interface.c +2 -2
@@ -214,7 +214,7 @@ static ssize_t options_show(struct device *dmdev, struct device_attribute *attr,int ret, dep =0 , set =0 ;char *indent; - buffer =pnp_alloc (sizeof (pnp_info_buffer_t)); + buffer =kzalloc (sizeof (*buffer),GFP_KERNEL );if (!buffer)return -ENOMEM ;
@@ -257,7 +257,7 @@ static ssize_t resources_show(struct device *dmdev,if (!dev)return -EINVAL ; - buffer =pnp_alloc (sizeof (pnp_info_buffer_t)); + buffer =kzalloc (sizeof (*buffer),GFP_KERNEL );if (!buffer)return -ENOMEM ;
Signature · 1 line
2.31.1
Quoted 75 lines · Heiner Kallweit
Kernel will complain anyway if it runs out of memory. Therefore we don't need the error message in
pnp_alloc()and hence can remove it and usekzalloc()directly.Signed-off-by Heiner Kallweit <[email protected]>--- drivers/pnp/base.h | 1 - drivers/pnp/card.c | 2 +- drivers/pnp/core.c | 12 ------------ drivers/pnp/interface.c | 4 ++-- 4 files changed, 3 insertions(+), 16 deletions(-)drivers/pnp/base.h +0
-1@@ -6,7 +6,6 @@extern struct mutex pnp_lock;extern const struct attribute_group *pnp_dev_groups[]; -void *pnp_alloc (long size);int pnp_register_protocol (struct pnp_protocol *protocol);void pnp_unregister_protocol (struct pnp_protocol *protocol);drivers/pnp/card.c +1
-1@@ -80,7 +80,7 @@ static int card_probe(struct pnp_card *card, struct pnp_card_driver *drv)if (!id)return 0 ; - clink =pnp_alloc (sizeof (*clink)); + clink =kzalloc (sizeof (*clink),GFP_KERNEL );if (!clink)return 0 ; clink->card = card;drivers/pnp/core.c +0
-12@@ -31,18 +31,6 @@ DEFINE_MUTEX(pnp_lock);int pnp_platform_devices;EXPORT_SYMBOL (pnp_platform_devices); -void *pnp_alloc (long size) -{ -void *result; - - result =kzalloc (size,GFP_KERNEL ); -if (!result) { -printk (KERN_ERR "pnp: Out of Memory\n" ); -return NULL ; - } -return result; -} -static void pnp_remove_protocol (struct pnp_protocol *protocol) {mutex_lock (&pnp_lock);drivers/pnp/interface.c +1
-1@@ -214,7 +214,7 @@ static ssize_t options_show(struct device *dmdev, struct device_attribute *attr,int ret, dep =0 , set =0 ;char *indent; - buffer =pnp_alloc (sizeof (pnp_info_buffer_t)); + buffer =kzalloc (sizeof (*buffer),GFP_KERNEL );if (!buffer)return -ENOMEM ;
drivers/pnp/interface.c static ssize_t resources_show(struct device *dmdev,
Quoted 9 lines
drivers/pnp/interface.c +1
-2@@ -257,7 +257,7 @@ static ssize_t resources_show(struct device *dmdev,if (!dev)return -EINVAL ; - buffer =pnp_alloc (sizeof (pnp_info_buffer_t)); + buffer =kzalloc (sizeof (*buffer),GFP_KERNEL );if (!buffer)return -ENOMEM ; --
Applied as 5.14 material with edits in the subject and changelog, thanks!