ACPI: Remove useless type argument of driver .remove() operation

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

ACPI: Remove useless type argument of driver .remove() operation

The second argument of ACPI driver .remove() operation is only used
by the ACPI processor driver and the value passed to that driver
through it is always available from the given struct acpi_device
object's removal_type field. For this reason, the second ACPI driver
.remove() argument is in fact useless, so drop it.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Jiang Liu <jiang.liu@huawei.com>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>

Rafael J. Wysocki 13 years ago 51fac838 cc38e519

+70 -73

44 changed files

expand all collapse all

arch

ia64

common

aml_nfw.c

x86

platform

olpc

olpc-xo15-sci.c

drivers

acpi

ac.c

acpi_memhotplug.c

acpi_pad.c

battery.c

button.c

container.c

ec.c

fan.c

hed.c

pci_link.c

pci_root.c

processor_driver.c

sbs.c

sbshc.c

scan.c

thermal.c

video.c

char

hpet.c

sonypi.c

hwmon

acpi_power_meter.c

asus_atk0110.c

i2c

busses

i2c-scmi.c

input

misc

atlas_btns.c

platform

x86

asus-laptop.c

classmate-laptop.c

eeepc-laptop.c

fujitsu-laptop.c

fujitsu-tablet.c

hp_accel.c

ideapad-laptop.c

intel_menlow.c

panasonic-laptop.c

sony-laptop.c

topstar-laptop.c

toshiba_acpi.c

toshiba_bluetooth.c

wmi.c

xo15-ebook.c

staging

quickstart

quickstart.c

video

backlight

apple_bl.c

xen

xen-acpi-pad.c

include

acpi

acpi_bus.h

+1 -1

arch/ia64/hp/common/aml_nfw.c

reviewed

··· 191 191 return aml_nfw_add_global_handler(); 192 192 } 193 193 194 194 - static int aml_nfw_remove(struct acpi_device *device, int type) 194 194 + static int aml_nfw_remove(struct acpi_device *device) 195 195 { 196 196 return aml_nfw_remove_global_handler(); 197 197 }

+1 -1

arch/x86/platform/olpc/olpc-xo15-sci.c

reviewed

