* [PATCH][GIT PULL] Minor Cleanups
@ 2012-01-23 2:04 Tracey Dent
2012-01-23 2:13 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Tracey Dent @ 2012-01-23 2:04 UTC (permalink / raw)
To: linux-kernel; +Cc: swetland, greg, greg
Greg can you pull these changes into your tree. They are trival fixes,
nothing major as you can see below.
Please pull from:
git://github.com/Tdent48227/linux.git next
thanks,
tracey
----------------------------------------------------------------
Tracey Dent (3):
drivers/staging/android/ashmem.c: Cleanups
drivers/staging/android/pmem.c: Cleanups
drivers/staging/android/timed_gpio.c: Stlye fixes
drivers/staging/android/ashmem.c | 4 ++--
drivers/staging/android/pmem.c | 10 +++++-----
drivers/staging/android/timed_gpio.c | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index 99052bf..9f1f27e 100644
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -315,7 +315,7 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma)
get_file(asma->file);
/*
- * XXX - Reworked to use shmem_zero_setup() instead of
+ * XXX - Reworked to use shmem_zero_setup() instead of
* shmem_set_file while we're in staging. -jstultz
*/
if (vma->vm_flags & VM_SHARED) {
@@ -680,7 +680,7 @@ static long ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return ret;
}
-static struct file_operations ashmem_fops = {
+static const struct file_operations ashmem_fops = {
.owner = THIS_MODULE,
.open = ashmem_open,
.release = ashmem_release,
diff --git a/drivers/staging/android/pmem.c b/drivers/staging/android/pmem.c
index 7d97032..b57cdce 100644
--- a/drivers/staging/android/pmem.c
+++ b/drivers/staging/android/pmem.c
@@ -92,7 +92,7 @@ struct pmem_region_node {
#define PMEM_DEBUG_MSGS 0
#if PMEM_DEBUG_MSGS
-#define DLOG(fmt,args...) \
+#define DLOG(fmt, args...) \
do { printk(KERN_INFO "[%s:%s:%d] "fmt, __FILE__, __func__, __LINE__, \
##args); } \
while (0)
@@ -708,9 +708,9 @@ int get_pmem_addr(struct file *file, unsigned long *start,
struct pmem_data *data;
int id;
- if (!is_pmem_file(file) || !has_allocation(file)) {
+ if (!is_pmem_file(file) || !has_allocation(file))
return -1;
- }
+
data = (struct pmem_data *)file->private_data;
if (data->index == -1) {
@@ -789,9 +789,9 @@ void flush_pmem_file(struct file *file, unsigned long offset, unsigned long len)
struct list_head *elt;
void *flush_start, *flush_end;
- if (!is_pmem_file(file) || !has_allocation(file)) {
+ if (!is_pmem_file(file) || !has_allocation(file))
return;
- }
+
id = get_id(file);
data = (struct pmem_data *)file->private_data;
diff --git a/drivers/staging/android/timed_gpio.c b/drivers/staging/android/timed_gpio.c
index a64481c..bc723ef 100644
--- a/drivers/staging/android/timed_gpio.c
+++ b/drivers/staging/android/timed_gpio.c
@@ -29,9 +29,9 @@ struct timed_gpio_data {
struct timed_output_dev dev;
struct hrtimer timer;
spinlock_t lock;
- unsigned gpio;
- int max_timeout;
- u8 active_low;
+ unsigned gpio;
+ int max_timeout;
+ u8 active_low;
};
static enum hrtimer_restart gpio_timer_func(struct hrtimer *timer)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][GIT PULL] Minor Cleanups
2012-01-23 2:04 [PATCH][GIT PULL] Minor Cleanups Tracey Dent
@ 2012-01-23 2:13 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2012-01-23 2:13 UTC (permalink / raw)
To: Tracey Dent; +Cc: linux-kernel, swetland, greg
On Sun, Jan 22, 2012 at 09:04:21PM -0500, Tracey Dent wrote:
> Greg can you pull these changes into your tree. They are trival fixes,
> nothing major as you can see below.
>
> Please pull from:
> git://github.com/Tdent48227/linux.git next
Sorry, I don't take git pull requests for the staging tree, especially
for something as trivial and small as these 3 patches.
Please email them to me/us and I will be glad to queue them up this
week.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-01-23 2:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-23 2:04 [PATCH][GIT PULL] Minor Cleanups Tracey Dent
2012-01-23 2:13 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).