Re: [PATCH v3 26/46] usb: gadget: pch_ud: add ep capabilities support

2015-07-25 Thread Robert Baldyga

Hi,

On 07/20/2015 05:08 PM, Krzysztof Opasiak wrote:



On 07/15/2015 08:32 AM, Robert Baldyga wrote:

Convert endpoint configuration to new capabilities model.

Signed-off-by: Robert Baldyga 
---
  drivers/usb/gadget/udc/pch_udc.c | 14 --
  1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/gadget/udc/pch_udc.c
b/drivers/usb/gadget/udc/pch_udc.c
index 613547f..cc8fb3c 100644
--- a/drivers/usb/gadget/udc/pch_udc.c
+++ b/drivers/usb/gadget/udc/pch_udc.c
@@ -2895,11 +2895,21 @@ static void pch_udc_pcd_reinit(struct
pch_udc_dev *dev)
  ep->in = ~i & 1;
  ep->ep.name = ep_string[i];
  ep->ep.ops = &pch_udc_ep_ops;
-if (ep->in)
+if (ep->in) {
  ep->offset_addr = ep->num * UDC_EP_REG_SHIFT;
-else
+ep->ep.caps.dir_in = true;
+} else {
  ep->offset_addr = (UDC_EPINT_OUT_SHIFT + ep->num) *
UDC_EP_REG_SHIFT;
+ep->ep.caps.dir_out = true;
+}
+if (i == UDC_EP0IN_IDX || i == UDC_EP0OUT_IDX) {
+ep->ep.caps.type_control = true;


In all previous patches you set both dir_in and dir_out to true for ep0
but in this patch you don't do this. Is there some reason for this or
it's just a mistake?



Most of UDC drivers we have single instance of ep0 for both directions, 
but this one has two separate unidirectional ep0in and ep0out.



+} else {
+ep->ep.caps.type_iso = true;
+ep->ep.caps.type_bulk = true;
+ep->ep.caps.type_int = true;
+}
  /* need to set ep->ep.maxpacket and set Default
Configuration?*/
  usb_ep_set_maxpacket_limit(&ep->ep, UDC_BULK_MAX_PKT_SIZE);
  list_add_tail(&ep->ep.ep_list, &dev->gadget.ep_list);





Thanks,
Robert Baldyga

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 0/5] staging: lustre: cl_page.c: Fix one file coding sytle issue.

2015-07-25 Thread Incarnation P. Lee
From: "Pan Li" 

Fix one file coding sytle issues.
  Include 3 warnings and 2 errors of coding sytle of cl_page.c.

 drivers/staging/lustre/lustre/obdclass/cl_page.c | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

-- 
1.9.0

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 1/5] staging: lustre: Add blank line after variable definition.

2015-07-25 Thread Incarnation P. Lee
From: "Pan Li" 

Add blank line after local variable definition to make it clear for reading.
Signed-off-by: Pan Li 

---
 drivers/staging/lustre/lustre/obdclass/cl_page.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c 
