Message ID | 20171006090209.67852-1-michal.wajdeczko@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Quoting Michal Wajdeczko (2017-10-06 10:02:09) > Fix includes order and make sure we only include required headers. > While here, make intel_huc.h header self-contained. > > Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > --- > drivers/gpu/drm/i915/intel_huc.c | 6 ++++-- > drivers/gpu/drm/i915/intel_huc.h | 2 ++ > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c > index 3f796fe..4b4cf56 100644 > --- a/drivers/gpu/drm/i915/intel_huc.c > +++ b/drivers/gpu/drm/i915/intel_huc.c > @@ -21,9 +21,11 @@ > * IN THE SOFTWARE. > * > */ > -#include <linux/firmware.h> > + > +#include <linux/types.h> > + > +#include "intel_huc.h" > #include "i915_drv.h" > -#include "intel_uc.h" > > /** > * DOC: HuC Firmware > diff --git a/drivers/gpu/drm/i915/intel_huc.h b/drivers/gpu/drm/i915/intel_huc.h > index d58422b..aaa38b9 100644 > --- a/drivers/gpu/drm/i915/intel_huc.h > +++ b/drivers/gpu/drm/i915/intel_huc.h > @@ -25,6 +25,8 @@ > #ifndef _INTEL_HUC_H_ > #define _INTEL_HUC_H_ > > +#include "intel_uc_fw.h" > + > struct intel_huc { > /* Generic uC firmware management */ > struct intel_uc_fw fw; Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Applied to my queue, thanks. -Chris
diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c index 3f796fe..4b4cf56 100644 --- a/drivers/gpu/drm/i915/intel_huc.c +++ b/drivers/gpu/drm/i915/intel_huc.c @@ -21,9 +21,11 @@ * IN THE SOFTWARE. * */ -#include <linux/firmware.h> + +#include <linux/types.h> + +#include "intel_huc.h" #include "i915_drv.h" -#include "intel_uc.h" /** * DOC: HuC Firmware diff --git a/drivers/gpu/drm/i915/intel_huc.h b/drivers/gpu/drm/i915/intel_huc.h index d58422b..aaa38b9 100644 --- a/drivers/gpu/drm/i915/intel_huc.h +++ b/drivers/gpu/drm/i915/intel_huc.h @@ -25,6 +25,8 @@ #ifndef _INTEL_HUC_H_ #define _INTEL_HUC_H_ +#include "intel_uc_fw.h" + struct intel_huc { /* Generic uC firmware management */ struct intel_uc_fw fw;
Fix includes order and make sure we only include required headers. While here, make intel_huc.h header self-contained. Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/intel_huc.c | 6 ++++-- drivers/gpu/drm/i915/intel_huc.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-)