diff options
| author | Alan Cox <alan@linux.intel.com> | 2017-03-06 11:21:04 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-06 12:31:17 +0100 |
| commit | cc4e33d961276bd2e72add5188a124f51c11801d (patch) | |
| tree | d747d0ebe59c5ed5601cd411e83c087cdbfd9105 /drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c | |
| parent | c9d9602f36d0b4fb2ac55506cffddc797a3954fc (diff) | |
atomisp2: unify some ifdef cases caused by format changes
The two drivers were originally merged by tools, and the tools didn't always
spot white space only changes. Fix a few of them found by zero-day and clean
up some more by hand.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c index 9d6d67cf6686..800562dc604a 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c @@ -906,9 +906,7 @@ static int atomisp_register_entities(struct atomisp_device *isp) strlcpy(isp->media_dev.model, "Intel Atom ISP", sizeof(isp->media_dev.model)); -#ifndef ISP2401 -#endif media_device_init(&isp->media_dev); isp->v4l2_dev.mdev = &isp->media_dev; ret = v4l2_device_register(isp->dev, &isp->v4l2_dev); @@ -1545,16 +1543,12 @@ load_fw_fail: atomisp_msi_irq_uninit(isp, dev); atomisp_ospm_dphy_down(isp); -#ifndef ISP2401 + /* Address later when we worry about the ...field chips */ -#endif if (ATOMISP_INTERNAL_PM) { if (atomisp_mrfld_power_down(isp)) dev_err(&dev->dev, "Failed to switch off ISP\n"); } -#ifdef ISP2401 - -#endif pci_dev_put(isp->pci_root); return err; } |