summaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/eeepc-laptop.c
diff options
context:
space:
mode:
authorAlan Jenkins <alan-jenkins@tuffmail.co.uk>2009-12-03 07:44:53 +0000
committerLen Brown <len.brown@intel.com>2009-12-09 15:54:30 -0500
commitfbe3d8942e8fd1e947e4d11a3e9e15675a1cac7e (patch)
tree59325f54e9f2d10d8bfea3a2a1ae5ca82d181c1d /drivers/platform/x86/eeepc-laptop.c
parent3c0eb510697dbbb53674c72544350624a04ab5b4 (diff)
downloadblackbird-op-linux-fbe3d8942e8fd1e947e4d11a3e9e15675a1cac7e.tar.gz
blackbird-op-linux-fbe3d8942e8fd1e947e4d11a3e9e15675a1cac7e.zip
eeepc-laptop: Remove redundant NULL checks
The acpi device callbacks add, start, remove, suspend and resume can never be called with a NULL acpi_device. Each callsite in acpi/scan.c has to dereference the device in order to get the ops structure, e.g. struct acpi_device *acpi_dev = to_acpi_device(dev); struct acpi_driver *acpi_drv = acpi_dev->driver; if (acpi_drv && acpi_drv->ops.suspend) return acpi_drv->ops.suspend(acpi_dev, state); Remove all checks for acpi_dev == NULL within these callbacks. Also remove the checks for acpi_driver_data(acpi_dev) == NULL. None of these checks could fail unless the driver does something strange (which none of them do), the acpi core did something terribly wrong, or we have a memory corruption issue. If this does happen then it's best to dereference the pointer and crash noisily. Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform/x86/eeepc-laptop.c')
-rw-r--r--drivers/platform/x86/eeepc-laptop.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 91304342f8b6..7dde47a67997 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -1255,8 +1255,6 @@ static int __devinit eeepc_hotk_add(struct acpi_device *device)
struct device *dev;
int result;
- if (!device)
- return -EINVAL;
pr_notice(EEEPC_HOTK_NAME "\n");
ehotk = kzalloc(sizeof(struct eeepc_hotk), GFP_KERNEL);
if (!ehotk)
@@ -1343,9 +1341,6 @@ fail_platform_driver:
static int eeepc_hotk_remove(struct acpi_device *device, int type)
{
- if (!device || !acpi_driver_data(device))
- return -EINVAL;
-
eeepc_backlight_exit();
eeepc_rfkill_exit();
eeepc_input_exit();
OpenPOWER on IntegriCloud