diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-01-19 10:27:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-01-19 10:27:30 -0500 |
| commit | 210b1847b32951f52d19df229972399e5b987de2 (patch) | |
| tree | be6eeb3ba76b4f4331c98d5ba47aa233bea8f22d /drivers/iio/magnetometer/hid-sensor-magn-3d.c | |
| parent | 93d5bf073a1e01035be66dc41860b9ae9aa9ccfa (diff) | |
| parent | d01723479e6a6c70c83295f7847477a016d5e14a (diff) | |
Merge branch 'for-rmk/virt/hyp-boot/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fixes
Diffstat (limited to 'drivers/iio/magnetometer/hid-sensor-magn-3d.c')
| -rw-r--r-- | drivers/iio/magnetometer/hid-sensor-magn-3d.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c index 8e75eb76ccd9..7ac2c7483ba8 100644 --- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c +++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c | |||
| @@ -279,7 +279,7 @@ static int magn_3d_parse_report(struct platform_device *pdev, | |||
| 279 | } | 279 | } |
| 280 | 280 | ||
| 281 | /* Function to initialize the processing for usage id */ | 281 | /* Function to initialize the processing for usage id */ |
| 282 | static int __devinit hid_magn_3d_probe(struct platform_device *pdev) | 282 | static int hid_magn_3d_probe(struct platform_device *pdev) |
| 283 | { | 283 | { |
| 284 | int ret = 0; | 284 | int ret = 0; |
| 285 | static char *name = "magn_3d"; | 285 | static char *name = "magn_3d"; |
| @@ -376,7 +376,7 @@ error_ret: | |||
| 376 | } | 376 | } |
| 377 | 377 | ||
| 378 | /* Function to deinitialize the processing for usage id */ | 378 | /* Function to deinitialize the processing for usage id */ |
| 379 | static int __devinit hid_magn_3d_remove(struct platform_device *pdev) | 379 | static int hid_magn_3d_remove(struct platform_device *pdev) |
| 380 | { | 380 | { |
| 381 | struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data; | 381 | struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data; |
| 382 | struct iio_dev *indio_dev = platform_get_drvdata(pdev); | 382 | struct iio_dev *indio_dev = platform_get_drvdata(pdev); |