summaryrefslogtreecommitdiff
path: root/drivers/staging/media/atomisp/pci/atomisp2/atomisp_dfs_tables.h
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2017-03-20 14:40:20 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-21 08:04:32 +0100
commit08dcded491c90229295027771447bf0ff9882be6 (patch)
treeac3c0d965a47520b3c7047dd00198fe77cd3045f /drivers/staging/media/atomisp/pci/atomisp2/atomisp_dfs_tables.h
parent9bc30b3a7951a2568817a8c8024e6bdc469e305e (diff)
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/atomisp_dfs_tables.h')
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/atomisp_dfs_tables.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_dfs_tables.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_dfs_tables.h
index dfb94e67459c..204d941cdb6c 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_dfs_tables.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_dfs_tables.h
@@ -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__ */