Re: [PATCH 1/6] staging: kpc2000: fix indent in cell_probe.c

2019-05-23 Thread Simon Sandström
On Thu, May 23, 2019 at 09:27:59AM +0200, Greg KH wrote:
> On Thu, May 23, 2019 at 09:26:25AM +0200, Greg KH wrote:
> > 
> > This chunk does not match what you said this commit did :(
> > 
> > Please fix up and resend.
> 
> Actually, wait, rebase and resend after I apply your other patches.
> I'll hand-edit this patch to remove this chunk as your other fixes are
> good...
> 
> thanks,
> 
> greg k-h

Wops. OK, will do.

Thanks

- Simon


Re: [PATCH 1/6] staging: kpc2000: fix indent in cell_probe.c

2019-05-23 Thread Greg KH
On Thu, May 23, 2019 at 09:26:25AM +0200, Greg KH wrote:
> On Wed, May 22, 2019 at 10:58:44PM +0200, Simon Sandström wrote:
> > Use tabs instead of spaces for indentation.
> > 
> > Signed-off-by: Simon Sandström 
> > ---
> >  drivers/staging/kpc2000/kpc2000/cell_probe.c | 574 +--
> >  1 file changed, 287 insertions(+), 287 deletions(-)
> > 
> > diff --git a/drivers/staging/kpc2000/kpc2000/cell_probe.c 
> > b/drivers/staging/kpc2000/kpc2000/cell_probe.c
> > index 0181b0a8ff82..6e034d115b47 100644
> > --- a/drivers/staging/kpc2000/kpc2000/cell_probe.c
> > +++ b/drivers/staging/kpc2000/kpc2000/cell_probe.c
> > @@ -25,7 +25,7 @@
> >   *  D  
> >  C2S DMA Present
> >   *   DDD   
> >  C2S DMA Channel Number[up to 8 channels]
> >   *  II 
> >  IRQ Count [0 to 3 IRQs per core]
> > -  
> > 111000
> > + *
> > 111000
> >   *
> > III   IRQ Base Number [up to 128 IRQs per card]
> >   * 
> >   ___Spare
> >   *
> 
> This chunk does not match what you said this commit did :(
> 
> Please fix up and resend.

Actually, wait, rebase and resend after I apply your other patches.
I'll hand-edit this patch to remove this chunk as your other fixes are
good...

thanks,

greg k-h


Re: [PATCH 1/6] staging: kpc2000: fix indent in cell_probe.c

2019-05-23 Thread Greg KH
On Wed, May 22, 2019 at 10:58:44PM +0200, Simon Sandström wrote:
> Use tabs instead of spaces for indentation.
> 
> Signed-off-by: Simon Sandström 
> ---
>  drivers/staging/kpc2000/kpc2000/cell_probe.c | 574 +--
>  1 file changed, 287 insertions(+), 287 deletions(-)
> 
> diff --git a/drivers/staging/kpc2000/kpc2000/cell_probe.c 
> b/drivers/staging/kpc2000/kpc2000/cell_probe.c
> index 0181b0a8ff82..6e034d115b47 100644
> --- a/drivers/staging/kpc2000/kpc2000/cell_probe.c
> +++ b/drivers/staging/kpc2000/kpc2000/cell_probe.c
> @@ -25,7 +25,7 @@
>   *  D
>C2S DMA Present
>   *   DDD 
>C2S DMA Channel Number[up to 8 channels]
>   *  II   
>IRQ Count [0 to 3 IRQs per core]
> -  
> 111000
> + *
> 111000
>   *
> III   IRQ Base Number [up to 128 IRQs per card]
>   *   
> ___Spare
>   *

This chunk does not match what you said this commit did :(

Please fix up and resend.

thanks,

greg k-h


[PATCH 1/6] staging: kpc2000: fix indent in cell_probe.c

2019-05-22 Thread Simon Sandström
Use tabs instead of spaces for indentation.

Signed-off-by: Simon Sandström 
---
 drivers/staging/kpc2000/kpc2000/cell_probe.c | 574 +--
 1 file changed, 287 insertions(+), 287 deletions(-)

diff --git a/drivers/staging/kpc2000/kpc2000/cell_probe.c 
b/drivers/staging/kpc2000/kpc2000/cell_probe.c
index 0181b0a8ff82..6e034d115b47 100644
--- a/drivers/staging/kpc2000/kpc2000/cell_probe.c
+++ b/drivers/staging/kpc2000/kpc2000/cell_probe.c
@@ -25,7 +25,7 @@
  *  D  
 C2S DMA Present
  *   DDD   
 C2S DMA Channel Number[up to 8 channels]
  *  II 
 IRQ Count [0 to 3 IRQs per core]
-  
111000
+ *
111000
  *III  
 IRQ Base Number [up to 128 IRQs per card]
  *   
___Spare
  *
@@ -40,45 +40,45 @@
 #define KP_CORE_ID_SPI  5
 
 struct core_table_entry {
-u16 type;
-u32 offset;
-u32 length;
-bools2c_dma_present;
-u8  s2c_dma_channel_num;
-boolc2s_dma_present;
-u8  c2s_dma_channel_num;
-u8  irq_count;
-u8  irq_base_num;
+   u16  type;
+   u32  offset;
+   u32  length;
+   bool s2c_dma_present;
+   u8   s2c_dma_channel_num;
+   bool c2s_dma_present;
+   u8   c2s_dma_channel_num;
+   u8   irq_count;
+   u8   irq_base_num;
 };
 
 static
 void  parse_core_table_entry_v0(struct core_table_entry *cte, const u64 
read_val)
 {
-cte->type= ((read_val & 0xFFF0) >> 52);
-cte->offset  = ((read_val & 0x) >> 16) * 4096;
-cte->length  = ((read_val & 0x) >> 32) * 8;
-cte->s2c_dma_present = ((read_val & 0x0008) >> 51);
-cte->s2c_dma_channel_num = ((read_val & 0x0007) >> 48);
-cte->c2s_dma_present = ((read_val & 0x8000) >> 15);
-cte->c2s_dma_channel_num = ((read_val & 0x7000) >> 12);
-cte->irq_count   = ((read_val & 0x0C00) >> 10);
-cte->irq_base_num= ((read_val & 0x03F8) >>  3);
+   cte->type= ((read_val & 0xFFF0) >> 52);
+   cte->offset  = ((read_val & 0x) >> 16) * 
4096;
+   cte->length  = ((read_val & 0x) >> 32) * 8;
+   cte->s2c_dma_present = ((read_val & 0x0008) >> 51);
+   cte->s2c_dma_channel_num = ((read_val & 0x0007) >> 48);
+   cte->c2s_dma_present = ((read_val & 0x8000) >> 15);
+   cte->c2s_dma_channel_num = ((read_val & 0x7000) >> 12);
+   cte->irq_count   = ((read_val & 0x0C00) >> 10);
+   cte->irq_base_num= ((read_val & 0x03F8) >>  3);
 }
 
 static
 void dbg_cte(struct kp2000_device *pcard, struct core_table_entry *cte)
 {
-dev_dbg(>pdev->dev, "CTE: type:%3d  offset:%3d (%3d)  length:%3d 
(%3d)  s2c:%d  c2s:%d  irq_count:%d  base_irq:%d\n",
-cte->type,
-cte->offset,
-cte->offset / 4096,
-cte->length,
-cte->length / 8,
-(cte->s2c_dma_present ? cte->s2c_dma_channel_num : -1),
-(cte->c2s_dma_present ? cte->c2s_dma_channel_num : -1),
-cte->irq_count,
-cte->irq_base_num
-);
+   dev_dbg(>pdev->dev, "CTE: type:%3d  offset:%3d (%3d)  length:%3d 
(%3d)  s2c:%d  c2s:%d  irq_count:%d  base_irq:%d\n",
+   cte->type,
+   cte->offset,
+   cte->offset / 4096,
+   cte->length,
+   cte->length / 8,
+   (cte->s2c_dma_present ? cte->s2c_dma_channel_num : -1),
+   (cte->c2s_dma_present ? cte->c2s_dma_channel_num : -1),
+   cte->irq_count,
+   cte->irq_base_num
+   );
 }
 
 static
@@ -94,55 +94,55 @@ void parse_core_table_entry(struct core_table_entry *cte, 
const u64 read_val, co
 static int probe_core_basic(unsigned int core_num, struct kp2000_device *pcard,
char *name, const struct core_table_entry cte)
 {
-struct mfd_cell  cell = { .id = core_num, .name = name };
-struct resource  resources[2];
+   struct mfd_cell  cell = { .id = core_num, .name = name };
+   struct resource resources[2];
 
-struct kpc_core_device_platdata  core_pdata = {
-.card_id   = pcard->card_id,
-.build_version = pcard->build_version,
-.hardware_revision = pcard->hardware_revision,
-.ssid  = pcard->ssid,
-