aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-02-08 17:52:23 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-02-13 07:41:39 -0500
commit38475b3be1517a16d263b0b04dae862bf7027d48 (patch)
tree811cf3cf543724af813907dbd6df024009b55c6a /drivers
parent5f27ee8e1261e47ec2e9dbebf17e87e55f568d75 (diff)
ACPI / scan: Remove useless #ifndef from acpi_eject_store()
Since the FORCE_EJECT symbol is never defined, the #ifndef FORCE_EJECT in acpi_eject_store() is always true, so drop it. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> Tested-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> Reviewed-by: Toshi Kani <toshi.kani@hp.com> Tested-by: Toshi Kani <toshi.kani@hp.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/scan.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index bf6e2c26f52d..5bc2641fba8a 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -202,12 +202,10 @@ acpi_eject_store(struct device *d, struct device_attribute *attr,
202 if ((!count) || (buf[0] != '1')) { 202 if ((!count) || (buf[0] != '1')) {
203 return -EINVAL; 203 return -EINVAL;
204 } 204 }
205#ifndef FORCE_EJECT
206 if (!acpi_device->driver && !acpi_device->handler) { 205 if (!acpi_device->driver && !acpi_device->handler) {
207 ret = -ENODEV; 206 ret = -ENODEV;
208 goto err; 207 goto err;
209 } 208 }
210#endif
211 status = acpi_get_type(acpi_device->handle, &type); 209 status = acpi_get_type(acpi_device->handle, &type);
212 if (ACPI_FAILURE(status) || (!acpi_device->flags.ejectable)) { 210 if (ACPI_FAILURE(status) || (!acpi_device->flags.ejectable)) {
213 ret = -ENODEV; 211 ret = -ENODEV;