From: Thorsten Blum Date: Mon, 27 May 2024 13:49:47 +0000 (+0200) Subject: w1: Drop allocation error message X-Git-Tag: v6.11-rc1~100^2~63^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26bf5fc86033162dbd2d5759094cbd724313d55b;p=thirdparty%2Fkernel%2Flinux.git w1: Drop allocation error message Drop the custom error message because kzalloc() already prints allocation failures. Signed-off-by: Thorsten Blum Link: https://lore.kernel.org/r/20240527134946.338398-2-thorsten.blum@toblux.com Signed-off-by: Krzysztof Kozlowski --- diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 3a71c5eb2f837..19a0ea28e9f39 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c @@ -32,12 +32,8 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl, * We are in process context(kernel thread), so can sleep. */ dev = kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL); - if (!dev) { - pr_err("Failed to allocate %zd bytes for new w1 device.\n", - sizeof(struct w1_master)); + if (!dev) return NULL; - } - dev->bus_master = (struct w1_bus_master *)(dev + 1);