b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index a7f3032..8b2c1e7 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -169,6 +169,7 @@ int cl_page_gang_lookup(const struct lu_env *env, struct 
cl_object *obj,
while ((nr = radix_tree_gang_lookup(&hdr->coh_tree, (void **)pvec,
idx, CLT_PVEC_SIZE)) > 0) {
int end_of_region = 0;
+
idx = pvec[nr - 1]->cp_index + 1;
for (i = 0, j = 0; i < nr; ++i) {
page = pvec[i];
@@ -286,6 +287,7 @@ static struct cl_page *cl_page_alloc(const struct lu_env 
*env,
GFP_NOFS);
if (page != NULL) {
int result = 0;
+
atomic_set(&page->cp_ref, 1);
if (type == CPT_CACHEABLE) /* for radix tree */
atomic_inc(&page->cp_ref);
-- 
1.9.0

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 2/5] staging: lustre: Add one space after ', ' in parameters list.

2015-07-25 Thread Incarnation P. Lee
From: "Pan Li" 

Add one space after ',' in function call parameters list.
Signed-off-by: Pan Li 

---
 drivers/staging/lustre/lustre/obdclass/cl_page.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c 
b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index 8b2c1e7..739814e 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -1427,7 +1427,7 @@ void cl_page_clip(const struct lu_env *env, struct 
cl_page *pg,
CL_PAGE_HEADER(D_TRACE, env, pg, "%d %d\n", from, to);
CL_PAGE_INVOID(env, pg, CL_PAGE_OP(cpo_clip),
   (const struct lu_env *,
-   const struct cl_page_slice *,int, int),
+   const struct cl_page_slice *, int, int),
   from, to);
 }
 EXPORT_SYMBOL(cl_page_clip);
-- 
1.9.0

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 3/5] staging: lustre: Remove unnecessary braces {}

2015-07-25 Thread Incarnation P. Lee
From: "Pan Li" 

Remove unnecessary braces {} in single line statement code block.
Signed-off-by: Pan Li 
---
 drivers/staging/lustre/lustre/obdclass/cl_page.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c 
b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index 739814e..c386c43 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -374,9 +374,8 @@ static struct cl_page *cl_page_find0(const struct lu_env 
*env,
   idx) == page));
}
 
-   if (page != NULL) {
+   if (page != NULL)
return page;
-   }
 
/* allocate and initialize cl_page */
page = cl_page_alloc(env, o, idx, vmpage, type);
-- 
1.9.0

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 4/5] staging: lustre: Replace spaces at the start of a line

2015-07-25 Thread Incarnation P. Lee
From: "Pan Li" 

Replace the spaces at the start of a line within tab.
Signed-off-by: Pan Li 
---
 drivers/staging/lustre/lustre/obdclass/cl_page.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c 
b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index c386c43..4cc17d3 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -52,12 +52,12 @@ static void cl_page_delete0(const struct lu_env *env, 
struct cl_page *pg,
int radix);
 
 # define PASSERT(env, page, expr) \
-  do { \
+   do {\
  if (unlikely(!(expr))) {\
  CL_PAGE_DEBUG(D_ERROR, (env), (page), #expr "\n");\
  LASSERT(0);  \
  }  \
-  } while (0)
+   } while (0)
 
 # define PINVRNT(env, page, exp) \
((void)sizeof(env), (void)sizeof(page), (void)sizeof !!(exp))
-- 
1.9.0

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 5/5] staging: lustre: Adjust code indent for macro.

2015-07-25 Thread Incarnation P. Lee
From: "Pan Li" 

Adjust code indent for macro, within tabs at the start and space in front of 
'\' for indent.
Signed-off-by: Pan Li 
---
 drivers/staging/lustre/lustre/obdclass/cl_page.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c 
b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index 4cc17d3..428c6b2 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -51,12 +51,12 @@
 static void cl_page_delete0(const struct lu_env *env, struct cl_page *pg,
int radix);
 
