summaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/sony-laptop.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-07-01 10:18:01 +0800
committerMatthew Garrett <mjg@redhat.com>2010-08-03 09:48:53 -0400
commit08db2b3141b99b476749201eb8e164b39fa7a4ca (patch)
tree911acb496cd0789b1dfec8d5ba6983b56c4aa929 /drivers/platform/x86/sony-laptop.c
parent32ab72e7ca7aed399b81a3ffec26d7353bd33581 (diff)
downloadlinux-stable-08db2b3141b99b476749201eb8e164b39fa7a4ca.tar.gz
linux-stable-08db2b3141b99b476749201eb8e164b39fa7a4ca.tar.bz2
linux-stable-08db2b3141b99b476749201eb8e164b39fa7a4ca.zip
sony-laptop: use platform_device_unregister in sony_pf_remove
platform_device_unregister calls platform_device_del and platform_device_put, thus this change is logically equivalent to original code. I made this change because the documents in platform.c shows that: platform_device_del and platform_device_put must _only_ be externally called in error cases. All other usage is a bug. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform/x86/sony-laptop.c')
-rw-r--r--drivers/platform/x86/sony-laptop.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index a47fd4eef8a3..e3154ff7a39f 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -561,8 +561,7 @@ static void sony_pf_remove(void)
if (!atomic_dec_and_test(&sony_pf_users))
return;
- platform_device_del(sony_pf_device);
- platform_device_put(sony_pf_device);
+ platform_device_unregister(sony_pf_device);
platform_driver_unregister(&sony_pf_driver);
}