p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/i915: refer to pin instead of port in the intel_i2c.c interfaces 

Rename intel_gmbus_is_port_valid to intel_gmbus_is_valid_pin, and rename
port parameters to pin as well. This matches usage all around, as
usually a pin is passed to the validity check function. No functional
changes.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Jani Nikula 2015-03-27 00:20:20 +02:00 committed by Daniel Vetter
parent 988c70156c
commit 0184df465e
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/i915/i915_drv.h
View File

@ -3065,13 +3065,13 @@ void i915_teardown_sysfs(struct drm_device *dev_priv);
/* intel_i2c.c */ /* intel_i2c.c */
extern int intel_setup_gmbus(struct drm_device *dev); extern int intel_setup_gmbus(struct drm_device *dev);
extern void intel_teardown_gmbus(struct drm_device *dev); extern void intel_teardown_gmbus(struct drm_device *dev);
static inline bool intel_gmbus_is_port_valid(unsigned port) static inline bool intel_gmbus_is_valid_pin(unsigned int pin)
{ {
return (port >= GMBUS_PIN_SSC && port <= GMBUS_PIN_DPD); return (pin >= GMBUS_PIN_SSC && pin <= GMBUS_PIN_DPD);
} }
extern struct i2c_adapter *intel_gmbus_get_adapter( extern struct i2c_adapter *
struct drm_i915_private *dev_priv, unsigned port); intel_gmbus_get_adapter(struct drm_i915_private *dev_priv, unsigned int pin);
extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed); extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit); extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter) static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)

2
drivers/gpu/drm/i915/intel_bios.c
View File

@ -438,7 +438,7 @@ parse_general_definitions(struct drm_i915_private *dev_priv,
if (block_size >= sizeof(*general)) { if (block_size >= sizeof(*general)) {
int bus_pin = general->crt_ddc_gmbus_pin; int bus_pin = general->crt_ddc_gmbus_pin;
DRM_DEBUG_KMS("crt_ddc_bus_pin: %d\n", bus_pin); DRM_DEBUG_KMS("crt_ddc_bus_pin: %d\n", bus_pin);
if (intel_gmbus_is_port_valid(bus_pin)) if (intel_gmbus_is_valid_pin(bus_pin))
dev_priv->vbt.crt_ddc_pin = bus_pin; dev_priv->vbt.crt_ddc_pin = bus_pin;
} else { } else {
DRM_DEBUG_KMS("BDB_GD too small (%d). Invalid.\n", DRM_DEBUG_KMS("BDB_GD too small (%d). Invalid.\n",

2
drivers/gpu/drm/i915/intel_dvo.c
View File

@ -502,7 +502,7 @@ void intel_dvo_init(struct drm_device *dev)
* special cases, but otherwise default to what's defined * special cases, but otherwise default to what's defined
* in the spec. * in the spec.
*/ */
if (intel_gmbus_is_port_valid(dvo->gpio)) if (intel_gmbus_is_valid_pin(dvo->gpio))
gpio = dvo->gpio; gpio = dvo->gpio;
else if (dvo->type == INTEL_DVO_CHIP_LVDS) else if (dvo->type == INTEL_DVO_CHIP_LVDS)
gpio = GMBUS_PIN_SSC; gpio = GMBUS_PIN_SSC;

8
drivers/gpu/drm/i915/intel_i2c.c
View File

@ -574,12 +574,12 @@ int intel_setup_gmbus(struct drm_device *dev)
} }
struct i2c_adapter *intel_gmbus_get_adapter(struct drm_i915_private *dev_priv, struct i2c_adapter *intel_gmbus_get_adapter(struct drm_i915_private *dev_priv,
unsigned port) unsigned int pin)
{ {
WARN_ON(!intel_gmbus_is_port_valid(port)); WARN_ON(!intel_gmbus_is_valid_pin(pin));
/* -1 to map pin pair to gmbus index */ /* -1 to map pin pair to gmbus index */
return (intel_gmbus_is_port_valid(port)) ? return (intel_gmbus_is_valid_pin(pin)) ?
&dev_priv->gmbus[port - 1].adapter : NULL; &dev_priv->gmbus[pin - 1].adapter : NULL;
} }
void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed) void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed)

2
drivers/gpu/drm/i915/intel_lvds.c
View File

@ -781,7 +781,7 @@ static bool lvds_is_present_in_vbt(struct drm_device *dev,
child->device_type != DEVICE_TYPE_LFP) child->device_type != DEVICE_TYPE_LFP)
continue; continue;
if (intel_gmbus_is_port_valid(child->i2c_pin)) if (intel_gmbus_is_valid_pin(child->i2c_pin))
*i2c_pin = child->i2c_pin; *i2c_pin = child->i2c_pin;
/* However, we cannot trust the BIOS writers to populate /* However, we cannot trust the BIOS writers to populate

2
drivers/gpu/drm/i915/intel_sdvo.c
View File

@ -2291,7 +2291,7 @@ intel_sdvo_select_i2c_bus(struct drm_i915_private *dev_priv,
else else
mapping = &dev_priv->sdvo_mappings[1]; mapping = &dev_priv->sdvo_mappings[1];
if (mapping->initialized && intel_gmbus_is_port_valid(mapping->i2c_pin)) if (mapping->initialized && intel_gmbus_is_valid_pin(mapping->i2c_pin))
pin = mapping->i2c_pin; pin = mapping->i2c_pin;
else else
pin = GMBUS_PIN_DPB; pin = GMBUS_PIN_DPB;