Merge branch 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

torvalds · torvalds · commit 84479f3c17e2 · 2010-08-11T09:18:06.000-07:00
* 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  video: msm: Fix section mismatch in mddi.c.
  drivers: video: msm: drop some unused variables
diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c
@@ -187,10 +187,8 @@ static void mddi_wait_interrupt(struct mddi_info *mddi, uint32_t intmask);
 
 static void mddi_handle_rev_data_avail(struct mddi_info *mddi)
 {
-	union mddi_rev *rev = mddi->rev_data;
 	uint32_t rev_data_count;
 	uint32_t rev_crc_err_count;
-	int i;
 	struct reg_read_info *ri;
 	size_t prev_offset;
 	uint16_t length;
@@ -670,7 +668,7 @@ static int __init mddi_rev_data_setup(struct mddi_info *mddi)
 	return 0;
 }
 
-static int __init mddi_probe(struct platform_device *pdev)
+static int __devinit mddi_probe(struct platform_device *pdev)
 {
 	struct msm_mddi_platform_data *pdata = pdev->dev.platform_data;
 	struct mddi_info *mddi = &mddi_info[pdev->id];
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
@@ -258,7 +258,6 @@ int get_img(struct mdp_img *img, struct fb_info *info,
 {
 	int put_needed, ret = 0;
 	struct file *file;
-	unsigned long vstart;
 
 	file = fget_light(img->memory_id, &put_needed);
 	if (file == NULL)

Original file line number	Diff line number	Diff line change
`@@ -187,10 +187,8 @@ static void mddi_wait_interrupt(struct mddi_info *mddi, uint32_t intmask);`
`187`	`187`
`188`	`188`	`static void mddi_handle_rev_data_avail(struct mddi_info *mddi)`
`189`	`189`	`{`
`190`		`- union mddi_rev *rev = mddi->rev_data;`
`191`	`190`	`uint32_t rev_data_count;`
`192`	`191`	`uint32_t rev_crc_err_count;`
`193`		`- int i;`
`194`	`192`	`struct reg_read_info *ri;`
`195`	`193`	`size_t prev_offset;`
`196`	`194`	`uint16_t length;`
`@@ -670,7 +668,7 @@ static int __init mddi_rev_data_setup(struct mddi_info *mddi)`
`670`	`668`	`return 0;`
`671`	`669`	`}`
`672`	`670`
`673`		`-static int __init mddi_probe(struct platform_device *pdev)`
	`671`	`+static int __devinit mddi_probe(struct platform_device *pdev)`
`674`	`672`	`{`
`675`	`673`	`struct msm_mddi_platform_data *pdata = pdev->dev.platform_data;`
`676`	`674`	`struct mddi_info *mddi = &mddi_info[pdev->id];`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,6 @@ int get_img(struct mdp_img img, struct fb_info info,`
`258`	`258`	`{`
`259`	`259`	`int put_needed, ret = 0;`
`260`	`260`	`struct file *file;`
`261`		`- unsigned long vstart;`
`262`	`261`
`263`	`262`	`file = fget_light(img->memory_id, &put_needed);`
`264`	`263`	`if (file == NULL)`