Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757377Ab2FFRBa (ORCPT ); Wed, 6 Jun 2012 13:01:30 -0400 Received: from mail.mev.co.uk ([62.49.15.74]:40098 "EHLO mail.mev.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756406Ab2FFRB2 (ORCPT ); Wed, 6 Jun 2012 13:01:28 -0400 Message-ID: <4FCF8CE2.1020507@mev.co.uk> Date: Wed, 6 Jun 2012 18:01:22 +0100 From: Ian Abbott User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120601 Thunderbird/12.0.1 MIME-Version: 1.0 To: H Hartley Sweeten CC: Ian Abbott , Linux Kernel , "devel@driverdev.osuosl.org" , "fmhess@users.sourceforge.net" , "gregkh@linuxfoundation.org" Subject: Re: [PATCH] staging: comedi: ni_mio_common.c: local functions should be static References: <201206051120.22177.hartleys@visionengravers.com> <4FCF2E07.1090401@mev.co.uk> In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2959 Lines: 68 On 2012-06-06 17:22, H Hartley Sweeten wrote: > On Wednesday, June 06, 2012 3:17 AM, Ian Abbott wrote: >> On 2012-06-05 19:20, H Hartley Sweeten wrote: >>> Local functions should be marked static to prevent them from >>> being exposed globally. >>> >>> This quiets the following sparse warnings: >>> >>> warning: symbol 'ni_release_gpct_mite_channel' was not declared. Should it be static? >>> warning: symbol 'ni_prime_channelgain_list' was not declared. Should it be static? >>> >>> Signed-off-by: H Hartley Sweeten >>> Cc: Ian Abbott >>> Cc: Mori Hess >>> Cc: Greg Kroah-Hartman >>> >>> --- >>> >>> diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c >>> index fd232bc..3b3a0b1 100644 >>> --- a/drivers/staging/comedi/drivers/ni_mio_common.c >>> +++ b/drivers/staging/comedi/drivers/ni_mio_common.c >>> @@ -644,7 +644,7 @@ static void ni_release_ao_mite_channel(struct comedi_device *dev) >>> #endif /* PCIDMA */ >>> } >>> >>> -void ni_release_gpct_mite_channel(struct comedi_device *dev, >>> +static void ni_release_gpct_mite_channel(struct comedi_device *dev, >>> unsigned gpct_index) >>> { >>> #ifdef PCIDMA >>> @@ -1880,7 +1880,7 @@ static int ni_ai_insn_read(struct comedi_device *dev, >>> return insn->n; >>> } >> >> This results in a compiler warning about the unused function >> ni_release_gpct_mite_channel when compiling ni_atmio.c. It was unused >> before of course, but now it is static, the compiler realizes it! > > Ugh... c code including c code... I didn't notice that until now. > >> It could be fixed for now by moving the '#ifdef PCIDMA' and matching >> '#endif' to surround the whole function, though I guess we want to try >> and get rid of the #ifdef's eventually. It's tricky because >> ni_mio_common.c isn't a standalone compilation unit, it's #include'd by >> some other .c files. We might need to have a go at splitting it up at >> some point. > > The ni_mio_common.c file should just get turned into a library module. > > Right now it's a bit of a mess. The individual drivers define PCIDMA > before including ni_mio_common.c. The only one that sets the define > is ni_pcimio but it's also included by ni_atmio and ni_mio_cs. > > I'll look it over and see what might be done to fix it. You have to be careful with module dependencies if doing that, as you don't want the ni_atmio module to depend on the mite and ni_tiocmd modules for example. -- -=( Ian Abbott @ MEV Ltd. E-mail: )=- -=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/