[PATCH resend] pcmcia: alchemy: fixup wrong comments

[Dominik Brodowski]

Applied, thanks.

On Mon, Mar 01, 2010 at 09:40:56PM +0100, Manuel Lauss wrote:
> Commit 11b897cf84c37e6522db914793677e933ef311fb  changed expected
> pcmcia area addresses from the 32bit pseudo to the real 36bit
> addresses, but did not update the comments.
> 
> Signed-off-by: Manuel Lauss <manuel.lauss at gmail.com>
> ---
> Applies to current linus-git.
> This time with s-o-b.
> 
>  drivers/pcmcia/db1xxx_ss.c  |   19 ++++---------------
>  drivers/pcmcia/xxs1500_ss.c |   16 +++-------------
>  2 files changed, 7 insertions(+), 28 deletions(-)
> 
> diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c
> index 3889cf0..9254ab0 100644
> --- a/drivers/pcmcia/db1xxx_ss.c
> +++ b/drivers/pcmcia/db1xxx_ss.c
> @@ -42,7 +42,6 @@ struct db1x_pcmcia_sock {
>  	int		nr;		/* socket number */
>  	void		*virt_io;
>  
> -	/* the "pseudo" addresses of the PCMCIA space. */
>  	phys_addr_t	phys_io;
>  	phys_addr_t	phys_attr;
>  	phys_addr_t	phys_mem;
> @@ -437,7 +436,7 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev)
>  	 * This includes IRQs for Carddetection/ejection, the card
>  	 *  itself and optional status change detection.
>  	 * Also, the memory areas covered by a socket.  For these
> -	 *  we require the 32bit "pseudo" addresses (see the au1000.h
> +	 *  we require the real 36bit addresses (see the au1000.h
>  	 *  header for more information).
>  	 */
>  
> @@ -459,11 +458,7 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev)
>  
>  	ret = -ENODEV;
>  
> -	/*
> -	 * pseudo-attr:  The 32bit address of the PCMCIA attribute space
> -	 * for this socket (usually the 36bit address shifted 4 to the
> -	 * right).
> -	 */
> +	/* 36bit PCMCIA Attribute area address */
>  	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-attr");
>  	if (!r) {
>  		printk(KERN_ERR "pcmcia%d has no 'pseudo-attr' resource!\n",
> @@ -472,10 +467,7 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev)
>  	}
>  	sock->phys_attr = r->start;
>  
> -	/*
> -	 * pseudo-mem:  The 32bit address of the PCMCIA memory space for
> -	 * this socket (usually the 36bit address shifted 4 to the right)
> -	 */
> +	/* 36bit PCMCIA Memory area address */
>  	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-mem");
>  	if (!r) {
>  		printk(KERN_ERR "pcmcia%d has no 'pseudo-mem' resource!\n",
> @@ -484,10 +476,7 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev)
>  	}
>  	sock->phys_mem = r->start;
>  
> -	/*
> -	 * pseudo-io:  The 32bit address of the PCMCIA IO space for this
> -	 * socket (usually the 36bit address shifted 4 to the right).
> -	 */
> +	/* 36bit PCMCIA IO area address */
>  	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-io");
>  	if (!r) {
>  		printk(KERN_ERR "pcmcia%d has no 'pseudo-io' resource!\n",
> diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c
> index 61560cd..f9009d3 100644
> --- a/drivers/pcmcia/xxs1500_ss.c
> +++ b/drivers/pcmcia/xxs1500_ss.c
> @@ -218,11 +218,7 @@ static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev)
>  
>  	ret = -ENODEV;
>  
> -	/*
> -	 * pseudo-attr:  The 32bit address of the PCMCIA attribute space
> -	 * for this socket (usually the 36bit address shifted 4 to the
> -	 * right).
> -	 */
> +	/* 36bit PCMCIA Attribute area address */
>  	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-attr");
>  	if (!r) {
>  		dev_err(&pdev->dev, "missing 'pcmcia-attr' resource!\n");
> @@ -230,10 +226,7 @@ static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev)
>  	}
>  	sock->phys_attr = r->start;
>  
> -	/*
> -	 * pseudo-mem:  The 32bit address of the PCMCIA memory space for
> -	 * this socket (usually the 36bit address shifted 4 to the right)
> -	 */
> +	/* 36bit PCMCIA Memory area address */
>  	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-mem");
>  	if (!r) {
>  		dev_err(&pdev->dev, "missing 'pcmcia-mem' resource!\n");
> @@ -241,10 +234,7 @@ static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev)
>  	}
>  	sock->phys_mem = r->start;
>  
> -	/*
> -	 * pseudo-io:  The 32bit address of the PCMCIA IO space for this
> -	 * socket (usually the 36bit address shifted 4 to the right).
> -	 */
> +	/* 36bit PCMCIA IO area address */
>  	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-io");
>  	if (!r) {
>  		dev_err(&pdev->dev, "missing 'pcmcia-io' resource!\n");
> -- 
> 1.7.0
> 
> 
> _______________________________________________
> Linux PCMCIA reimplementation list
> http://lists.infradead.org/mailman/listinfo/linux-pcmcia