Skip to content

Commit 4100601

Browse files
committed
fix: platform_driver.remove void + osal list macros for 7.0
Signed-off-by: Vasiliy Yakovlev <vixand@openipc.org>
1 parent 8d5c0fd commit 4100601

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

kernel/adc/adc_init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ static int adc_probe(struct platform_device *pdev)
3535
return lsadc_init();
3636
}
3737

38-
static int adc_remove(struct platform_device *pdev)
38+
static void adc_remove(struct platform_device *pdev)
3939
{
4040
lsadc_exit();
41-
return 0;
41+
return;
4242
}
4343

4444
static const struct of_device_id adc_match[] = {

kernel/osal/linux/kernel/mmz/mmz-userdev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,7 @@ static int mmz_userdev_release(struct inode *inode, struct file *file)
908908
struct mmz_userdev_info *pmu = file->private_data;
909909
struct mmb_info *p = NULL, *n = NULL;
910910

911-
list_for_each_entry_safe(p, n, &pmu->list, list) {
911+
osal_list_for_each_entry_safe(p, n, &pmu->list, list) {
912912
mmz_error("MMB LEAK(pid=%d): 0x%lX, %lu bytes, '%s'\n", pmu->pid,
913913
mmz_mmb_phys(p->mmb), mmz_mmb_length(p->mmb),
914914
mmz_mmb_name(p->mmb));

kernel/wdt/wdt_init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ static int wdg_probe(struct platform_device *pdev)
4343
return watchdog_init();
4444
}
4545

46-
static int wdg_remove(struct platform_device *pdev)
46+
static void wdg_remove(struct platform_device *pdev)
4747
{
4848
watchdog_exit();
49-
return 0;
49+
return;
5050
}
5151

5252
static const struct of_device_id wdg_match[] = {

0 commit comments

Comments
 (0)