From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758406Ab0BRRvK (ORCPT ); Thu, 18 Feb 2010 12:51:10 -0500 Received: from ppsw-1.csi.cam.ac.uk ([131.111.8.131]:51423 "EHLO ppsw-1.csi.cam.ac.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750891Ab0BRRvH (ORCPT ); Thu, 18 Feb 2010 12:51:07 -0500 X-Cam-AntiVirus: no malware found X-Cam-SpamDetails: not scanned X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/ Message-ID: <4B7D7E7B.1000805@cam.ac.uk> Date: Thu, 18 Feb 2010 17:52:59 +0000 From: Jonathan Cameron User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20100109 Thunderbird/3.0 MIME-Version: 1.0 To: Mark Brown CC: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Subject: Re: [PATCH] staging: iio: Staticise non-exported functions References: <1266513557-32326-1-git-send-email-broonie@opensource.wolfsonmicro.com> In-Reply-To: <1266513557-32326-1-git-send-email-broonie@opensource.wolfsonmicro.com> X-Enigmail-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/18/10 17:19, Mark Brown wrote: > Staticise a number of functions which aren't exported outside their > source files, and also add a __user annotation for the buffer in > iio_event_chrdev_read(). Thanks, > Signed-off-by: Mark Brown Acked-by: Jonathan Cameron > --- > drivers/staging/iio/industrialio-core.c | 14 +++++++------- > drivers/staging/iio/trigger_consumer.h | 4 ++-- > 2 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c > index 4ff683a..b456dfc 100644 > --- a/drivers/staging/iio/industrialio-core.c > +++ b/drivers/staging/iio/industrialio-core.c > @@ -118,7 +118,7 @@ int iio_push_event(struct iio_dev *dev_info, > EXPORT_SYMBOL(iio_push_event); > > /* Generic interrupt line interrupt handler */ > -irqreturn_t iio_interrupt_handler(int irq, void *_int_info) > +static irqreturn_t iio_interrupt_handler(int irq, void *_int_info) > { > struct iio_interrupt *int_info = _int_info; > struct iio_dev *dev_info = int_info->dev_info; > @@ -252,10 +252,10 @@ void iio_remove_event_from_list(struct iio_event_handler_list *el, > } > EXPORT_SYMBOL(iio_remove_event_from_list); > > -ssize_t iio_event_chrdev_read(struct file *filep, > - char *buf, > - size_t count, > - loff_t *f_ps) > +static ssize_t iio_event_chrdev_read(struct file *filep, > + char __user *buf, > + size_t count, > + loff_t *f_ps) > { > struct iio_event_interface *ev_int = filep->private_data; > struct iio_detected_event_list *el; > @@ -313,7 +313,7 @@ error_ret: > return ret; > } > > -int iio_event_chrdev_release(struct inode *inode, struct file *filep) > +static int iio_event_chrdev_release(struct inode *inode, struct file *filep) > { > struct iio_handler *hand = iio_cdev_to_handler(inode->i_cdev); > struct iio_event_interface *ev_int = hand->private; > @@ -335,7 +335,7 @@ int iio_event_chrdev_release(struct inode *inode, struct file *filep) > return 0; > } > > -int iio_event_chrdev_open(struct inode *inode, struct file *filep) > +static int iio_event_chrdev_open(struct inode *inode, struct file *filep) > { > struct iio_handler *hand = iio_cdev_to_handler(inode->i_cdev); > struct iio_event_interface *ev_int = hand->private; > diff --git a/drivers/staging/iio/trigger_consumer.h b/drivers/staging/iio/trigger_consumer.h > index a02d70b..9d52d96 100644 > --- a/drivers/staging/iio/trigger_consumer.h > +++ b/drivers/staging/iio/trigger_consumer.h > @@ -27,7 +27,7 @@ int iio_device_unregister_trigger_consumer(struct iio_dev *dev_info); > * iio_device_register_trigger_consumer() - set up an iio_dev to use triggers > * @dev_info: iio_dev associated with the device that will consume the trigger > **/ > -int iio_device_register_trigger_consumer(struct iio_dev *dev_info) > +static int iio_device_register_trigger_consumer(struct iio_dev *dev_info) > { > return 0; > }; > @@ -36,7 +36,7 @@ int iio_device_register_trigger_consumer(struct iio_dev *dev_info) > * iio_device_unregister_trigger_consumer() - reverse the registration process > * @dev_info: iio_dev associated with the device that consumed the trigger > **/ > -int iio_device_unregister_trigger_consumer(struct iio_dev *dev_info) > +static int iio_device_unregister_trigger_consumer(struct iio_dev *dev_info) > { > return 0; > };