··· 195 195 return r; 196 196 } 197 197 198 198 - static int xo15_sci_remove(struct acpi_device *device, int type) 198 198 + static int xo15_sci_remove(struct acpi_device *device) 199 199 { 200 200 acpi_disable_gpe(NULL, xo15_sci_gpe); 201 201 acpi_remove_gpe_handler(NULL, xo15_sci_gpe, xo15_sci_gpe_handler);

+2 -2

drivers/acpi/ac.c

reviewed

··· 60 60 #endif 61 61 62 62 static int acpi_ac_add(struct acpi_device *device); 63 63 - static int acpi_ac_remove(struct acpi_device *device, int type); 63 63 + static int acpi_ac_remove(struct acpi_device *device); 64 64 static void acpi_ac_notify(struct acpi_device *device, u32 event); 65 65 66 66 static const struct acpi_device_id ac_device_ids[] = { ··· 337 337 } 338 338 #endif 339 339 340 340 - static int acpi_ac_remove(struct acpi_device *device, int type) 340 340 + static int acpi_ac_remove(struct acpi_device *device) 341 341 { 342 342 struct acpi_ac *ac = NULL; 343 343

+2 -2

drivers/acpi/acpi_memhotplug.c

reviewed

··· 54 54 #define MEMORY_POWER_OFF_STATE 2 55 55 56 56 static int acpi_memory_device_add(struct acpi_device *device); 57 57 - static int acpi_memory_device_remove(struct acpi_device *device, int type); 57 57 + static int acpi_memory_device_remove(struct acpi_device *device); 58 58 59 59 static const struct acpi_device_id memory_device_ids[] = { 60 60 {ACPI_MEMORY_DEVICE_HID, 0}, ··· 415 415 return result; 416 416 } 417 417 418 418 - static int acpi_memory_device_remove(struct acpi_device *device, int type) 418 418 + static int acpi_memory_device_remove(struct acpi_device *device) 419 419 { 420 420 struct acpi_memory_device *mem_device = NULL; 421 421 int result;

+1 -2

drivers/acpi/acpi_pad.c

reviewed

··· 482 482 return 0; 483 483 } 484 484 485 485 - static int acpi_pad_remove(struct acpi_device *device, 486 486 - int type) 485 485 + static int acpi_pad_remove(struct acpi_device *device) 487 486 { 488 487 mutex_lock(&isolated_cpus_lock); 489 488 acpi_pad_idle_cpus(0);

+1 -1

drivers/acpi/battery.c

reviewed

··· 1111 1111 return result; 1112 1112 } 1113 1113 1114 1114 - static int acpi_battery_remove(struct acpi_device *device, int type) 1114 1114 + static int acpi_battery_remove(struct acpi_device *device) 1115 1115 { 1116 1116 struct acpi_battery *battery = NULL; 1117 1117

+2 -2

drivers/acpi/button.c

reviewed

··· 75 75 MODULE_DEVICE_TABLE(acpi, button_device_ids); 76 76 77 77 static int acpi_button_add(struct acpi_device *device); 78 78 - static int acpi_button_remove(struct acpi_device *device, int type); 78 78 + static int acpi_button_remove(struct acpi_device *device); 79 79 static void acpi_button_notify(struct acpi_device *device, u32 event); 80 80 81 81 #ifdef CONFIG_PM_SLEEP ··· 433 433 return error; 434 434 } 435 435 436 436 - static int acpi_button_remove(struct acpi_device *device, int type) 436 436 + static int acpi_button_remove(struct acpi_device *device) 437 437 { 438 438 struct acpi_button *button = acpi_driver_data(device); 439 439

+2 -2

drivers/acpi/container.c

reviewed

··· 52 52 MODULE_LICENSE("GPL"); 53 53 54 54 static int acpi_container_add(struct acpi_device *device); 55 55 - static int acpi_container_remove(struct acpi_device *device, int type); 55 55 + static int acpi_container_remove(struct acpi_device *device); 56 56 57 57 static const struct acpi_device_id container_device_ids[] = { 58 58 {"ACPI0004", 0}, ··· 125 125 return 0; 126 126 } 127 127 128 128 - static int acpi_container_remove(struct acpi_device *device, int type) 128 128 + static int acpi_container_remove(struct acpi_device *device) 129 129 { 130 130 acpi_status status = AE_OK; 131 131 struct acpi_container *pc = NULL;

+1 -1

drivers/acpi/ec.c

reviewed

··· 852 852 return ret; 853 853 } 854 854 855 855 - static int acpi_ec_remove(struct acpi_device *device, int type) 855 855 + static int acpi_ec_remove(struct acpi_device *device) 856 856 { 857 857 struct acpi_ec *ec; 858 858 struct acpi_ec_query_handler *handler, *tmp;

+2 -2

drivers/acpi/fan.c

reviewed

··· 45 45 MODULE_LICENSE("GPL"); 46 46 47 47 static int acpi_fan_add(struct acpi_device *device); 48 48 - static int acpi_fan_remove(struct acpi_device *device, int type); 48 48 + static int acpi_fan_remove(struct acpi_device *device); 49 49 50 50 static const struct acpi_device_id fan_device_ids[] = { 51 51 {"PNP0C0B", 0}, ··· 172 172 return result; 173 173 } 174 174 175 175 - static int acpi_fan_remove(struct acpi_device *device, int type) 175 175 + static int acpi_fan_remove(struct acpi_device *device) 176 176 { 177 177 struct thermal_cooling_device *cdev = acpi_driver_data(device); 178 178

+1 -1

drivers/acpi/hed.c

reviewed

··· 70 70 return 0; 71 71 } 72 72 73 73 - static int acpi_hed_remove(struct acpi_device *device, int type) 73 73 + static int acpi_hed_remove(struct acpi_device *device) 74 74 { 75 75 hed_handle = NULL; 76 76 return 0;

+2 -2

drivers/acpi/pci_link.c

reviewed

··· 54 54 #define ACPI_PCI_LINK_MAX_POSSIBLE 16 55 55 56 56 static int acpi_pci_link_add(struct acpi_device *device); 57 57 - static int acpi_pci_link_remove(struct acpi_device *device, int type); 57 57 + static int acpi_pci_link_remove(struct acpi_device *device); 58 58 59 59 static const struct acpi_device_id link_device_ids[] = { 60 60 {"PNP0C0F", 0}, ··· 766 766 } 767 767 } 768 768 769 769 - static int acpi_pci_link_remove(struct acpi_device *device, int type) 769 769 + static int acpi_pci_link_remove(struct acpi_device *device) 770 770 { 771 771 struct acpi_pci_link *link; 772 772

+2 -2

drivers/acpi/pci_root.c

reviewed

··· 46 46 #define ACPI_PCI_ROOT_CLASS "pci_bridge" 47 47 #define ACPI_PCI_ROOT_DEVICE_NAME "PCI Root Bridge" 48 48 static int acpi_pci_root_add(struct acpi_device *device); 49 49 - static int acpi_pci_root_remove(struct acpi_device *device, int type); 49 49 + static int acpi_pci_root_remove(struct acpi_device *device); 50 50 51 51 #define ACPI_PCIE_REQ_SUPPORT (OSC_EXT_PCI_CONFIG_SUPPORT \ 52 52 | OSC_ACTIVE_STATE_PWR_SUPPORT \ ··· 627 627 return result; 628 628 } 629 629 630 630 - static int acpi_pci_root_remove(struct acpi_device *device, int type) 630 630 + static int acpi_pci_root_remove(struct acpi_device *device) 631 631 { 632 632 acpi_status status; 633 633 acpi_handle handle;

+3 -3

drivers/acpi/processor_driver.c

reviewed

··· 81 81 MODULE_LICENSE("GPL"); 82 82 83 83 static int acpi_processor_add(struct acpi_device *device); 84 84 - static int acpi_processor_remove(struct acpi_device *device, int type); 84 84 + static int acpi_processor_remove(struct acpi_device *device); 85 85 static void acpi_processor_notify(struct acpi_device *device, u32 event); 86 86 static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr); 87 87 static int acpi_processor_handle_eject(struct acpi_processor *pr); ··· 610 610 return result; 611 611 } 612 612 613 613 - static int acpi_processor_remove(struct acpi_device *device, int type) 613 613 + static int acpi_processor_remove(struct acpi_device *device) 614 614 { 615 615 struct acpi_processor *pr = NULL; 616 616 ··· 623 623 if (pr->id >= nr_cpu_ids) 624 624 goto free; 625 625 626 626 - if (type == ACPI_BUS_REMOVAL_EJECT) { 626 626 + if (device->removal_type == ACPI_BUS_REMOVAL_EJECT) { 627 627 if (acpi_processor_handle_eject(pr)) 628 628 return -EINVAL; 629 629 }

+3 -3

drivers/acpi/sbs.c

reviewed

··· 130 130 131 131 #define to_acpi_sbs(x) container_of(x, struct acpi_sbs, charger) 132 132 133 133 - static int acpi_sbs_remove(struct acpi_device *device, int type); 133 133 + static int acpi_sbs_remove(struct acpi_device *device); 134 134 static int acpi_battery_get_state(struct acpi_battery *battery); 135 135 136 136 static inline int battery_scale(int log) ··· 949 949 acpi_smbus_register_callback(sbs->hc, acpi_sbs_callback, sbs); 950 950 end: 951 951 if (result) 952 952 - acpi_sbs_remove(device, 0); 952 952 + acpi_sbs_remove(device); 953 953 return result; 954 954 } 955 955 956 956 - static int acpi_sbs_remove(struct acpi_device *device, int type) 956 956 + static int acpi_sbs_remove(struct acpi_device *device) 957 957 { 958 958 struct acpi_sbs *sbs; 959 959 int id;

+2 -2

drivers/acpi/sbshc.c

reviewed

··· 33 33 }; 34 34 35 35 static int acpi_smbus_hc_add(struct acpi_device *device); 36 36 - static int acpi_smbus_hc_remove(struct acpi_device *device, int type); 36 36 + static int acpi_smbus_hc_remove(struct acpi_device *device); 37 37 38 38 static const struct acpi_device_id sbs_device_ids[] = { 39 39 {"ACPI0001", 0}, ··· 296 296 297 297 extern void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit); 298 298 299 299 - static int acpi_smbus_hc_remove(struct acpi_device *device, int type) 299 299 + static int acpi_smbus_hc_remove(struct acpi_device *device) 300 300 { 301 301 struct acpi_smb_hc *hc; 302 302

+2 -3

drivers/acpi/scan.c

reviewed

··· 577 577 ret = acpi_device_install_notify_handler(acpi_dev); 578 578 if (ret) { 579 579 if (acpi_drv->ops.remove) 580 580 - acpi_drv->ops.remove(acpi_dev, 581 581 - acpi_dev->removal_type); 580 580 + acpi_drv->ops.remove(acpi_dev); 582 581 return ret; 583 582 } 584 583 } ··· 599 600 if (acpi_drv->ops.notify) 600 601 acpi_device_remove_notify_handler(acpi_dev); 601 602 if (acpi_drv->ops.remove) 602 602 - acpi_drv->ops.remove(acpi_dev, acpi_dev->removal_type); 603 603 + acpi_drv->ops.remove(acpi_dev); 603 604 } 604 605 acpi_dev->driver = NULL; 605 606 acpi_dev->driver_data = NULL;

+2 -2

drivers/acpi/thermal.c

reviewed

··· 97 97 MODULE_PARM_DESC(psv, "Disable or override all passive trip points."); 98 98 99 99 static int acpi_thermal_add(struct acpi_device *device); 100 100 - static int acpi_thermal_remove(struct acpi_device *device, int type); 100 100 + static int acpi_thermal_remove(struct acpi_device *device); 101 101 static void acpi_thermal_notify(struct acpi_device *device, u32 event); 102 102 103 103 static const struct acpi_device_id thermal_device_ids[] = { ··· 1111 1111 return result; 1112 1112 } 1113 1113 1114 1114 - static int acpi_thermal_remove(struct acpi_device *device, int type) 1114 1114 + static int acpi_thermal_remove(struct acpi_device *device) 1115 1115 { 1116 1116 struct acpi_thermal *tz = NULL; 1117 1117

+2 -2

drivers/acpi/video.c

reviewed

··· 88 88 89 89 static int register_count = 0; 90 90 static int acpi_video_bus_add(struct acpi_device *device); 91 91 - static int acpi_video_bus_remove(struct acpi_device *device, int type); 91 91 + static int acpi_video_bus_remove(struct acpi_device *device); 92 92 static void acpi_video_bus_notify(struct acpi_device *device, u32 event); 93 93 94 94 static const struct acpi_device_id video_device_ids[] = { ··· 1740 1740 return error; 1741 1741 } 1742 1742 1743 1743 - static int acpi_video_bus_remove(struct acpi_device *device, int type) 1743 1743 + static int acpi_video_bus_remove(struct acpi_device *device) 1744 1744 { 1745 1745 struct acpi_video_bus *video = NULL; 1746 1746

+1 -1

drivers/char/hpet.c

reviewed

··· 1041 1041 return hpet_alloc(&data); 1042 1042 } 1043 1043 1044 1044 - static int hpet_acpi_remove(struct acpi_device *device, int type) 1044 1044 + static int hpet_acpi_remove(struct acpi_device *device) 1045 1045 { 1046 1046 /* XXX need to unregister clocksource, dealloc mem, etc */ 1047 1047 return -EINVAL;

+1 -1

drivers/char/sonypi.c

reviewed

··· 1142 1142 return 0; 1143 1143 } 1144 1144 1145 1145 - static int sonypi_acpi_remove(struct acpi_device *device, int type) 1145 1145 + static int sonypi_acpi_remove(struct acpi_device *device) 1146 1146 { 1147 1147 sonypi_acpi_device = NULL; 1148 1148 return 0;

+1 -1

drivers/hwmon/acpi_power_meter.c

reviewed

··· 911 911 return res; 912 912 } 913 913 914 914 - static int acpi_power_meter_remove(struct acpi_device *device, int type) 914 914 + static int acpi_power_meter_remove(struct acpi_device *device) 915 915 { 916 916 struct acpi_power_meter_resource *resource; 917 917

+2 -2

drivers/hwmon/asus_atk0110.c

reviewed

··· 190 190 }; 191 191 192 192 static int atk_add(struct acpi_device *device); 193 193 - static int atk_remove(struct acpi_device *device, int type); 193 193 + static int atk_remove(struct acpi_device *device); 194 194 static void atk_print_sensor(struct atk_data *data, union acpi_object *obj); 195 195 static int atk_read_value(struct atk_sensor_data *sensor, u64 *value); 196 196 static void atk_free_sensors(struct atk_data *data); ··· 1416 1416 return err; 1417 1417 } 1418 1418 1419 1419 - static int atk_remove(struct acpi_device *device, int type) 1419 1419 + static int atk_remove(struct acpi_device *device) 1420 1420 { 1421 1421 struct atk_data *data = device->driver_data; 1422 1422 dev_dbg(&device->dev, "removing...\n");

+1 -1

drivers/i2c/busses/i2c-scmi.c

reviewed

··· 406 406 return -EIO; 407 407 } 408 408 409 409 - static int acpi_smbus_cmi_remove(struct acpi_device *device, int type) 409 409 + static int acpi_smbus_cmi_remove(struct acpi_device *device) 410 410 { 411 411 struct acpi_smbus_cmi *smbus_cmi = acpi_driver_data(device); 412 412

+1 -1

drivers/input/misc/atlas_btns.c

reviewed

··· 121 121 return err; 122 122 } 123 123 124 124 - static int atlas_acpi_button_remove(struct acpi_device *device, int type) 124 124 + static int atlas_acpi_button_remove(struct acpi_device *device) 125 125 { 126 126 acpi_status status; 127 127

+1 -1

drivers/platform/x86/asus-laptop.c

reviewed

··· 1910 1910 return result; 1911 1911 } 1912 1912 1913 1913 - static int asus_acpi_remove(struct acpi_device *device, int type) 1913 1913 + static int asus_acpi_remove(struct acpi_device *device) 1914 1914 { 1915 1915 struct asus_laptop *asus = acpi_driver_data(device); 1916 1916

+5 -5

drivers/platform/x86/classmate-laptop.c

reviewed

··· 432 432 return error; 433 433 } 434 434 435 435 - static int cmpc_accel_remove_v4(struct acpi_device *acpi, int type) 435 435 + static int cmpc_accel_remove_v4(struct acpi_device *acpi) 436 436 { 437 437 struct input_dev *inputdev; 438 438 struct cmpc_accel *accel; ··· 668 668 return error; 669 669 } 670 670 671 671 - static int cmpc_accel_remove(struct acpi_device *acpi, int type) 671 671 + static int cmpc_accel_remove(struct acpi_device *acpi) 672 672 { 673 673 struct input_dev *inputdev; 674 674 struct cmpc_accel *accel; ··· 753 753 cmpc_tablet_idev_init); 754 754 } 755 755 756 756 - static int cmpc_tablet_remove(struct acpi_device *acpi, int type) 756 756 + static int cmpc_tablet_remove(struct acpi_device *acpi) 757 757 { 758 758 return cmpc_remove_acpi_notify_device(acpi); 759 759 } ··· 1000 1000 return retval; 1001 1001 } 1002 1002 1003 1003 - static int cmpc_ipml_remove(struct acpi_device *acpi, int type) 1003 1003 + static int cmpc_ipml_remove(struct acpi_device *acpi) 1004 1004 { 1005 1005 struct ipml200_dev *ipml; 1006 1006 ··· 1079 1079 cmpc_keys_idev_init); 1080 1080 } 1081 1081 1082 1082 - static int cmpc_keys_remove(struct acpi_device *acpi, int type) 1082 1082 + static int cmpc_keys_remove(struct acpi_device *acpi) 1083 1083 { 1084 1084 return cmpc_remove_acpi_notify_device(acpi); 1085 1085 }

