linux-next: manual merge of the staging-next tree with the pcmcia tree

linux-next: manual merge of the staging-next tree with the pcmcia tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/comedi/drivers/quatech_daqp_cs.c between commit
9b3efec734d2d79d82a6f5cef25a618d41a6b2c5 ("pcmcia: do not use io_req_t
after call to pcmcia_request_io()") from the pcmcia tree and commit
3420f6b4c1ac731e80d0911e0092705992cef14f ("Staging: comedi: drivers: fix
coding style issues in quatech_daqp_cs.c") from the staging-next tree.

Just context changes.  I fixed it up (see below) and can carry the fixes
as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/comedi/drivers/quatech_daqp_cs.c
index 25f4e67e,8b49cb1..0000000
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@@ -1150,11 -1151,13 +1148,11 @@@ static void daqp_cs_config(struct pcmci
  	/* Finally, report what we've done */
  	dev_info(&link->dev, "index 0x%02x", link->conf.ConfigIndex);
  	if (link->conf.Attributes & CONF_ENABLE_IRQ)
- 		printk(", irq %u", link->irq);
+ 		printk(KERN_INFO ", irq %u", link->irq);
 -	if (link->io.NumPorts1)
 -		printk(", io 0x%04x-0x%04x", link->io.BasePort1,
 -		       link->io.BasePort1 + link->io.NumPorts1 - 1);
 -	if (link->io.NumPorts2)
 -		printk(" & 0x%04x-0x%04x", link->io.BasePort2,
 -		       link->io.BasePort2 + link->io.NumPorts2 - 1);
 +	if (link->resource[0])
 +		printk(" & %pR", link->resource[0]);
 +	if (link->resource[1])
 +		printk(" & %pR", link->resource[1]);
  	printk("\n");
  
  	return;

Re: linux-next: manual merge of the staging-next tree with the pcmcia tree

[Greg KH]

On Mon, Aug 02, 2010 at 01:57:40PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/comedi/drivers/quatech_daqp_cs.c between commit
> 9b3efec734d2d79d82a6f5cef25a618d41a6b2c5 ("pcmcia: do not use io_req_t
> after call to pcmcia_request_io()") from the pcmcia tree and commit
> 3420f6b4c1ac731e80d0911e0092705992cef14f ("Staging: comedi: drivers: fix
> coding style issues in quatech_daqp_cs.c") from the staging-next tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fixes
> as necessary.

Those fixes are fine.

thanks,

greg k-h

Re: linux-next: manual merge of the staging-next tree with the pcmcia tree

[Greg KH]

On Mon, Aug 02, 2010 at 01:57:46PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/wlags49_h2/wl_cs.c between commits
> 9b3efec734d2d79d82a6f5cef25a618d41a6b2c5 ("pcmcia: do not use io_req_t
> after call to pcmcia_request_io()") and
> cd8ae1e0a5d36406b518cea25446492f07ddddcf ("pcmcia: do not use io_req_t
> when calling pcmcia_request_io()") from the pcmcia tree and commit
> 6d98be390ab55bb5f617d69aedf9bec27d039b3b ("Staging: wl_cs.c: converted
> space to tabs in wl_cs.c") from the staging-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Those fixes are fine, thanks for doing this.

greg k-h

linux-next: manual merge of the staging-next tree with the pcmcia tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/wlags49_h2/wl_cs.c between commits
9b3efec734d2d79d82a6f5cef25a618d41a6b2c5 ("pcmcia: do not use io_req_t
after call to pcmcia_request_io()") and
cd8ae1e0a5d36406b518cea25446492f07ddddcf ("pcmcia: do not use io_req_t
when calling pcmcia_request_io()") from the pcmcia tree and commit
6d98be390ab55bb5f617d69aedf9bec27d039b3b ("Staging: wl_cs.c: converted
space to tabs in wl_cs.c") from the staging-next tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/wlags49_h2/wl_cs.c
index f15afd2,464b067..0000000
--- a/drivers/staging/wlags49_h2/wl_cs.c
+++ b/drivers/staging/wlags49_h2/wl_cs.c
@@@ -132,35 -133,36 +132,35 @@@ extern dbg_info_t *DbgInfo
   ******************************************************************************/
  static int wl_adapter_attach(struct pcmcia_device *link)
  {
-     struct net_device   *dev;
-     struct wl_private	*lp;
-     /*------------------------------------------------------------------------*/
- 
-     DBG_FUNC( "wl_adapter_attach" );
-     DBG_ENTER( DbgInfo );
- 
-     dev = wl_device_alloc();
-     if(dev == NULL) {
-         DBG_ERROR( DbgInfo, "wl_device_alloc returned NULL\n");
- 	return -ENOMEM;
-     }
- 
-     link->resource[0]->end      = HCF_NUM_IO_PORTS;
-     link->resource[0]->flags    = IO_DATA_PATH_WIDTH_16;
-     link->conf.Attributes   = CONF_ENABLE_IRQ;
-     link->conf.IntType      = INT_MEMORY_AND_IO;
-     link->conf.ConfigIndex  = 5;
-     link->conf.Present      = PRESENT_OPTION;
- 
-     link->priv = dev;
-     lp = wl_priv(dev);
-     lp->link = link;
- 
-     wl_adapter_insert(link);
- 
-     DBG_LEAVE( DbgInfo );
-     return 0;
- } // wl_adapter_attach
+ 	struct net_device   *dev;
+ 	struct wl_private   *lp;
+ 	/*--------------------------------------------------------------------*/
+ 
+ 	DBG_FUNC("wl_adapter_attach");
+ 	DBG_ENTER(DbgInfo);
+ 
+ 	dev = wl_device_alloc();
+ 	if (dev == NULL) {
+ 		DBG_ERROR(DbgInfo, "wl_device_alloc returned NULL\n");
+ 		return -ENOMEM;
+ 	}
+ 
 -	link->io.NumPorts1      = HCF_NUM_IO_PORTS;
 -	link->io.Attributes1    = IO_DATA_PATH_WIDTH_16;
 -	link->io.IOAddrLines    = 6;
++	link->resource[0]->end  = HCF_NUM_IO_PORTS;
++	link->resource[0]->flags = IO_DATA_PATH_WIDTH_16;
+ 	link->conf.Attributes   = CONF_ENABLE_IRQ;
+ 	link->conf.IntType      = INT_MEMORY_AND_IO;
+ 	link->conf.ConfigIndex  = 5;
+ 	link->conf.Present      = PRESENT_OPTION;
+ 
+ 	link->priv = dev;
+ 	lp = wl_priv(dev);
+ 	lp->link = link;
+ 
+ 	wl_adapter_insert(link);
+ 
+ 	DBG_LEAVE(DbgInfo);
+ 	return 0;
+ } /* wl_adapter_attach */
  /*============================================================================*/
  
  
@@@ -289,61 -290,59 +288,60 @@@ static int wl_adapter_resume(struct pcm
   *      N/A
   *
   ******************************************************************************/
- void wl_adapter_insert( struct pcmcia_device *link )
+ void wl_adapter_insert(struct pcmcia_device *link)
  {
-     struct net_device       *dev;
-     int i;
-     int                     ret;
-     /*------------------------------------------------------------------------*/
+ 	struct net_device *dev;
+ 	int i;
+ 	int ret;
+ 	/*--------------------------------------------------------------------*/
  
-     DBG_FUNC( "wl_adapter_insert" );
-     DBG_ENTER( DbgInfo );
-     DBG_PARAM( DbgInfo, "link", "0x%p", link );
+ 	DBG_FUNC("wl_adapter_insert");
+ 	DBG_ENTER(DbgInfo);
+ 	DBG_PARAM(DbgInfo, "link", "0x%p", link);
  
-     dev     = link->priv;
+ 	dev     = link->priv;
  
-     /* Do we need to allocate an interrupt? */
-     link->conf.Attributes |= CONF_ENABLE_IRQ;
-     link->io_lines = 6;
+ 	/* Do we need to allocate an interrupt? */
+ 	link->conf.Attributes |= CONF_ENABLE_IRQ;
++	link->io_lines = 6;
  
-     ret = pcmcia_request_io(link);
-     if (ret != 0)
-         goto failed;
 -	ret = pcmcia_request_io(link, &link->io);
++	ret = pcmcia_request_io(link);
+ 	if (ret != 0)
+ 		goto failed;
  
-     ret = pcmcia_request_irq(link, (void *) wl_isr);
-     if (ret != 0)
-         goto failed;
+ 	ret = pcmcia_request_irq(link, (void *) wl_isr);
+ 	if (ret != 0)
+ 		goto failed;
  
-     ret = pcmcia_request_configuration(link, &link->conf);
-     if (ret != 0)
-         goto failed;
+ 	ret = pcmcia_request_configuration(link, &link->conf);
+ 	if (ret != 0)
+ 		goto failed;
  
-     dev->irq        = link->irq;
-     dev->base_addr  = link->resource[0]->start;
+ 	dev->irq        = link->irq;
 -	dev->base_addr  = link->io.BasePort1;
++	dev->base_addr  = link->resource[0]->start;
  
-     SET_NETDEV_DEV(dev, &link->dev);
-     if (register_netdev(dev) != 0) {
- 	printk("%s: register_netdev() failed\n", MODULE_NAME);
- 	goto failed;
-     }
+ 	SET_NETDEV_DEV(dev, &link->dev);
+ 	if (register_netdev(dev) != 0) {
+ 		printk("%s: register_netdev() failed\n", MODULE_NAME);
+ 		goto failed;
+ 	}
  
-     register_wlags_sysfs(dev);
+ 	register_wlags_sysfs(dev);
  
-     printk(KERN_INFO "%s: Wireless, io_addr %#03lx, irq %d, ""mac_address ",
-                dev->name, dev->base_addr, dev->irq);
-     for( i = 0; i < ETH_ALEN; i++ ) {
-         printk("%02X%c", dev->dev_addr[i], ((i < (ETH_ALEN-1)) ? ':' : '\n'));
-     }
+ 	printk(KERN_INFO "%s: Wireless, io_addr %#03lx, irq %d, ""mac_address ",
+ 		dev->name, dev->base_addr, dev->irq);
+ 	for (i = 0; i < ETH_ALEN; i++)
+ 		printk("%02X%c", dev->dev_addr[i], ((i < (ETH_ALEN-1)) ? ':' : '\n'));
  
-     DBG_LEAVE( DbgInfo );
-     return;
+ 	DBG_LEAVE(DbgInfo);
+ 	return;
  
  failed:
-     wl_adapter_release( link );
+ 	wl_adapter_release(link);
  
-     DBG_LEAVE(DbgInfo);
-     return;
- } // wl_adapter_insert
+ 	DBG_LEAVE(DbgInfo);
+ 	return;
+ } /* wl_adapter_insert */
  /*============================================================================*/
  
  

Re: linux-next: manual merge of the staging-next tree with the pcmcia tree

[Greg KH]

On Mon, May 17, 2010 at 03:49:19PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/wlags49_h2/wl_cs.c between commit
> eb14120f743d29744d9475bffec56ff4ad43a749 ("pcmcia: re-work
> pcmcia_request_irq()") from the pcmcia tree and commit
> 93822ad193f1b1d92422dc3d539456acbe1a85ef ("Staging: wlags49_hs2: Fix
> wlags49_hs2 driver after build fixes broke it") from the staging-next
> tree.
> 
> I fixed it up (see below - basically the staging-next version) and can
> carry the fix as necessary.

Looks good to me, thanks.

greg k-h

linux-next: manual merge of the staging-next tree with the pcmcia tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/wlags49_h2/wl_cs.c between commit
eb14120f743d29744d9475bffec56ff4ad43a749 ("pcmcia: re-work
pcmcia_request_irq()") from the pcmcia tree and commit
93822ad193f1b1d92422dc3d539456acbe1a85ef ("Staging: wlags49_hs2: Fix
wlags49_hs2 driver after build fixes broke it") from the staging-next
tree.

I fixed it up (see below - basically the staging-next version) and can
carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/wlags49_h2/wl_cs.c
index c9d99d8,568993f..0000000
--- a/drivers/staging/wlags49_h2/wl_cs.c
+++ b/drivers/staging/wlags49_h2/wl_cs.c
@@@ -314,15 -310,22 +307,22 @@@ void wl_adapter_insert( struct pcmcia_d
      /* Do we need to allocate an interrupt? */
      link->conf.Attributes |= CONF_ENABLE_IRQ;
  
-     CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
-     CS_CHECK(RequestIRQ, pcmcia_request_irq(link, wl_isr));
-     CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
+     ret = pcmcia_request_io(link, &link->io);
+     if (ret != 0)
+         goto failed;
+ 
+     ret = pcmcia_request_irq(link, (void *) wl_isr);
+     if (ret != 0)
+         goto failed;
  
+     ret = pcmcia_request_configuration(link, &link->conf);
+     if (ret != 0)
+         goto failed;
  
 -    dev->irq        = link->irq.AssignedIRQ;
 +    dev->irq        = link->irq;
      dev->base_addr  = link->io.BasePort1;
  
-     SET_NETDEV_DEV(dev, &handle_to_dev(link));
+     SET_NETDEV_DEV(dev, &link->dev);
      if (register_netdev(dev) != 0) {
  	printk("%s: register_netdev() failed\n", MODULE_NAME);
  	goto failed;

Re: linux-next: manual merge of the staging-next tree with the pcmcia tree

[Greg KH]

On Wed, May 12, 2010 at 04:03:52PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/wlags49_h2/wl_cs.c between commit
> c8df2d45846e374de8ff601b9ea0537becfe75ca ("pcmcia: re-work
> pcmcia_request_irq()") from the pcmcia tree and commit  ("") from the
> staging-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Heh, I just hacked that driver up to build properly, odds are it doesn't
run :)

But your fix looks fine, thanks for it.

greg k-h

linux-next: manual merge of the staging-next tree with the pcmcia tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/wlags49_h2/wl_cs.c between commit
c8df2d45846e374de8ff601b9ea0537becfe75ca ("pcmcia: re-work
pcmcia_request_irq()") from the pcmcia tree and commit  ("") from the
staging-next tree.

I fixed it up (see below) and can carry the fix as necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/wlags49_h2/wl_cs.c
index c9d99d8,7c33ead..0000000
--- a/drivers/staging/wlags49_h2/wl_cs.c
+++ b/drivers/staging/wlags49_h2/wl_cs.c
@@@ -314,15 -317,15 +314,15 @@@ void wl_adapter_insert( struct pcmcia_d
      /* Do we need to allocate an interrupt? */
      link->conf.Attributes |= CONF_ENABLE_IRQ;
  
-     CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
-     CS_CHECK(RequestIRQ, pcmcia_request_irq(link, wl_isr));
-     CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
+ //    CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
 -//    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
++//    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, wl_isr));
+ //    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
  
  
 -    dev->irq        = link->irq.AssignedIRQ;
 +    dev->irq        = link->irq;
      dev->base_addr  = link->io.BasePort1;
  
-     SET_NETDEV_DEV(dev, &handle_to_dev(link));
+     SET_NETDEV_DEV(dev, &link->dev);
      if (register_netdev(dev) != 0) {
  	printk("%s: register_netdev() failed\n", MODULE_NAME);
  	goto failed;

Re: linux-next: manual merge of the staging-next tree with the pcmcia tree

[Greg KH]

On Wed, Apr 28, 2010 at 04:07:41PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/comedi/drivers/cb_das16_cs.c between commitc
> 8bf6e66c254bba7d0ea3f5d02420776dceac657 ("") from the pcmcia tree and
> commit 6ea17dd43c1153f99920e66f806d86f4e83583cc ("Staging: comedi:
> cb_das16_cs: fixed multiple brace coding style issues") from the
> staging-next tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Looks great, thanks,

greg k-h

Re: linux-next: manual merge of the staging-next tree with the pcmcia tree

[Greg KH]

On Wed, Apr 28, 2010 at 04:11:53PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/netwave/netwave_cs.c between commit
> c8bf6e66c254bba7d0ea3f5d02420776dceac657 ("pcmcia: re-work
> pcmcia_request_irq()") from the pcmcia tree and commit
> 3c7475d0aaad3614f6b1db291310c577eee3fb33 ("Staging: netwave: fixed
> trailing whitespace style issue in netwave_cs.c") from the staging-next
> tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Fix looks fine, thanks.

greg k-h

linux-next: manual merge of the staging-next tree with the pcmcia tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/netwave/netwave_cs.c between commit
c8bf6e66c254bba7d0ea3f5d02420776dceac657 ("pcmcia: re-work
pcmcia_request_irq()") from the pcmcia tree and commit
3c7475d0aaad3614f6b1db291310c577eee3fb33 ("Staging: netwave: fixed
trailing whitespace style issue in netwave_cs.c") from the staging-next
tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/netwave/netwave_cs.c
index f1ee2cb,7b31621..0000000
--- a/drivers/staging/netwave/netwave_cs.c
+++ b/drivers/staging/netwave/netwave_cs.c
@@@ -377,10 -378,14 +377,10 @@@ static int netwave_probe(struct pcmcia_
      /* The io structure describes IO port mapping */
      link->io.NumPorts1 = 16;
      link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-     /* link->io.NumPorts2 = 16; 
+     /* link->io.NumPorts2 = 16;
         link->io.Attributes2 = IO_DATA_PATH_WIDTH_16; */
      link->io.IOAddrLines = 5;
-     
+ 
 -    /* Interrupt setup */
 -    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
 -    link->irq.Handler = &netwave_interrupt;
 -
      /* General socket configuration */
      link->conf.Attributes = CONF_ENABLE_IRQ;
      link->conf.IntType = INT_MEMORY_AND_IO;

linux-next: manual merge of the staging-next tree with the pcmcia tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/comedi/drivers/cb_das16_cs.c between commitc
8bf6e66c254bba7d0ea3f5d02420776dceac657 ("") from the pcmcia tree and
commit 6ea17dd43c1153f99920e66f806d86f4e83583cc ("Staging: comedi:
cb_das16_cs: fixed multiple brace coding style issues") from the
staging-next tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/comedi/drivers/cb_das16_cs.c
index e0352c6,68bd5ca..0000000
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@@ -175,17 -175,17 +175,17 @@@ static int das16cs_attach(struct comedi
  	printk("I/O base=0x%04lx ", dev->iobase);
  
  	printk("fingerprint:\n");
- 	for (i = 0; i < 48; i += 2) {
+ 	for (i = 0; i < 48; i += 2)
  		printk("%04x ", inw(dev->iobase + i));
- 	}
+ 
  	printk("\n");
  
 -	ret = request_irq(link->irq.AssignedIRQ, das16cs_interrupt,
 +	ret = request_irq(link->irq, das16cs_interrupt,
  			  IRQF_SHARED, "cb_das16_cs", dev);
- 	if (ret < 0) {
+ 	if (ret < 0)
  		return ret;
- 	}
+ 
 -	dev->irq = link->irq.AssignedIRQ;
 +	dev->irq = link->irq;
  	printk("irq=%u ", dev->irq);
  
  	dev->board_ptr = das16cs_probe(dev, link);