From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from saturn.retrosnub.co.uk ([178.18.118.26]:45331 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965839Ab2KBKFo (ORCPT ); Fri, 2 Nov 2012 06:05:44 -0400 Message-ID: <50939AF5.6080201@kernel.org> Date: Fri, 02 Nov 2012 10:05:41 +0000 From: Jonathan Cameron MIME-Version: 1.0 To: Axel Lin CC: Jonathan Cameron , srinivas pandruvada , Lars-Peter Clausen , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] iio: hid-sensor: Use __devexit annotation for remove() References: <1351349317.10004.1.camel@phoenix> In-Reply-To: <1351349317.10004.1.camel@phoenix> Content-Type: text/plain; charset=UTF-8 Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org On 10/27/2012 03:48 PM, Axel Lin wrote: > Use __devexit rather than __devinit annotation for remove(). > Also adds __devexit_p around remove callback. > > Signed-off-by: Axel Lin Added to fixes-togreg branch of iio.git oops on this one. Should have picked that up in review. Thanks Axel! > --- > drivers/iio/accel/hid-sensor-accel-3d.c | 4 ++-- > drivers/iio/gyro/hid-sensor-gyro-3d.c | 4 ++-- > drivers/iio/light/hid-sensor-als.c | 4 ++-- > drivers/iio/magnetometer/hid-sensor-magn-3d.c | 4 ++-- > 4 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c > index 314a405..1b49931 100644 > --- a/drivers/iio/accel/hid-sensor-accel-3d.c > +++ b/drivers/iio/accel/hid-sensor-accel-3d.c > @@ -388,7 +388,7 @@ error_ret: > } > > /* Function to deinitialize the processing for usage id */ > -static int __devinit hid_accel_3d_remove(struct platform_device *pdev) > +static int __devexit hid_accel_3d_remove(struct platform_device *pdev) > { > struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data; > struct iio_dev *indio_dev = platform_get_drvdata(pdev); > @@ -409,7 +409,7 @@ static struct platform_driver hid_accel_3d_platform_driver = { > .owner = THIS_MODULE, > }, > .probe = hid_accel_3d_probe, > - .remove = hid_accel_3d_remove, > + .remove = __devexit_p(hid_accel_3d_remove), > }; > module_platform_driver(hid_accel_3d_platform_driver); > > diff --git a/drivers/iio/gyro/hid-sensor-gyro-3d.c b/drivers/iio/gyro/hid-sensor-gyro-3d.c > index 4c56ada..705dc49 100644 > --- a/drivers/iio/gyro/hid-sensor-gyro-3d.c > +++ b/drivers/iio/gyro/hid-sensor-gyro-3d.c > @@ -388,7 +388,7 @@ error_ret: > } > > /* Function to deinitialize the processing for usage id */ > -static int __devinit hid_gyro_3d_remove(struct platform_device *pdev) > +static int __devexit hid_gyro_3d_remove(struct platform_device *pdev) > { > struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data; > struct iio_dev *indio_dev = platform_get_drvdata(pdev); > @@ -409,7 +409,7 @@ static struct platform_driver hid_gyro_3d_platform_driver = { > .owner = THIS_MODULE, > }, > .probe = hid_gyro_3d_probe, > - .remove = hid_gyro_3d_remove, > + .remove = __devexit_p(hid_gyro_3d_remove), > }; > module_platform_driver(hid_gyro_3d_platform_driver); > > diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c > index 96e3691..4c35ac7 100644 > --- a/drivers/iio/light/hid-sensor-als.c > +++ b/drivers/iio/light/hid-sensor-als.c > @@ -355,7 +355,7 @@ error_ret: > } > > /* Function to deinitialize the processing for usage id */ > -static int __devinit hid_als_remove(struct platform_device *pdev) > +static int __devexit hid_als_remove(struct platform_device *pdev) > { > struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data; > struct iio_dev *indio_dev = platform_get_drvdata(pdev); > @@ -376,7 +376,7 @@ static struct platform_driver hid_als_platform_driver = { > .owner = THIS_MODULE, > }, > .probe = hid_als_probe, > - .remove = hid_als_remove, > + .remove = __devexit_p(hid_als_remove), > }; > module_platform_driver(hid_als_platform_driver); > > diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c > index c4f0d27..a02dc98 100644 > --- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c > +++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c > @@ -389,7 +389,7 @@ error_ret: > } > > /* Function to deinitialize the processing for usage id */ > -static int __devinit hid_magn_3d_remove(struct platform_device *pdev) > +static int __devexit hid_magn_3d_remove(struct platform_device *pdev) > { > struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data; > struct iio_dev *indio_dev = platform_get_drvdata(pdev); > @@ -410,7 +410,7 @@ static struct platform_driver hid_magn_3d_platform_driver = { > .owner = THIS_MODULE, > }, > .probe = hid_magn_3d_probe, > - .remove = hid_magn_3d_remove, > + .remove = __devexit_p(hid_magn_3d_remove), > }; > module_platform_driver(hid_magn_3d_platform_driver); > >