> -----Original Message----- > From: Nikula, Jani <jani.nikula@xxxxxxxxx> > Sent: Friday, February 7, 2025 4:11 PM > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx; intel-xe@xxxxxxxxxxxxxxxxxxxxx > Cc: Nikula, Jani <jani.nikula@xxxxxxxxx>; Kandpal, Suraj > <suraj.kandpal@xxxxxxxxx> > Subject: [PATCH 2/3] drm/i915/hdcp: rename intel_connector to connector > > Follow the current convention of naming struct intel_connector pointers > connector. > > Cc: Suraj Kandpal <suraj.kandpal@xxxxxxxxx> > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> LGTM, Reviewed-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_hdcp.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c > b/drivers/gpu/drm/i915/display/intel_hdcp.c > index 718d8bad77a0..9880192adfe9 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -2733,23 +2733,21 @@ void intel_hdcp_handle_cp_irq(struct > intel_connector *connector) > queue_delayed_work(i915->unordered_wq, &hdcp->check_work, 0); > } > > -static void __intel_hdcp_info(struct seq_file *m, struct intel_connector > *intel_connector, > +static void __intel_hdcp_info(struct seq_file *m, struct > +intel_connector *connector, > bool remote_req) > { > bool hdcp_cap = false, hdcp2_cap = false; > > - if (!intel_connector->hdcp.shim) { > + if (!connector->hdcp.shim) { > seq_puts(m, "No Connector Support"); > goto out; > } > > if (remote_req) { > - intel_hdcp_get_remote_capability(intel_connector, > - &hdcp_cap, > - &hdcp2_cap); > + intel_hdcp_get_remote_capability(connector, &hdcp_cap, > &hdcp2_cap); > } else { > - hdcp_cap = intel_hdcp_get_capability(intel_connector); > - hdcp2_cap = intel_hdcp2_get_capability(intel_connector); > + hdcp_cap = intel_hdcp_get_capability(connector); > + hdcp2_cap = intel_hdcp2_get_capability(connector); > } > > if (hdcp_cap) > -- > 2.39.5