Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
-       fujitsu->acpi_handle = 0;
+       fujitsu->acpi_handle = NULL;
 
        return 0;
 }
 
        sp->irq = pdev->irq;
        sp->base_address = ioremap(pci_resource_start(pdev, 0),
                                        pci_resource_len(pdev, 0));
-       if (sp->base_address == 0) {
+       if (!sp->base_address) {
                dev_err(sp->dev, "Failed to ioremap pci memory\n");
                result =  -ENODEV;
                goto error_ioremap;
 
 {
        int i;
 
-       if (cpoint_name == INVALID || cpoint_type == NONE ||
+       if (cpoint_name == NULL || cpoint_type == NULL ||
                                        cpoint_count < 1 || recur_count < 1)
                return -EINVAL;