-# define PASSERT(env, page, expr) \
-   do {\
- if (unlikely(!(expr))) {\
- CL_PAGE_DEBUG(D_ERROR, (env), (page), #expr "\n");\
- LASSERT(0);  \
- }  \
+# define PASSERT(env, page, expr) \
+   do {   \
+   if (unlikely(!(expr))) {   \
+   CL_PAGE_DEBUG(D_ERROR, (env), (page), #expr "\n"); \
+   LASSERT(0);\
+   }  \
} while (0)
 
 # define PINVRNT(env, page, exp) \
-- 
1.9.0

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] staging: octeon: add missing blank line after declarations

2015-07-25 Thread Kevin Darbyshire-Bryant
Fixes checkpatch.pl
WARNING: Missing a blank line after delarations

Signed-off-by: Kevin Darbyshire-Bryant 
---
 drivers/staging/octeon/ethernet.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/octeon/ethernet.c 
b/drivers/staging/octeon/ethernet.c
index f9dba23..0718b35 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -157,6 +157,7 @@ static void cvm_oct_configure_common_hw(void)
 #ifdef __LITTLE_ENDIAN
{
union cvmx_ipd_ctl_status ipd_ctl_status;
+
ipd_ctl_status.u64 = cvmx_read_csr(CVMX_IPD_CTL_STATUS);
ipd_ctl_status.s.pkt_lend = 1;
ipd_ctl_status.s.wqe_lend = 1;
-- 
1.9.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: [PATCH RESEND] staging: rtl8188eu: don't duplicate ieee80211 WLAN_EID_* constants

2015-07-25 Thread Jakub Sitnicki
On Fri, Jul 24, 2015 at 10:39 PM CEST, Greg Kroah-Hartman 
 wrote:
> On Fri, Jul 24, 2015 at 05:12:38PM +0200, Jakub Sitnicki wrote:
>> linux/ieee80211.h already defines constants for information element IDs.
>> Include it where needed, resolve discrepancies in naming, and remove the
>> duplicated definitions.
>> 
>> While at it, wrap a line that was too long and remove extra parentheses
>> in an expression that mixes only equality and logical operators.
>
> This patch doesn't apply at all.

My mistake, sorry.  I've generated it against v4.2-rc3.

> Also, don't do more than one thing in a single patch, this should be
> broken up into multiple ones.

OK, I'll redo it with style fixes split out into a separate patch.

Cheers,
Jakub
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: [PATCH RESEND] staging: rtl8188eu: don't duplicate ieee80211 WLAN_EID_* constants

2015-07-25 Thread Dan Carpenter
On Sat, Jul 25, 2015 at 04:05:52PM +0200, Jakub Sitnicki wrote:
> On Fri, Jul 24, 2015 at 10:39 PM CEST, Greg Kroah-Hartman 
>  wrote:
> > On Fri, Jul 24, 2015 at 05:12:38PM +0200, Jakub Sitnicki wrote:
> >> linux/ieee80211.h already defines constants for information element IDs.
> >> Include it where needed, resolve discrepancies in naming, and remove the
> >> duplicated definitions.
> >> 
> >> While at it, wrap a line that was too long and remove extra parentheses
> >> in an expression that mixes only equality and logical operators.
> >
> > This patch doesn't apply at all.
> 
> My mistake, sorry.  I've generated it against v4.2-rc3.
> 

Do it against

git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging-next

regards,
dan carpenter

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 2/2] staging: lustre: fixed 80-char rule

2015-07-25 Thread Mario Bambagini
This patch fixes 2 lines longer than 80 chars

The first one is a function whose argument has been moved to next line.
The second one is a comment split on two lines

The script checkpatch does not complain anymore

Signed-off-by: Mario Bambagini 
---
 drivers/staging/lustre/lustre/llite/llite_capa.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/lustre/lustre/llite/llite_capa.c 
b/drivers/staging/lustre/lustre/llite/llite_capa.c
index 119f017..1f72066 100644
--- a/drivers/staging/lustre/lustre/llite/llite_capa.c
+++ b/drivers/staging/lustre/lustre/llite/llite_capa.c
@@ -70,7 +70,8 @@ static unsigned long long ll_capa_renewal_retries;
 
 static int ll_update_capa(struct obd_capa *ocapa, struct lustre_capa *capa);
 
-static inline void update_capa_timer(struct obd_capa *ocapa, unsigned long 
expiry)
+static inline void update_capa_timer(struct obd_capa *ocapa,
+  unsigned long expiry)
 {
if (time_before(expiry, ll_capa_timer.expires) ||
!timer_pending(&ll_capa_timer)) {
@@ -165,7 +166,8 @@ static void ll_delete_capa(struct obd_capa *ocapa)
 /* three places where client capa is deleted:
  * 1. capa_thread_main(), main place to delete expired capa.
  * 2. ll_clear_inode_capas() in ll_clear_inode().
- * 3. ll_truncate_free_capa() delete truncate capa explicitly in 
ll_setattr_ost().
+ * 3. ll_truncate_free_capa() delete truncate capa explicitly in
+ *ll_setattr_ost().
  */
 static int capa_thread_main(void *unused)
 {
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 1/2] staging: lustre: fixed comments without */ on a separate line

2015-07-25 Thread Mario Bambagini
this set of patches fixes several code style problems:
-patch 1: comments without */ on a separate line
-patch 2: lines with more than 80 chars

This patch fixes 4 comments without */ on a new line

Signed-off-by: Mario Bambagini 
---
 drivers/staging/lustre/lustre/llite/llite_capa.c | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lustre/llite/llite_capa.c 
b/drivers/staging/lustre/lustre/llite/llite_capa.c
index a626871..119f017 100644
--- a/drivers/staging/lustre/lustre/llite/llite_capa.c
+++ b/drivers/staging/lustre/lustre/llite/llite_capa.c
@@ -206,7 +206,8 @@ static int capa_thread_main(void *unused)
 * lock.
 */
/* ibits may be changed by ll_have_md_lock() so we have
-* to set it each time */
+* to set it each time
+*/
ibits = MDS_INODELOCK_LOOKUP;
if (capa_for_mds(&ocapa->c_capa) &&
!S_ISDIR(ocapa->u.cli.inode->i_mode) &&
@@ -225,7 +226,8 @@ static int capa_thread_main(void *unused)
if (capa_for_oss(&ocapa->c_capa) &&
obd_capa_open_count(ocapa) == 0) {
/* oss capa with open count == 0 won't renew,
-* move to idle list */
+* move to idle list
+*/
sort_add_capa(ocapa, &ll_idle_capas);
continue;
}
@@ -447,7 +449,8 @@ static inline void inode_add_oss_capa(struct inode *inode,
struct list_head *next = NULL;
 
/* capa is sorted in lli_oss_capas so lookup can always find the
-* latest one */
+* latest one
+*/
list_for_each_entry(tmp, &lli->lli_oss_capas, u.cli.lli_list) {
if (cfs_time_after(ocapa->c_expiry, tmp->c_expiry)) {
next = &tmp->u.cli.lli_list;
@@ -537,7 +540,8 @@ static int ll_update_capa(struct obd_capa *ocapa, struct 
lustre_capa *capa)
ll_capa_renewal_failed++;
 
/* failed capa won't be renewed any longer, but if -EIO,
-* client might be doing recovery, retry in 2 min. */
+* client might be doing recovery, retry in 2 min.
+*/
if (rc == -EIO && !capa_is_expired(ocapa)) {
delay_capa_renew(ocapa, 120);
DEBUG_CAPA(D_ERROR, &ocapa->c_capa,
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: [PATCH RESEND] staging: rtl8188eu: don't duplicate ieee80211 WLAN_EID_* constants

2015-07-25 Thread Jakub Sitnicki
On Sat, Jul 25, 2015 at 04:30 PM CEST, Dan Carpenter  
wrote:
> On Sat, Jul 25, 2015 at 04:05:52PM +0200, Jakub Sitnicki wrote:
>> On Fri, Jul 24, 2015 at 10:39 PM CEST, Greg Kroah-Hartman 
>>  wrote:
>> > On Fri, Jul 24, 2015 at 05:12:38PM +0200, Jakub Sitnicki wrote:
>> >> linux/ieee80211.h already defines constants for information element IDs.
>> >> Include it where needed, resolve discrepancies in naming, and remove the
>> >> duplicated definitions.
>> >> 
>> >> While at it, wrap a line that was too long and remove extra parentheses
>> >> in an expression that mixes only equality and logical operators.
>> >
>> > This patch doesn't apply at all.
>> 
>> My mistake, sorry.  I've generated it against v4.2-rc3.
>> 
>
> Do it against
>
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging-next

Will do. Thanks,

Jakub
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[GIT PULL] Staging driver fixes for 4.2-rc4

2015-07-25 Thread Greg KH
The following changes since commit 52721d9d3334c1cb1f76219a161084094ec634dc:

  Linux 4.2-rc3 (2015-07-19 14:45:02 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/ 
tags/staging-4.2-rc4

for you to fetch changes up to 00243b1d180b7de3cf38a69948ea46aa0308f8c8:

  Merge tag 'iio-fixes-for-4.2c' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus 
(2015-07-23 13:32:05 -0700)


Staging driver fixes for 4.2-rc4

Here are a number of iio and staging driver fixes for reported issues for 
4.2-rc4.

Full details are in the shortlog.

All have been in linux-next for a while with no problems.

Signed-off-by: Greg Kroah-Hartman 


Adriana Reus (1):
  iio: inv-mpu: Specify the expected format/precision for write channels

Crt Mori (1):
  iio: mlx96014: Replace offset sign

Daniel Baluta (4):
  iio: ABI: Clarify proximity output value
  iio: proximity: sx9500: Fix proximity value
  iio: magnetometer: mmc35240: Fix crash in pm suspend
  iio: magnetometer: mmc35240: Fix SET/RESET mask

Fabio Estevam (1):
  iio: twl4030-madc: Pass the IRQF_ONESHOT flag

Fugang Duan (1):
  iio: adc: vf610: fix the adc register read fail issue

Geert Uytterhoeven (1):
  iio: sx9500: Add missing init in sx9500_buffer_pre{en,dis}able()

Greg Kroah-Hartman (1):
  Merge tag 'iio-fixes-for-4.2c' of git://git.kernel.org/.../jic23/iio into 
staging-linus

Hartmut Knaack (10):
  iio:light:cm3323: clear bitmask before set
  iio:accel:bmc150-accel: fix counting direction
  iio:adc:cc10001_adc: fix Kconfig dependency
  iio:light:stk3310: Fix REGMAP_I2C dependency
  iio:light:ltr501: fix variable in ltr501_init
  iio:light:ltr501: fix regmap dependency
  iio:magnetometer:bmc150_magn: add regmap dependency
  iio:magnetometer:bmc150_magn: output intended variable
  iio:light:stk3310: move device register to end of probe
  iio:light:stk3310: make endianness independent of host

Heiko Stuebner (1):
  iio: adc: rockchip_saradc: add missing MODULE_* data

JM Friedt (1):
  iio: DAC: ad5624r_spi: fix bit shift of output data value

Jan Leupold (1):
  iio: adc: at91_adc: allow to use full range of startup time

Malcolm Priestley (2):
  staging: vt6655: check ieee80211_bss_conf bssid not NULL
  staging: vt6656: check ieee80211_bss_conf bssid not NULL

Manfred Schlaegl (1):
  iio: mcp320x: Fix NULL pointer dereference

Martin Kepplinger (1):
  iio: mma8452: use iio event type IIO_EV_TYPE_MAG

Peter Meerwald (2):
  iio: light: tcs3414: Fix bug preventing to set integration time
  iio: tmp006: Check channel info on write

Srinivas Pandruvada (1):
  hid-sensor: Fix suspend/resume delay

Teodora Baluta (1):
  iio: magnetometer: mmc35240: fix available sampling frequencies

Tiberiu Breana (1):
  iio: light: STK3310: un-invert proximity values

Viorel Suman (1):
  iio: magnetometer: mmc35240: fix SET/RESET sequence

Vlad Dogaru (2):
  iio: sx9500: rework error handling of raw readings
  iio: sx9500: fix bug in compensation code

 drivers/iio/accel/mma8452.c|  8 
 drivers/iio/adc/mcp320x.c  |  2 ++
 drivers/iio/adc/vf610_adc.c|  2 +-
 drivers/iio/light/stk3310.c| 26 +-
 drivers/iio/magnetometer/Kconfig   |  1 +
 drivers/iio/magnetometer/bmc150_magn.c |  4 ++--
 drivers/iio/magnetometer/mmc35240.c| 12 +++-
 drivers/iio/temperature/mlx90614.c |  2 +-
 8 files changed, 31 insertions(+), 26 deletions(-)
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] drivers: staging: lustre: lnet: klnds: o2iblnd: o2iblnd.c

2015-07-25 Thread Bharadwaaj
From: "bhaaradw...@gmail.com" 

Fixed spelling mistake.

Signed-off-by: Bharadwaaj Ramakrishnan 
---
 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c 
b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index 4eb24a1..463940b 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -1424,7 +1424,7 @@ static int kiblnd_create_fmr_pool(kib_fmr_poolset_t *fps,
 static void kiblnd_fail_fmr_poolset(kib_fmr_poolset_t *fps,
struct list_head *zombies)
 {
-   if (fps->fps_net == NULL) /* intialized? */
+   if (fps->fps_net == NULL) /* initialized? */
return;
 
spin_lock(&fps->fps_lock);
@@ -1628,7 +1628,7 @@ static void kiblnd_destroy_pool_list(struct list_head 
*head)
 
 static void kiblnd_fail_poolset(kib_poolset_t *ps, struct list_head *zombies)
 {
-   if (ps->ps_net == NULL) /* intialized? */
+   if (ps->ps_net == NULL) /* initialized? */
return;
 
spin_lock(&ps->ps_lock);
-- 
2.4.6

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 2/2] drivers: staging : media : davinci_vpfe : dma365_resizer.c drivers: staging : media : davinci_vpfe : dma365_resizer.h

2015-07-25 Thread Bharadwaaj
From: "bhaaradw...@gmail.com" 

Fixed some spelling mistake.

Signed-off-by: Bharadwaaj Ramakrishnan
---
 drivers/staging/media/davinci_vpfe/dm365_resizer.c | 22 +++---
 drivers/staging/media/davinci_vpfe/dm365_resizer.h |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/media/davinci_vpfe/dm365_resizer.c 
b/drivers/staging/media/davinci_vpfe/dm365_resizer.c
index acb293e..10f51f4 100644
--- a/drivers/staging/media/davinci_vpfe/dm365_resizer.c
+++ b/drivers/staging/media/davinci_vpfe/dm365_resizer.c
@@ -495,7 +495,7 @@ resizer_configure_in_continious_mode(struct 
vpfe_resizer_device *resizer)
int line_len;
int ret;
 
-   if (resizer->resizer_a.output != RESIZER_OUPUT_MEMORY) {
+   if (resizer->resizer_a.output != RESIZER_OUTPUT_MEMORY) {
dev_err(dev, "enable resizer - Resizer-A\n");
return -EINVAL;
}
@@ -507,7 +507,7 @@ resizer_configure_in_continious_mode(struct 
vpfe_resizer_device *resizer)
param->rsz_en[RSZ_B] = DISABLE;
param->oper_mode = RESIZER_MODE_CONTINIOUS;
 
-   if (resizer->resizer_b.output == RESIZER_OUPUT_MEMORY) {
+   if (resizer->resizer_b.output == RESIZER_OUTPUT_MEMORY) {
struct v4l2_mbus_framefmt *outformat2;
 
param->rsz_en[RSZ_B] = ENABLE;
@@ -1048,13 +1048,13 @@ static void resizer_ss_isr(struct vpfe_resizer_device 
*resizer)
if (ipipeif_sink != IPIPEIF_INPUT_MEMORY)
return;
 
-   if (resizer->resizer_a.output == RESIZER_OUPUT_MEMORY) {
+   if (resizer->resizer_a.output == RESIZER_OUTPUT_MEMORY) {
val = vpss_dma_complete_interrupt();
if (val != 0 && val != 2)
return;
}
 
-   if (resizer->resizer_a.output == RESIZER_OUPUT_MEMORY) {
+   if (resizer->resizer_a.output == RESIZER_OUTPUT_MEMORY) {
spin_lock(&video_out->dma_queue_lock);
vpfe_video_process_buffer_complete(video_out);
video_out->state = VPFE_VIDEO_BUFFER_NOT_QUEUED;
@@ -1064,7 +1064,7 @@ static void resizer_ss_isr(struct vpfe_resizer_device 
*resizer)
 
/* If resizer B is enabled */
if (pipe->output_num > 1 && resizer->resizer_b.output ==
-   RESIZER_OUPUT_MEMORY) {
+   RESIZER_OUTPUT_MEMORY) {
spin_lock(&video_out->dma_queue_lock);
vpfe_video_process_buffer_complete(video_out2);
video_out2->state = VPFE_VIDEO_BUFFER_NOT_QUEUED;
@@ -1074,7 +1074,7 @@ static void resizer_ss_isr(struct vpfe_resizer_device 
*resizer)
 
/* start HW if buffers are queued */
if (vpfe_video_is_pipe_ready(pipe) &&
-   resizer->resizer_a.output == RESIZER_OUPUT_MEMORY) {
+   resizer->resizer_a.output == RESIZER_OUTPUT_MEMORY) {
resizer_enable(resizer, 1);
vpfe_ipipe_enable(vpfe_dev, 1);
vpfe_ipipeif_enable(vpfe_dev);
@@ -1242,8 +1242,8 @@ static int resizer_do_hw_setup(struct vpfe_resizer_device 
*resizer)
struct resizer_params *param = &resizer->config;
int ret = 0;
 
-   if (resizer->resizer_a.output == RESIZER_OUPUT_MEMORY ||
-   resizer->resizer_b.output == RESIZER_OUPUT_MEMORY) {
+   if (resizer->resizer_a.output == RESIZER_OUTPUT_MEMORY ||
+   resizer->resizer_b.output == RESIZER_OUTPUT_MEMORY) {
if (ipipeif_sink == IPIPEIF_INPUT_MEMORY &&
ipipeif_source == IPIPEIF_OUTPUT_RESIZER)
ret = resizer_configure_in_single_shot_mode(resizer);
@@ -1268,7 +1268,7 @@ static int resizer_set_stream(struct v4l2_subdev *sd, int 
enable)
if (&resizer->crop_resizer.subdev != sd)
return 0;
 
-   if (resizer->resizer_a.output != RESIZER_OUPUT_MEMORY)
+   if (resizer->resizer_a.output != RESIZER_OUTPUT_MEMORY)
return 0;
 
switch (enable) {
@@ -1722,7 +1722,7 @@ static int resizer_link_setup(struct media_entity *entity,
}
if (resizer->resizer_a.output != RESIZER_OUTPUT_NONE)
return -EBUSY;
-   resizer->resizer_a.output = RESIZER_OUPUT_MEMORY;
+   resizer->resizer_a.output = RESIZER_OUTPUT_MEMORY;
break;
 
default:
@@ -1747,7 +1747,7 @@ static int resizer_link_setup(struct media_entity *entity,
}
if (resizer->resizer_b.output != RESIZER_OUTPUT_NONE)
return -EBUSY;
-   resizer->resizer_b.output = RESIZER_OUPUT_MEMORY;
+   resizer->resizer_b.output = RESIZER_OUTPUT_MEMORY;
break;
 
default:
diff --git a/drivers/staging/media/davinci_vpfe/dm365_resizer.h 
b/drivers/staging/media/davinci_vpfe/dm365_resizer.h
index 93b0f44..00e6