On Wed, 18 Sep 2024, Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> wrote: > On Wed, Sep 18, 2024 at 05:50:42PM +0300, Jani Nikula wrote: >> diff --git a/drivers/gpu/drm/i915/soc/intel_pch.c b/drivers/gpu/drm/i915/soc/intel_pch.c >> index 542eea50093c..f7e3745bb1dc 100644 >> --- a/drivers/gpu/drm/i915/soc/intel_pch.c >> +++ b/drivers/gpu/drm/i915/soc/intel_pch.c >> @@ -122,9 +122,12 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) >> case INTEL_PCH_TGP_DEVICE_ID_TYPE: >> case INTEL_PCH_TGP2_DEVICE_ID_TYPE: >> drm_dbg_kms(&dev_priv->drm, "Found Tiger Lake LP PCH\n"); >> - drm_WARN_ON(&dev_priv->drm, !IS_TIGERLAKE(dev_priv) && >> - !IS_ROCKETLAKE(dev_priv) && >> - !IS_GEN9_BC(dev_priv)); >> + drm_WARN_ON(&dev_priv->drm, !(IS_TIGERLAKE(dev_priv) || >> + IS_ROCKETLAKE(dev_priv) || >> + IS_SKYLAKE(dev_priv) || >> + IS_KABYLAKE(dev_priv) || >> + IS_COFFEELAKE(dev_priv) || >> + IS_COMETLAKE(dev_priv))); > > The !A&&!B form seems more popular in these, so I'd suggest > using that. JSP looks to be the only one that had to do it > differently for whatever reason... > > Either way > Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Thanks, I'll need to rebase the series anyway, I'll switch to the more common style. BR, Jani. -- Jani Nikula, Intel
