Commit 9b4a8dd2e9f8af206eb39e3d99c442b0d6158953
Committed by
Paul Mackerras
Paul Mackerras
1 parent
f0c426bc35
Exists in
master
and in
7 other branches
drivers/macintosh: Various cleanups
This contains the following cleanups: - make the following needlessly global code static: - adb.c: adb_controller - adb.c: adb_init() - adbhid.c: adb_to_linux_keycodes[] (also make it const) - via-pmu68k.c: backlight_level - via-pmu68k.c: backlight_enabled - remove the following unused code: - via-pmu68k.c: sleep_notifier_list Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Showing 4 changed files with 5 additions and 8 deletions Side-by-side Diff
drivers/macintosh/adb.c
| ... | ... | @@ -46,7 +46,6 @@ |
| 46 | 46 | #endif |
| 47 | 47 | |
| 48 | 48 | |
| 49 | -EXPORT_SYMBOL(adb_controller); | |
| 50 | 49 | EXPORT_SYMBOL(adb_client_list); |
| 51 | 50 | |
| 52 | 51 | extern struct adb_driver via_macii_driver; |
| ... | ... | @@ -80,7 +79,7 @@ |
| 80 | 79 | |
| 81 | 80 | static struct class *adb_dev_class; |
| 82 | 81 | |
| 83 | -struct adb_driver *adb_controller; | |
| 82 | +static struct adb_driver *adb_controller; | |
| 84 | 83 | BLOCKING_NOTIFIER_HEAD(adb_client_list); |
| 85 | 84 | static int adb_got_sleep; |
| 86 | 85 | static int adb_inited; |
| ... | ... | @@ -290,7 +289,7 @@ |
| 290 | 289 | } |
| 291 | 290 | #endif /* CONFIG_PM */ |
| 292 | 291 | |
| 293 | -int __init adb_init(void) | |
| 292 | +static int __init adb_init(void) | |
| 294 | 293 | { |
| 295 | 294 | struct adb_driver *driver; |
| 296 | 295 | int i; |
drivers/macintosh/adbhid.c
drivers/macintosh/via-pmu68k.c
| ... | ... | @@ -101,7 +101,6 @@ |
| 101 | 101 | static int pmu_fully_inited; |
| 102 | 102 | |
| 103 | 103 | int asleep; |
| 104 | -BLOCKING_NOTIFIER_HEAD(sleep_notifier_list); | |
| 105 | 104 | |
| 106 | 105 | static int pmu_probe(void); |
| 107 | 106 | static int pmu_init(void); |
| ... | ... | @@ -741,8 +740,8 @@ |
| 741 | 740 | } |
| 742 | 741 | } |
| 743 | 742 | |
| 744 | -int backlight_level = -1; | |
| 745 | -int backlight_enabled = 0; | |
| 743 | +static int backlight_level = -1; | |
| 744 | +static int backlight_enabled = 0; | |
| 746 | 745 | |
| 747 | 746 | #define LEVEL_TO_BRIGHT(lev) ((lev) < 1? 0x7f: 0x4a - ((lev) << 1)) |
| 748 | 747 |
include/linux/adb.h
| ... | ... | @@ -84,7 +84,6 @@ |
| 84 | 84 | ADB_MSG_PRE_RESET, /* Called before resetting the bus */ |
| 85 | 85 | ADB_MSG_POST_RESET /* Called after resetting the bus (re-do init & register) */ |
| 86 | 86 | }; |
| 87 | -extern struct adb_driver *adb_controller; | |
| 88 | 87 | extern struct blocking_notifier_head adb_client_list; |
| 89 | 88 | |
| 90 | 89 | int adb_request(struct adb_request *req, void (*done)(struct adb_request *), |