From fe9dc4b1d56e6be7783ec34d6681dada19c6aa40 Mon Sep 17 00:00:00 2001
From: Arif Ali <mail@arif-ali.co.uk>
Date: Thu, 27 Dec 2012 13:28:42 +0000
Subject: [PATCH] fix few merge issues

---
 drivers/gpu/msm/adreno.h                  |  8 -------
 drivers/gpu/msm/kgsl.h                    | 13 -----------
 drivers/gpu/msm/kgsl_sharedmem.h          | 27 -----------------------
 drivers/net/wireless/bcm4329/dhd_common.c |  3 ++-
 drivers/net/wireless/bcm4329/dhd_linux.c  |  3 ++-
 drivers/staging/android/binder.c          |  1 -
 drivers/staging/android/lowmemorykiller.c | 11 ---------
 7 files changed, 4 insertions(+), 62 deletions(-)

diff --git a/drivers/gpu/msm/adreno.h b/drivers/gpu/msm/adreno.h
index 929b5f08..26c842ce 100755
--- a/drivers/gpu/msm/adreno.h
+++ b/drivers/gpu/msm/adreno.h
@@ -62,14 +62,6 @@ struct adreno_gpudev;
 #define ADRENO_DEFAULT_PWRSCALE_POLICY  NULL
 #endif
 
-enum adreno_gpurev {
-	ADRENO_REV_UNKNOWN = 0,
-	ADRENO_REV_A200 = 200,
-	ADRENO_REV_A205 = 205,
-	ADRENO_REV_A220 = 220,
-	ADRENO_REV_A225 = 225,
-};
-
 struct adreno_gpudev;
 
 struct adreno_device {
diff --git a/drivers/gpu/msm/kgsl.h b/drivers/gpu/msm/kgsl.h
index fc45ff7c..df8c1daa 100755
--- a/drivers/gpu/msm/kgsl.h
+++ b/drivers/gpu/msm/kgsl.h
@@ -154,19 +154,6 @@ struct kgsl_memdesc {
 struct kgsl_pagetable;
 struct kgsl_memdesc_ops;
 
-/* shared memory allocation */
-struct kgsl_memdesc {
-	struct kgsl_pagetable *pagetable;
-	void *hostptr;
-	unsigned int gpuaddr;
-	unsigned int physaddr;
-	unsigned int size;
-	unsigned int priv;
-	struct scatterlist *sg;
-	unsigned int sglen;
-	struct kgsl_memdesc_ops *ops;
-};
-
 struct kgsl_mem_entry {
 	struct kref refcount;
 	struct kgsl_memdesc memdesc;
diff --git a/drivers/gpu/msm/kgsl_sharedmem.h b/drivers/gpu/msm/kgsl_sharedmem.h
index 20579ac9..49a2be24 100755
--- a/drivers/gpu/msm/kgsl_sharedmem.h
+++ b/drivers/gpu/msm/kgsl_sharedmem.h
@@ -139,33 +139,6 @@ kgsl_allocate(struct kgsl_memdesc *memdesc,
 	return kgsl_sharedmem_page_alloc(memdesc, pagetable, size);
 }
 
-static inline int
-memdesc_sg_phys(struct kgsl_memdesc *memdesc,
-		unsigned int physaddr, unsigned int size)
-{
-	struct page *page = phys_to_page(physaddr);
-
-	memdesc->sg = kmalloc(sizeof(struct scatterlist) * 1, GFP_KERNEL);
-	if (memdesc->sg == NULL)
-		return -ENOMEM;
-
-	memdesc->sglen = 1;
-	sg_init_table(memdesc->sg, 1);
-	sg_set_page(&memdesc->sg[0], page, size, 0);
-	return 0;
-}
-
-static inline int
-kgsl_allocate(struct kgsl_memdesc *memdesc,
-		struct kgsl_pagetable *pagetable, size_t size)
-{
-#ifdef CONFIG_MSM_KGSL_MMU
-	return kgsl_sharedmem_vmalloc(memdesc, pagetable, size);
-#else
-	return kgsl_sharedmem_ebimem(memdesc, pagetable, size);
-#endif
-}
-
 static inline int
 kgsl_allocate_user(struct kgsl_memdesc *memdesc,
 		struct kgsl_pagetable *pagetable,
diff --git a/drivers/net/wireless/bcm4329/dhd_common.c b/drivers/net/wireless/bcm4329/dhd_common.c
index f7cd372d..93ab84b1 100644
--- a/drivers/net/wireless/bcm4329/dhd_common.c
+++ b/drivers/net/wireless/bcm4329/dhd_common.c
@@ -526,7 +526,8 @@ wl_show_host_event(wl_event_msg_t *event, void *event_data)
 {
 	uint i, status, reason;
 	bool group = FALSE, flush_txq = FALSE, link = FALSE;
-	char *auth_str, *event_name;
+	char *auth_str;
+	char *event_name;
 	uchar *buf;
 	char err_msg[256], eabuf[ETHER_ADDR_STR_LEN];
 	static struct {uint event; char *event_name;} event_names[] = {
diff --git a/drivers/net/wireless/bcm4329/dhd_linux.c b/drivers/net/wireless/bcm4329/dhd_linux.c
index 9365e360..16aa5a62 100644
--- a/drivers/net/wireless/bcm4329/dhd_linux.c
+++ b/drivers/net/wireless/bcm4329/dhd_linux.c
@@ -1262,7 +1262,8 @@ dhd_rx_frame(dhd_pub_t *dhdp, int ifidx, void *pktbuf, int numpkt)
 	struct sk_buff *skb;
 	uchar *eth;
 	uint len;
-	void * data, *pnext, *save_pktbuf;
+	void * data, *pnext;
+	void *save_pktbuf;
 	int i;
 	dhd_if_t *ifp;
 	wl_event_msg_t event;
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 7453f1b0..4100e18a 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -2791,7 +2791,6 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 		if (binder_context_mgr_node != NULL) {
 			binder_debug(BINDER_DEBUG_TOP_ERRORS,
 				"binder: BINDER_SET_CONTEXT_MGR already set\n");
-				     "binder: BINDER_SET_CONTEXT_MGR already set\n");
 			ret = -EBUSY;
 			goto err;
 		}
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index f8017368..ce37e195 100755
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -87,17 +87,6 @@ static struct notifier_block task_nb = {
 };
 
 
-static void task_free_fn(struct work_struct *work)
-{
-	unsigned long flags;
-
-	task_free_unregister(&task_nb);
-	spin_lock_irqsave(&lowmem_deathpending_lock, flags);
-	lowmem_deathpending = NULL;
-	spin_unlock_irqrestore(&lowmem_deathpending_lock, flags);
-}
-static DECLARE_WORK(task_free_work, task_free_fn);
-
 static int
 task_notify_func(struct notifier_block *self, unsigned long val, void *data)
 {