+1 -1

drivers/platform/x86/eeepc-laptop.c

reviewed

··· 1501 1501 return result; 1502 1502 } 1503 1503 1504 1504 - static int eeepc_acpi_remove(struct acpi_device *device, int type) 1504 1504 + static int eeepc_acpi_remove(struct acpi_device *device) 1505 1505 { 1506 1506 struct eeepc_laptop *eeepc = acpi_driver_data(device); 1507 1507

+2 -2

drivers/platform/x86/fujitsu-laptop.c

reviewed

··· 733 733 return result; 734 734 } 735 735 736 736 - static int acpi_fujitsu_remove(struct acpi_device *device, int type) 736 736 + static int acpi_fujitsu_remove(struct acpi_device *device) 737 737 { 738 738 struct fujitsu_t *fujitsu = acpi_driver_data(device); 739 739 struct input_dev *input = fujitsu->input; ··· 938 938 return result; 939 939 } 940 940 941 941 - static int acpi_fujitsu_hotkey_remove(struct acpi_device *device, int type) 941 941 + static int acpi_fujitsu_hotkey_remove(struct acpi_device *device) 942 942 { 943 943 struct fujitsu_hotkey_t *fujitsu_hotkey = acpi_driver_data(device); 944 944 struct input_dev *input = fujitsu_hotkey->input;

+1 -1

drivers/platform/x86/fujitsu-tablet.c

reviewed

··· 431 431 return 0; 432 432 } 433 433 434 434 - static int acpi_fujitsu_remove(struct acpi_device *adev, int type) 434 434 + static int acpi_fujitsu_remove(struct acpi_device *adev) 435 435 { 436 436 free_irq(fujitsu.irq, fujitsu_interrupt); 437 437 release_region(fujitsu.io_base, fujitsu.io_length);

+1 -1

drivers/platform/x86/hp_accel.c

reviewed

··· 337 337 return ret; 338 338 } 339 339 340 340 - static int lis3lv02d_remove(struct acpi_device *device, int type) 340 340 + static int lis3lv02d_remove(struct acpi_device *device) 341 341 { 342 342 if (!device) 343 343 return -EINVAL;

+1 -1

drivers/platform/x86/ideapad-laptop.c

reviewed

··· 834 834 return ret; 835 835 } 836 836 837 837 - static int ideapad_acpi_remove(struct acpi_device *adevice, int type) 837 837 + static int ideapad_acpi_remove(struct acpi_device *adevice) 838 838 { 839 839 struct ideapad_private *priv = dev_get_drvdata(&adevice->dev); 840 840 int i;

+1 -1

drivers/platform/x86/intel_menlow.c

reviewed

··· 200 200 201 201 } 202 202 203 203 - static int intel_menlow_memory_remove(struct acpi_device *device, int type) 203 203 + static int intel_menlow_memory_remove(struct acpi_device *device) 204 204 { 205 205 struct thermal_cooling_device *cdev = acpi_driver_data(device); 206 206

+2 -2

drivers/platform/x86/panasonic-laptop.c

reviewed

··· 176 176 /* R1 handles SINF_AC_CUR_BRIGHT as SINF_CUR_BRIGHT, doesn't know AC state */ 177 177 178 178 static int acpi_pcc_hotkey_add(struct acpi_device *device); 179 179 - static int acpi_pcc_hotkey_remove(struct acpi_device *device, int type); 179 179 + static int acpi_pcc_hotkey_remove(struct acpi_device *device); 180 180 static void acpi_pcc_hotkey_notify(struct acpi_device *device, u32 event); 181 181 182 182 static const struct acpi_device_id pcc_device_ids[] = { ··· 663 663 return 0; 664 664 } 665 665 666 666 - static int acpi_pcc_hotkey_remove(struct acpi_device *device, int type) 666 666 + static int acpi_pcc_hotkey_remove(struct acpi_device *device) 667 667 { 668 668 struct pcc_acpi *pcc = acpi_driver_data(device); 669 669

+2 -2

drivers/platform/x86/sony-laptop.c

reviewed

··· 2740 2740 return result; 2741 2741 } 2742 2742 2743 2743 - static int sony_nc_remove(struct acpi_device *device, int type) 2743 2743 + static int sony_nc_remove(struct acpi_device *device) 2744 2744 { 2745 2745 struct sony_nc_value *item; 2746 2746 ··· 4111 4111 * ACPI driver 4112 4112 * 4113 4113 *****************/ 4114 4114 - static int sony_pic_remove(struct acpi_device *device, int type) 4114 4114 + static int sony_pic_remove(struct acpi_device *device) 4115 4115 { 4116 4116 struct sony_pic_ioport *io, *tmp_io; 4117 4117 struct sony_pic_irq *irq, *tmp_irq;

+1 -1

drivers/platform/x86/topstar-laptop.c

reviewed

··· 157 157 return -ENODEV; 158 158 } 159 159 160 160 - static int acpi_topstar_remove(struct acpi_device *device, int type) 160 160 + static int acpi_topstar_remove(struct acpi_device *device) 161 161 { 162 162 struct topstar_hkey *tps_hkey = acpi_driver_data(device); 163 163

+2 -2

drivers/platform/x86/toshiba_acpi.c

reviewed

··· 1118 1118 return 0; 1119 1119 } 1120 1120 1121 1121 - static int toshiba_acpi_remove(struct acpi_device *acpi_dev, int type) 1121 1121 + static int toshiba_acpi_remove(struct acpi_device *acpi_dev) 1122 1122 { 1123 1123 struct toshiba_acpi_dev *dev = acpi_driver_data(acpi_dev); 1124 1124 ··· 1250 1250 return 0; 1251 1251 1252 1252 error: 1253 1253 - toshiba_acpi_remove(acpi_dev, 0); 1253 1253 + toshiba_acpi_remove(acpi_dev); 1254 1254 return ret; 1255 1255 } 1256 1256

+2 -2

drivers/platform/x86/toshiba_bluetooth.c

reviewed

··· 32 32 33 33 34 34 static int toshiba_bt_rfkill_add(struct acpi_device *device); 35 35 - static int toshiba_bt_rfkill_remove(struct acpi_device *device, int type); 35 35 + static int toshiba_bt_rfkill_remove(struct acpi_device *device); 36 36 static void toshiba_bt_rfkill_notify(struct acpi_device *device, u32 event); 37 37 38 38 static const struct acpi_device_id bt_device_ids[] = { ··· 122 122 return result; 123 123 } 124 124 125 125 - static int toshiba_bt_rfkill_remove(struct acpi_device *device, int type) 125 125 + static int toshiba_bt_rfkill_remove(struct acpi_device *device) 126 126 { 127 127 /* clean up */ 128 128 return 0;

+2 -2

drivers/platform/x86/wmi.c

reviewed

··· 92 92 MODULE_PARM_DESC(debug_dump_wdg, 93 93 "Dump available WMI interfaces [0/1]"); 94 94 95 95 - static int acpi_wmi_remove(struct acpi_device *device, int type); 95 95 + static int acpi_wmi_remove(struct acpi_device *device); 96 96 static int acpi_wmi_add(struct acpi_device *device); 97 97 static void acpi_wmi_notify(struct acpi_device *device, u32 event); 98 98 ··· 917 917 } 918 918 } 919 919 920 920 - static int acpi_wmi_remove(struct acpi_device *device, int type) 920 920 + static int acpi_wmi_remove(struct acpi_device *device) 921 921 { 922 922 acpi_remove_address_space_handler(device->handle, 923 923 ACPI_ADR_SPACE_EC, &acpi_wmi_ec_space_handler);

+1 -1

drivers/platform/x86/xo15-ebook.c

reviewed

··· 150 150 return error; 151 151 } 152 152 153 153 - static int ebook_switch_remove(struct acpi_device *device, int type) 153 153 + static int ebook_switch_remove(struct acpi_device *device) 154 154 { 155 155 struct ebook_switch *button = acpi_driver_data(device); 156 156

+1 -1

drivers/staging/quickstart/quickstart.c

reviewed

··· 296 296 return ret; 297 297 } 298 298 299 299 - static int quickstart_acpi_remove(struct acpi_device *device, int type) 299 299 + static int quickstart_acpi_remove(struct acpi_device *device) 300 300 { 301 301 acpi_status status; 302 302 struct quickstart_acpi *quickstart;

+1 -1

drivers/video/backlight/apple_bl.c

reviewed

··· 196 196 return 0; 197 197 } 198 198 199 199 - static int apple_bl_remove(struct acpi_device *dev, int type) 199 199 + static int apple_bl_remove(struct acpi_device *dev) 200 200 { 201 201 backlight_device_unregister(apple_backlight_device); 202 202

+1 -2

drivers/xen/xen-acpi-pad.c

reviewed

··· 140 140 return 0; 141 141 } 142 142 143 143 - static int acpi_pad_remove(struct acpi_device *device, 144 144 - int type) 143 143 + static int acpi_pad_remove(struct acpi_device *device) 145 144 { 146 145 mutex_lock(&xen_cpu_lock); 147 146 xen_acpi_pad_idle_cpus(0);

+1 -1

include/acpi/acpi_bus.h

reviewed

··· 89 89 */ 90 90 91 91 typedef int (*acpi_op_add) (struct acpi_device * device); 92 92 - typedef int (*acpi_op_remove) (struct acpi_device * device, int type); 92 92 + typedef int (*acpi_op_remove) (struct acpi_device * device); 93 93 typedef int (*acpi_op_start) (struct acpi_device * device); 94 94 typedef void (*acpi_op_notify) (struct acpi_device * device, u32 event); 95 95