drm/i915: drop a bunch of superfluous inlines

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / display / intel_dsi_vbt.c

diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
index 574dcfe..eed037e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
+++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
@@ -121,7 +121,7 @@ struct i2c_adapter_lookup {
 #define  ICL_GPIO_DDPA_CTRLCLK_2       8
 #define  ICL_GPIO_DDPA_CTRLDATA_2      9
 
-static inline enum port intel_dsi_seq_port_to_port(u8 port)
+static enum port intel_dsi_seq_port_to_port(u8 port)
 {
        return port ? PORT_C : PORT_A;
 }
@@ -453,8 +453,7 @@ static inline void i2c_acpi_find_adapter(struct intel_dsi *intel_dsi,
 
 static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data)
 {
-       struct drm_device *drm_dev = intel_dsi->base.base.dev;
-       struct device *dev = &drm_dev->pdev->dev;
+       struct drm_i915_private *i915 = to_i915(intel_dsi->base.base.dev);
        struct i2c_adapter *adapter;
        struct i2c_msg msg;
        int ret;
@@ -471,7 +470,7 @@ static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data)
 
        adapter = i2c_get_adapter(intel_dsi->i2c_bus_num);
        if (!adapter) {
-               DRM_DEV_ERROR(dev, "Cannot find a valid i2c bus for xfer\n");
+               drm_err(&i915->drm, "Cannot find a valid i2c bus for xfer\n");
                goto err_bus;
        }
 
@@ -489,9 +488,9 @@ static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data)
 
        ret = i2c_transfer(adapter, &msg, 1);
        if (ret < 0)
-               DRM_DEV_ERROR(dev,
-                             "Failed to xfer payload of size (%u) to reg (%u)\n",
-                             payload_size, reg_offset);
+               drm_err(&i915->drm,
+                       "Failed to xfer payload of size (%u) to reg (%u)\n",
+                       payload_size, reg_offset);
 
        kfree(payload_data);
 err_alloc: