diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-02-19 13:35:18 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-02-19 13:35:18 +1000 |
| commit | 84266fcb3af6ba9e215adf0c482914963579639c (patch) | |
| tree | 830dac899929af5370fb5373154588f3687718b5 /drivers/gpu/drm/gma500/intel_i2c.c | |
| parent | f40ddce88593482919761f74910f42f4b84c004b (diff) | |
| parent | ac35d19fe871c81b9d78053d675095b597270304 (diff) | |
Merge branch 'drm-next' of git://anongit.freedesktop.org/git/drm/drmdrm-next-5.11-merged
Trial merge for Linus
Diffstat (limited to 'drivers/gpu/drm/gma500/intel_i2c.c')
| -rw-r--r-- | drivers/gpu/drm/gma500/intel_i2c.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/gma500/intel_i2c.c b/drivers/gpu/drm/gma500/intel_i2c.c index de8810188190..5e1b4d70c317 100644 --- a/drivers/gpu/drm/gma500/intel_i2c.c +++ b/drivers/gpu/drm/gma500/intel_i2c.c @@ -85,7 +85,6 @@ static void set_data(void *data, int state_high) /** * psb_intel_i2c_create - instantiate an Intel i2c bus using the specified GPIO reg * @dev: DRM device - * @output: driver specific output device * @reg: GPIO reg to use * @name: name for this bus * @@ -117,7 +116,7 @@ struct psb_intel_i2c_chan *psb_intel_i2c_create(struct drm_device *dev, snprintf(chan->adapter.name, I2C_NAME_SIZE, "intel drm %s", name); chan->adapter.owner = THIS_MODULE; chan->adapter.algo_data = &chan->algo; - chan->adapter.dev.parent = &dev->pdev->dev; + chan->adapter.dev.parent = dev->dev; chan->algo.setsda = set_data; chan->algo.setscl = set_clock; chan->algo.getsda = get_data; @@ -145,7 +144,7 @@ out_free: /** * psb_intel_i2c_destroy - unregister and free i2c bus resources - * @output: channel to free + * @chan: channel to free * * Unregister the adapter from the i2c layer, then free the structure. */ |