Skip to content

Commit f4f7cfe

Browse files
committed
char: ipmi_si_ls2k500: convert to the .remove_new (void) callback
With commit 74a5b94 ("ARM: Convert to platform remove callback returning void"), the .remove() callback for platform drivers was refactored into void (previously int), with the callback renamed as .remove_new(). Follow the commit and refactor this driver. Signed-off-by: Mingcong Bai <[email protected]>
1 parent d703daf commit f4f7cfe

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

drivers/char/ipmi/ipmi_si_ls2k500.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,9 @@ static int of_ipmi_ls2k500_probe(struct platform_device *pdev)
137137
return rv;
138138
}
139139

140-
static int ipmi_ls2k500_remove(struct platform_device *pdev)
140+
static void ipmi_ls2k500_remove(struct platform_device *pdev)
141141
{
142142
ipmi_si_remove_by_dev(&pdev->dev);
143-
144-
return 0;
145143
}
146144

147145
#define LS2K500_SI_DEVICE_NAME "ipmi_ls2k500_si"
@@ -150,7 +148,7 @@ struct platform_driver ipmi_ls2k500_platform_driver = {
150148
.name = LS2K500_SI_DEVICE_NAME,
151149
},
152150
.probe = of_ipmi_ls2k500_probe,
153-
.remove = ipmi_ls2k500_remove,
151+
.remove_new = ipmi_ls2k500_remove,
154152
};
155153

156154
static bool platform_registered;

drivers/video/fbdev/ls2k500sfb.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -627,14 +627,12 @@ static int simplefb_probe(struct platform_device *pdev)
627627
return ret;
628628
}
629629

630-
static int simplefb_remove(struct platform_device *pdev)
630+
static void simplefb_remove(struct platform_device *pdev)
631631
{
632632
struct fb_info *info = platform_get_drvdata(pdev);
633633

634634
unregister_framebuffer(info);
635635
framebuffer_release(info);
636-
637-
return 0;
638636
}
639637

640638
static struct platform_driver simplefb_driver = {

0 commit comments

Comments
 (0)