On Thu, Oct 21, 2021 at 11:18:47AM -0700, Lucas De Marchi wrote: > We left the definition IS_CANNONLAKE() macro while removing it from the > tree due to having to merge the changes in different branches. Now that > everything is back in sync and nobody is using IS_CANNONLAKE(), we can > safely ditch it. > > Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx> Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> I found another leftover somewhere else, but now I forgot where it was. I guess it'll come back to me eventually. > --- > drivers/gpu/drm/i915/i915_drv.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 357faa043b3a..5e23c0273cf0 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1431,7 +1431,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, > #define IS_GEMINILAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_GEMINILAKE) > #define IS_COFFEELAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_COFFEELAKE) > #define IS_COMETLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_COMETLAKE) > -#define IS_CANNONLAKE(dev_priv) 0 > #define IS_ICELAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ICELAKE) > #define IS_JSL_EHL(dev_priv) (IS_PLATFORM(dev_priv, INTEL_JASPERLAKE) || \ > IS_PLATFORM(dev_priv, INTEL_ELKHARTLAKE)) > -- > 2.33.1 -- Ville Syrjälä Intel
