From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41E1EC433DB for ; Sat, 30 Jan 2021 09:10:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 031F564E15 for ; Sat, 30 Jan 2021 09:10:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233695AbhA3JJ7 (ORCPT ); Sat, 30 Jan 2021 04:09:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:39216 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233245AbhA3JI5 (ORCPT ); Sat, 30 Jan 2021 04:08:57 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id EBC0864E25; Sat, 30 Jan 2021 08:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1611996907; bh=1sftpBGk31jURifaeXhZUvxk92slR/moCxUUzqdzzyc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=I7DAXt6tkiUsTGcNbP5vEdBC8UrrXkxA5P4oS18NT7yfg7EePL+kXrycrIIDLxwav lqnh0WAP8W2C12xbM4mkVXcwXC9cHtWJFsK7voKd+8lImfHPsugc+NLAp4ppVUt3Tn S2IeeYEKw305cgQA4swZwSK6KObjGk0qB7uugI7Y= Date: Sat, 30 Jan 2021 09:55:03 +0100 From: Greg Kroah-Hartman To: Scott Branden Cc: Arnd Bergmann , Kees Cook , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Olof Johansson , Desmond Yan Subject: Re: [PATCH v2] misc: bcm-vk: only support ttyVK if CONFIG_TTY is set Message-ID: References: <20210129220627.22641-1-scott.branden@broadcom.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210129220627.22641-1-scott.branden@broadcom.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jan 29, 2021 at 02:06:27PM -0800, Scott Branden wrote: > Correct compile issue if CONFIG_TTY is not set by > only adding ttyVK devices if CONFIG_TTY is set. > > Reported-by: Randy Dunlap > Signed-off-by: Scott Branden > > --- > Changes since v1: > Add function stubs rather than compiling out code > --- > drivers/misc/bcm-vk/Makefile | 4 ++-- > drivers/misc/bcm-vk/bcm_vk.h | 35 +++++++++++++++++++++++++++++--- > drivers/misc/bcm-vk/bcm_vk_dev.c | 3 +-- > drivers/misc/bcm-vk/bcm_vk_tty.c | 6 ++++++ > 4 files changed, 41 insertions(+), 7 deletions(-) > > diff --git a/drivers/misc/bcm-vk/Makefile b/drivers/misc/bcm-vk/Makefile > index e4a1486f7209..8d81a734fcad 100644 > --- a/drivers/misc/bcm-vk/Makefile > +++ b/drivers/misc/bcm-vk/Makefile > @@ -7,6 +7,6 @@ obj-$(CONFIG_BCM_VK) += bcm_vk.o > bcm_vk-objs := \ > bcm_vk_dev.o \ > bcm_vk_msg.o \ > - bcm_vk_sg.o \ > - bcm_vk_tty.o > + bcm_vk_sg.o > > +bcm_vk-$(CONFIG_TTY) += bcm_vk_tty.o > diff --git a/drivers/misc/bcm-vk/bcm_vk.h b/drivers/misc/bcm-vk/bcm_vk.h > index 3f37c640a814..4a1d515374c7 100644 > --- a/drivers/misc/bcm-vk/bcm_vk.h > +++ b/drivers/misc/bcm-vk/bcm_vk.h > @@ -258,7 +258,11 @@ enum pci_barno { > BAR_2 > }; > > +#ifdef CONFIG_TTY > #define BCM_VK_NUM_TTY 2 > +#else > +#define BCM_VK_NUM_TTY 0 > +#endif > > struct bcm_vk_tty { > struct tty_port port; > @@ -366,11 +370,15 @@ struct bcm_vk { > struct miscdevice miscdev; > int devid; /* dev id allocated */ > > +#ifdef CONFIG_TTY > struct tty_driver *tty_drv; > struct timer_list serial_timer; > struct bcm_vk_tty tty[BCM_VK_NUM_TTY]; > struct workqueue_struct *tty_wq_thread; > struct work_struct tty_wq_work; > +#else > + struct bcm_vk_tty *tty; Why do you still need this pointer? And should you just have a separate config option for your tty driver instead that depends on CONFIG_TTY? Would you ever want to run this driver without the tty portion? Oh, and much better than the previous version, thanks for cleaning it up. thanks, greg k-h