Commit 08dcded4 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

atomisp: remove another pair of 2400/2401 differences 



The first of these checks the PCI identifier in order to decide what to do so needs no
ifdef. The other is simply a variation on what is dumped for debug - so favour dumping the
most.

Signed-off-by Alan Cox <alan@linux.intel.com>

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9bc30b3a

drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c

+0 −7
Original line number Diff line number Diff line
@@ -263,12 +263,10 @@ int atomisp_freq_scaling(struct atomisp_device *isp, 
		return -EINVAL;

	}



#ifdef ISP2401

	if ((isp->pdev->device & ATOMISP_PCI_DEVICE_SOC_MASK) ==

		ATOMISP_PCI_DEVICE_SOC_CHT && ATOMISP_USE_YUVPP(asd))

		isp->dfs = &dfs_config_cht_soc;



#endif

	if (isp->dfs->lowest_freq == 0 || isp->dfs->max_freq_at_vmin == 0 ||

	    isp->dfs->highest_freq == 0 || isp->dfs->dfs_table_size == 0 ||

	    !isp->dfs->dfs_table) {
@@ -654,13 +652,8 @@ irqreturn_t atomisp_isr(int irq, void *dev) 
			}



			atomisp_eof_event(asd, eof_event.event.exp_id);

#ifndef ISP2401

			dev_dbg(isp->dev, "%s EOF exp_id %d\n", __func__,

				eof_event.event.exp_id);

#else

			dev_dbg(isp->dev, "%s EOF exp_id %d, asd %d\n",

				__func__, eof_event.event.exp_id, asd->index);

#endif

		}



		irq_infos &= ~IA_CSS_IRQ_INFO_ISYS_EVENTS_READY;

drivers/staging/media/atomisp/pci/atomisp2/atomisp_dfs_tables.h

+0 −4
Original line number Diff line number Diff line
@@ -340,7 +340,6 @@ static const struct atomisp_freq_scaling_rule dfs_rules_cht[] = { 
		.run_mode = ATOMISP_RUN_MODE_PREVIEW,

	},

	{

#ifdef ISP2401

		.width = 1280,

		.height = 720,

		.fps = ISP_FREQ_RULE_ANY,
@@ -386,7 +385,6 @@ static const struct atomisp_freq_scaling_rule dfs_rules_cht_soc[] = { 
		.run_mode = ATOMISP_RUN_MODE_PREVIEW,

	},

	{

#endif

		.width = ISP_FREQ_RULE_ANY,

		.height = ISP_FREQ_RULE_ANY,

		.fps = ISP_FREQ_RULE_ANY,
@@ -403,7 +401,6 @@ static const struct atomisp_dfs_config dfs_config_cht = { 
	.dfs_table_size = ARRAY_SIZE(dfs_rules_cht),

};



#ifdef ISP2401

static const struct atomisp_dfs_config dfs_config_cht_soc = {

	.lowest_freq = ISP_FREQ_100MHZ,

	.max_freq_at_vmin = ISP_FREQ_356MHZ,
@@ -412,5 +409,4 @@ static const struct atomisp_dfs_config dfs_config_cht_soc = { 
	.dfs_table_size = ARRAY_SIZE(dfs_rules_cht_soc),

};



#endif

#endif /* __ATOMISP_DFS_TABLES_H__ */