diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2024-12-20 15:31:19 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2024-12-20 15:31:19 +0100 |
| commit | c2db11a750fb626d0d04f2dc76e548a1f07617df (patch) | |
| tree | 01c899b2a06855633ae991f2064242f976987809 /include/linux/platform_device.h | |
| parent | 63a48181fbcddefe5fb4c6618938bb64c543945b (diff) | |
| parent | 4a077914578183ec397ad09f7156a357e00e5d72 (diff) | |
Merge branch 'locking/urgent'
Sync with urgent -- avoid conflicts.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'include/linux/platform_device.h')
| -rw-r--r-- | include/linux/platform_device.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 7132623e4658..074754c23d33 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -235,17 +235,7 @@ extern void platform_device_put(struct platform_device *pdev); struct platform_driver { int (*probe)(struct platform_device *); - - /* - * .remove_new() is a relic from a prototype conversion of .remove(). - * New drivers are supposed to implement .remove(). Once all drivers are - * converted to not use .remove_new any more, it will be dropped. - */ - union { - void (*remove)(struct platform_device *); - void (*remove_new)(struct platform_device *); - }; - + void (*remove)(struct platform_device *); void (*shutdown)(struct platform_device *); int (*suspend)(struct platform_device *, pm_message_t state); int (*resume)(struct platform_device *); |