From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754906AbbCaN4d (ORCPT ); Tue, 31 Mar 2015 09:56:33 -0400 Received: from mail-lb0-f182.google.com ([209.85.217.182]:34729 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754808AbbCaN42 (ORCPT ); Tue, 31 Mar 2015 09:56:28 -0400 From: Rasmus Villemoes To: Greg Kroah-Hartman , Jiri Slaby Cc: Rasmus Villemoes , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] tty: return tty->name directly from tty_name Date: Tue, 31 Mar 2015 15:55:58 +0200 Message-Id: <1427810160-15779-3-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1427810160-15779-1-git-send-email-linux@rasmusvillemoes.dk> References: <1427810160-15779-1-git-send-email-linux@rasmusvillemoes.dk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All users of tty_name pass the return value (the provided buffer) to some printf-like function. We can thus avoid the strcpy and, more importantly, later remove the buf parameter completely, eliminating the need for some 64 byte stack buffers. Signed-off-by: Rasmus Villemoes --- drivers/tty/tty_io.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 5d4a9fd7510a..ab549e7bdaa8 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -235,7 +235,7 @@ static void tty_del_file(struct file *file) /** * tty_name - return tty naming * @tty: tty structure - * @buf: buffer for output + * @buf: unused * * Convert a tty structure into a name. The name reflects the kernel * naming policy and if udev is in use may not reflect user space @@ -246,10 +246,8 @@ static void tty_del_file(struct file *file) const char *tty_name(const struct tty_struct *tty, char *buf) { if (!tty) /* Hmm. NULL pointer. That's fun. */ - strcpy(buf, "NULL tty"); - else - strcpy(buf, tty->name); - return buf; + return "NULL tty"; + return tty->name; } EXPORT_SYMBOL(tty_name); -- 2.1.3