Skip to content

Commit

Permalink
matroxfb: get rid of unneeded macro MINFO_FROM
Browse files Browse the repository at this point in the history 
With multihead support always enabled, macros MINFO_FROM and
MINFO_FROM_INFO are no longer needed and make the code harder to read.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Petr Vandrovec <vandrove@vc.cvut.cz>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jean Delvare authored and Linus Torvalds committed Sep 23, 2009
1 parent 316b4d6 commit ee5a274
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 35 deletions.
10 changes: 5 additions & 5 deletions drivers/video/matrox/matroxfb_accel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ static void matrox_accel_bmove_lin(struct matrox_fb_info *minfo, int vxres,
}

static void matroxfb_cfb4_copyarea(struct fb_info* info, const struct fb_copyarea* area) {
MINFO_FROM_INFO(info);
struct matrox_fb_info *minfo = info2minfo(info);

if ((area->sx | area->dx | area->width) & 1)
cfb_copyarea(info, area);
Expand All @@ -284,7 +284,7 @@ static void matroxfb_cfb4_copyarea(struct fb_info* info, const struct fb_copyare
}

static void matroxfb_copyarea(struct fb_info* info, const struct fb_copyarea* area) {
MINFO_FROM_INFO(info);
struct matrox_fb_info *minfo = info2minfo(info);

matrox_accel_bmove(minfo, minfo->fbcon.var.xres_virtual, area->sy, area->sx, area->dy, area->dx, area->height, area->width);
}
Expand All @@ -309,7 +309,7 @@ static void matroxfb_accel_clear(struct matrox_fb_info *minfo, u_int32_t color,
}

static void matroxfb_fillrect(struct fb_info* info, const struct fb_fillrect* rect) {
MINFO_FROM_INFO(info);
struct matrox_fb_info *minfo = info2minfo(info);

switch (rect->rop) {
case ROP_COPY:
Expand Down Expand Up @@ -376,7 +376,7 @@ static void matroxfb_cfb4_clear(struct matrox_fb_info *minfo, u_int32_t bgx,
}

static void matroxfb_cfb4_fillrect(struct fb_info* info, const struct fb_fillrect* rect) {
MINFO_FROM_INFO(info);
struct matrox_fb_info *minfo = info2minfo(info);

switch (rect->rop) {
case ROP_COPY:
Expand Down Expand Up @@ -478,7 +478,7 @@ static void matroxfb_1bpp_imageblit(struct matrox_fb_info *minfo, u_int32_t fgx,


static void matroxfb_imageblit(struct fb_info* info, const struct fb_image* image) {
MINFO_FROM_INFO(info);
struct matrox_fb_info *minfo = info2minfo(info);

DBG_HEAVY(__func__);

Expand Down
17 changes: 8 additions & 9 deletions drivers/video/matrox/matroxfb_base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,7 @@ static irqreturn_t matrox_irq(int irq, void *dev_id)
{
u_int32_t status;
int handled = 0;

MINFO_FROM(dev_id);
struct matrox_fb_info *minfo = dev_id;

status = mga_inl(M_STATUS);

Expand Down Expand Up @@ -396,7 +395,7 @@ static void matroxfb_remove(struct matrox_fb_info *minfo, int dummy)

static int matroxfb_open(struct fb_info *info, int user)
{
MINFO_FROM_INFO(info);
struct matrox_fb_info *minfo = info2minfo(info);

DBG_LOOP(__func__)

Expand All @@ -412,7 +411,7 @@ static int matroxfb_open(struct fb_info *info, int user)

static int matroxfb_release(struct fb_info *info, int user)
{
MINFO_FROM_INFO(info);
struct matrox_fb_info *minfo = info2minfo(info);

DBG_LOOP(__func__)

Expand All @@ -429,7 +428,7 @@ static int matroxfb_release(struct fb_info *info, int user)

static int matroxfb_pan_display(struct fb_var_screeninfo *var,
struct fb_info* info) {
MINFO_FROM_INFO(info);
struct matrox_fb_info *minfo = info2minfo(info);

DBG(__func__)

Expand Down Expand Up @@ -749,7 +748,7 @@ static int matroxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *inf
int visual;
int cmap_len;
unsigned int ydstorg;
MINFO_FROM_INFO(info);
struct matrox_fb_info *minfo = info2minfo(info);

if (minfo->dead) {
return -ENXIO;
Expand All @@ -766,7 +765,7 @@ static int matroxfb_set_par(struct fb_info *info)
int cmap_len;
unsigned int ydstorg;
struct fb_var_screeninfo *var;
MINFO_FROM_INFO(info);
struct matrox_fb_info *minfo = info2minfo(info);

DBG(__func__)

Expand Down Expand Up @@ -890,7 +889,7 @@ static int matroxfb_ioctl(struct fb_info *info,
unsigned int cmd, unsigned long arg)
{
void __user *argp = (void __user *)arg;
MINFO_FROM_INFO(info);
struct matrox_fb_info *minfo = info2minfo(info);

DBG(__func__)

Expand Down Expand Up @@ -1189,7 +1188,7 @@ static int matroxfb_blank(int blank, struct fb_info *info)
int seq;
int crtc;
CRITFLAGS
MINFO_FROM_INFO(info);
struct matrox_fb_info *minfo = info2minfo(info);

DBG(__func__)

Expand Down
4 changes: 0 additions & 4 deletions drivers/video/matrox/matroxfb_base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,10 +524,6 @@ struct matrox_fb_info {

#define info2minfo(info) container_of(info, struct matrox_fb_info, fbcon)

#define MINFO_FROM(x) struct matrox_fb_info* minfo = x

#define MINFO_FROM_INFO(x) MINFO_FROM(info2minfo(x))

struct matrox_switch {
int (*preinit)(struct matrox_fb_info *minfo);
void (*reset)(struct matrox_fb_info *minfo);
Expand Down
16 changes: 8 additions & 8 deletions drivers/video/matrox/matroxfb_crtc2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static void matroxfb_dh_restore(struct matroxfb_dh_fb_info* m2info,
unsigned int pos) {
u_int32_t tmp;
u_int32_t datactl;
MINFO_FROM(m2info->primary_dev);
struct matrox_fb_info *minfo = m2info->primary_dev;

switch (mode) {
case 15:
Expand Down Expand Up @@ -157,7 +157,7 @@ static void matroxfb_dh_restore(struct matroxfb_dh_fb_info* m2info,
}

static void matroxfb_dh_disable(struct matroxfb_dh_fb_info* m2info) {
MINFO_FROM(m2info->primary_dev);
struct matrox_fb_info *minfo = m2info->primary_dev;

mga_outl(0x3C10, 0x00000004); /* disable CRTC2, CRTC1->DAC1, PLL as clock source */
minfo->hw.crtc2.ctl = 0x00000004;
Expand All @@ -168,7 +168,7 @@ static void matroxfb_dh_pan_var(struct matroxfb_dh_fb_info* m2info,
unsigned int pos;
unsigned int linelen;
unsigned int pixelsize;
MINFO_FROM(m2info->primary_dev);
struct matrox_fb_info *minfo = m2info->primary_dev;

m2info->fbcon.var.xoffset = var->xoffset;
m2info->fbcon.var.yoffset = var->yoffset;
Expand Down Expand Up @@ -260,7 +260,7 @@ static int matroxfb_dh_decode_var(struct matroxfb_dh_fb_info* m2info,

static int matroxfb_dh_open(struct fb_info* info, int user) {
#define m2info (container_of(info, struct matroxfb_dh_fb_info, fbcon))
MINFO_FROM(m2info->primary_dev);
struct matrox_fb_info *minfo = m2info->primary_dev;

if (minfo) {
int err;
Expand All @@ -280,7 +280,7 @@ static int matroxfb_dh_open(struct fb_info* info, int user) {
static int matroxfb_dh_release(struct fb_info* info, int user) {
#define m2info (container_of(info, struct matroxfb_dh_fb_info, fbcon))
int err = 0;
MINFO_FROM(m2info->primary_dev);
struct matrox_fb_info *minfo = m2info->primary_dev;

if (minfo) {
err = minfo->fbops.fb_release(&minfo->fbcon, user);
Expand Down Expand Up @@ -326,7 +326,7 @@ static int matroxfb_dh_set_par(struct fb_info* info) {
int mode;
int err;
struct fb_var_screeninfo* var = &info->var;
MINFO_FROM(m2info->primary_dev);
struct matrox_fb_info *minfo = m2info->primary_dev;

if ((err = matroxfb_dh_decode_var(m2info, var, &visual, &cmap_len, &mode)) != 0)
return err;
Expand Down Expand Up @@ -399,7 +399,7 @@ static int matroxfb_dh_pan_display(struct fb_var_screeninfo* var, struct fb_info
}

static int matroxfb_dh_get_vblank(const struct matroxfb_dh_fb_info* m2info, struct fb_vblank* vblank) {
MINFO_FROM(m2info->primary_dev);
struct matrox_fb_info *minfo = m2info->primary_dev;

matroxfb_enable_irq(minfo, 0);
memset(vblank, 0, sizeof(*vblank));
Expand All @@ -423,7 +423,7 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
unsigned long arg)
{
#define m2info (container_of(info, struct matroxfb_dh_fb_info, fbcon))
MINFO_FROM(m2info->primary_dev);
struct matrox_fb_info *minfo = m2info->primary_dev;

DBG(__func__)

Expand Down
10 changes: 5 additions & 5 deletions drivers/video/matrox/matroxfb_g450.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ static int g450_query_ctrl(void* md, struct v4l2_queryctrl *p) {

static int g450_set_ctrl(void* md, struct v4l2_control *p) {
int i;
MINFO_FROM(md);
struct matrox_fb_info *minfo = md;

i = get_ctrl_id(p->id);
if (i < 0) return -EINVAL;
Expand Down Expand Up @@ -215,7 +215,7 @@ static int g450_set_ctrl(void* md, struct v4l2_control *p) {

static int g450_get_ctrl(void* md, struct v4l2_control *p) {
int i;
MINFO_FROM(md);
struct matrox_fb_info *minfo = md;

i = get_ctrl_id(p->id);
if (i < 0) return -EINVAL;
Expand Down Expand Up @@ -518,7 +518,7 @@ static void cve2_init_TV(struct matrox_fb_info *minfo,
}

static int matroxfb_g450_compute(void* md, struct my_timming* mt) {
MINFO_FROM(md);
struct matrox_fb_info *minfo = md;

dprintk(KERN_DEBUG "Computing, mode=%u\n", minfo->outputs[1].mode);

Expand Down Expand Up @@ -556,7 +556,7 @@ static int matroxfb_g450_compute(void* md, struct my_timming* mt) {
}

static int matroxfb_g450_program(void* md) {
MINFO_FROM(md);
struct matrox_fb_info *minfo = md;

if (minfo->outputs[1].mode != MATROXFB_OUTPUT_MODE_MONITOR) {
cve2_init_TV(minfo, &minfo->hw.maven);
Expand All @@ -575,7 +575,7 @@ static int matroxfb_g450_verify_mode(void* md, u_int32_t arg) {
}

static int g450_dvi_compute(void* md, struct my_timming* mt) {
MINFO_FROM(md);
struct matrox_fb_info *minfo = md;

if (mt->mnp < 0) {
mt->mnp = matroxfb_g450_setclk(minfo, mt->pixclock, (mt->crtc == MATROXFB_SRC_CRTC1) ? M_PIXEL_PLL_C : M_VIDEO_PLL);
Expand Down
10 changes: 6 additions & 4 deletions drivers/video/matrox/matroxfb_maven.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ static void maven_init_TVdata(const struct maven_data* md, struct mavenregs* dat
0x00, /* 3E written multiple times */
0x00, /* never written */
}, MATROXFB_OUTPUT_MODE_NTSC, 525, 60 };
MINFO_FROM(md->primary_head);
struct matrox_fb_info *minfo = md->primary_head;

if (minfo->outputs[1].mode == MATROXFB_OUTPUT_MODE_PAL)
*data = palregs;
Expand Down Expand Up @@ -741,7 +741,7 @@ static inline int maven_compute_timming(struct maven_data* md,
struct mavenregs* m) {
unsigned int tmpi;
unsigned int a, bv, c;
MINFO_FROM(md->primary_head);
struct matrox_fb_info *minfo = md->primary_head;

m->mode = minfo->outputs[1].mode;
if (m->mode != MATROXFB_OUTPUT_MODE_MONITOR) {
Expand Down Expand Up @@ -1184,7 +1184,9 @@ static struct matrox_altout maven_altout = {

static int maven_init_client(struct i2c_client* clnt) {
struct maven_data* md = i2c_get_clientdata(clnt);
MINFO_FROM(container_of(clnt->adapter, struct i2c_bit_adapter, adapter)->minfo);
struct matrox_fb_info *minfo = container_of(clnt->adapter,
struct i2c_bit_adapter,
adapter)->minfo;

md->primary_head = minfo;
md->client = clnt;
Expand Down Expand Up @@ -1218,7 +1220,7 @@ static int maven_shutdown_client(struct i2c_client* clnt) {
struct maven_data* md = i2c_get_clientdata(clnt);

if (md->primary_head) {
MINFO_FROM(md->primary_head);
struct matrox_fb_info *minfo = md->primary_head;

down_write(&minfo->altout.lock);
minfo->outputs[1].src = MATROXFB_SRC_NONE;
Expand Down

0 comments on commit ee5a274

Please sign in to comment.