| .. | .. |
|---|
| 25 | 25 | /* |
|---|
| 26 | 26 | * Authors: Dave Airlie <airlied@redhat.com> |
|---|
| 27 | 27 | */ |
|---|
| 28 | + |
|---|
| 28 | 29 | #include <linux/export.h> |
|---|
| 29 | | -#include <linux/i2c.h> |
|---|
| 30 | 30 | #include <linux/i2c-algo-bit.h> |
|---|
| 31 | | -#include <drm/drmP.h> |
|---|
| 31 | +#include <linux/i2c.h> |
|---|
| 32 | +#include <linux/pci.h> |
|---|
| 32 | 33 | |
|---|
| 33 | 34 | #include "mgag200_drv.h" |
|---|
| 34 | 35 | |
|---|
| .. | .. |
|---|
| 60 | 61 | static void mga_gpio_setsda(void *data, int state) |
|---|
| 61 | 62 | { |
|---|
| 62 | 63 | struct mga_i2c_chan *i2c = data; |
|---|
| 63 | | - struct mga_device *mdev = i2c->dev->dev_private; |
|---|
| 64 | + struct mga_device *mdev = to_mga_device(i2c->dev); |
|---|
| 64 | 65 | mga_i2c_set(mdev, i2c->data, state); |
|---|
| 65 | 66 | } |
|---|
| 66 | 67 | |
|---|
| 67 | 68 | static void mga_gpio_setscl(void *data, int state) |
|---|
| 68 | 69 | { |
|---|
| 69 | 70 | struct mga_i2c_chan *i2c = data; |
|---|
| 70 | | - struct mga_device *mdev = i2c->dev->dev_private; |
|---|
| 71 | + struct mga_device *mdev = to_mga_device(i2c->dev); |
|---|
| 71 | 72 | mga_i2c_set(mdev, i2c->clock, state); |
|---|
| 72 | 73 | } |
|---|
| 73 | 74 | |
|---|
| 74 | 75 | static int mga_gpio_getsda(void *data) |
|---|
| 75 | 76 | { |
|---|
| 76 | 77 | struct mga_i2c_chan *i2c = data; |
|---|
| 77 | | - struct mga_device *mdev = i2c->dev->dev_private; |
|---|
| 78 | + struct mga_device *mdev = to_mga_device(i2c->dev); |
|---|
| 78 | 79 | return (mga_i2c_read_gpio(mdev) & i2c->data) ? 1 : 0; |
|---|
| 79 | 80 | } |
|---|
| 80 | 81 | |
|---|
| 81 | 82 | static int mga_gpio_getscl(void *data) |
|---|
| 82 | 83 | { |
|---|
| 83 | 84 | struct mga_i2c_chan *i2c = data; |
|---|
| 84 | | - struct mga_device *mdev = i2c->dev->dev_private; |
|---|
| 85 | + struct mga_device *mdev = to_mga_device(i2c->dev); |
|---|
| 85 | 86 | return (mga_i2c_read_gpio(mdev) & i2c->clock) ? 1 : 0; |
|---|
| 86 | 87 | } |
|---|
| 87 | 88 | |
|---|
| 88 | 89 | struct mga_i2c_chan *mgag200_i2c_create(struct drm_device *dev) |
|---|
| 89 | 90 | { |
|---|
| 90 | | - struct mga_device *mdev = dev->dev_private; |
|---|
| 91 | + struct mga_device *mdev = to_mga_device(dev); |
|---|
| 91 | 92 | struct mga_i2c_chan *i2c; |
|---|
| 92 | 93 | int ret; |
|---|
| 93 | 94 | int data, clock; |
|---|