Commit 8baf82b368d23aed5c96b01ed7110cdccdd18725
Committed by
David S. Miller
David S. Miller
1 parent
03ce758e56
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
CONFIG_HOTPLUG removal from networking core
CONFIG_HOTPLUG is always enabled now, so remove the unused code that was trying to be compiled out when this option was disabled, in the networking core. Cc: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 3 changed files with 0 additions and 15 deletions Side-by-side Diff
net/core/net-sysfs.c
| ... | ... | @@ -1334,7 +1334,6 @@ |
| 1334 | 1334 | }; |
| 1335 | 1335 | EXPORT_SYMBOL_GPL(net_ns_type_operations); |
| 1336 | 1336 | |
| 1337 | -#ifdef CONFIG_HOTPLUG | |
| 1338 | 1337 | static int netdev_uevent(struct device *d, struct kobj_uevent_env *env) |
| 1339 | 1338 | { |
| 1340 | 1339 | struct net_device *dev = to_net_dev(d); |
| ... | ... | @@ -1353,7 +1352,6 @@ |
| 1353 | 1352 | exit: |
| 1354 | 1353 | return retval; |
| 1355 | 1354 | } |
| 1356 | -#endif | |
| 1357 | 1355 | |
| 1358 | 1356 | /* |
| 1359 | 1357 | * netdev_release -- destroy and free a dead device. |
| 1360 | 1358 | |
| ... | ... | @@ -1382,9 +1380,7 @@ |
| 1382 | 1380 | #ifdef CONFIG_SYSFS |
| 1383 | 1381 | .dev_attrs = net_class_attributes, |
| 1384 | 1382 | #endif /* CONFIG_SYSFS */ |
| 1385 | -#ifdef CONFIG_HOTPLUG | |
| 1386 | 1383 | .dev_uevent = netdev_uevent, |
| 1387 | -#endif | |
| 1388 | 1384 | .ns_type = &net_ns_type_operations, |
| 1389 | 1385 | .namespace = net_namespace, |
| 1390 | 1386 | }; |
net/wireless/reg.c
| ... | ... | @@ -2365,7 +2365,6 @@ |
| 2365 | 2365 | return r; |
| 2366 | 2366 | } |
| 2367 | 2367 | |
| 2368 | -#ifdef CONFIG_HOTPLUG | |
| 2369 | 2368 | int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env) |
| 2370 | 2369 | { |
| 2371 | 2370 | if (last_request && !last_request->processed) { |
| ... | ... | @@ -2377,12 +2376,6 @@ |
| 2377 | 2376 | |
| 2378 | 2377 | return 0; |
| 2379 | 2378 | } |
| 2380 | -#else | |
| 2381 | -int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env) | |
| 2382 | -{ | |
| 2383 | - return -ENODEV; | |
| 2384 | -} | |
| 2385 | -#endif /* CONFIG_HOTPLUG */ | |
| 2386 | 2379 | |
| 2387 | 2380 | void wiphy_regulatory_register(struct wiphy *wiphy) |
| 2388 | 2381 | { |
net/wireless/sysfs.c
| ... | ... | @@ -77,13 +77,11 @@ |
| 77 | 77 | cfg80211_dev_free(rdev); |
| 78 | 78 | } |
| 79 | 79 | |
| 80 | -#ifdef CONFIG_HOTPLUG | |
| 81 | 80 | static int wiphy_uevent(struct device *dev, struct kobj_uevent_env *env) |
| 82 | 81 | { |
| 83 | 82 | /* TODO, we probably need stuff here */ |
| 84 | 83 | return 0; |
| 85 | 84 | } |
| 86 | -#endif | |
| 87 | 85 | |
| 88 | 86 | static int wiphy_suspend(struct device *dev, pm_message_t state) |
| 89 | 87 | { |
| 90 | 88 | |
| ... | ... | @@ -134,9 +132,7 @@ |
| 134 | 132 | .owner = THIS_MODULE, |
| 135 | 133 | .dev_release = wiphy_dev_release, |
| 136 | 134 | .dev_attrs = ieee80211_dev_attrs, |
| 137 | -#ifdef CONFIG_HOTPLUG | |
| 138 | 135 | .dev_uevent = wiphy_uevent, |
| 139 | -#endif | |
| 140 | 136 | .suspend = wiphy_suspend, |
| 141 | 137 | .resume = wiphy_resume, |
| 142 | 138 | .ns_type = &net_ns_type_operations, |