[PATCH 1/2] xilinx systemace: Fix device name assignment for SystemACE (from "xs`" to "xsa").

[PATCH 1/2] xilinx systemace: Fix device name assignment for SystemACE (from "xs`" to "xsa").

[Michal Simek]

[-- Attachment #1: Type: text/plain, Size: 1154 bytes --]

From: Graeme Smecher <gsmecher@threespeedlogic.com>

This fixes a bug introduced in 5d10302f46d, where device trees that don't
provide the "port-number" attribute are mistakenly assigned the device "xs`".
The error check that's supposed to assign a default letter can't succeed,
since it tests an unsigned type against a negative return code.

Signed-off-by: Graeme Smecher <gsmecher@threespeedlogic.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
---
 drivers/block/xsysace.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index f8ef15f..3fd130f 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -1160,8 +1160,7 @@ static int ace_probe(struct platform_device *dev)
 	dev_dbg(&dev->dev, "ace_probe(%p)\n", dev);

 	/* device id and bus width */
-	of_property_read_u32(dev->dev.of_node, "port-number", &id);
-	if (id < 0)
+	if (of_property_read_u32(dev->dev.of_node, "port-number", &id))
 		id = 0;
 	if (of_find_property(dev->dev.of_node, "8-bit", NULL))
 		bus_width = ACE_BUS_WIDTH_8;
--
1.8.2.3


[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

[PATCH 2/2] xilinx systemace: Fix sparse warnings

[Michal Simek]

[-- Attachment #1: Type: text/plain, Size: 898 bytes --]

Fix sysace sparse warnings.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
 drivers/block/xsysace.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 3fd130f..1393b88 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -407,7 +407,7 @@ static void ace_dump_regs(struct ace_device *ace)
 		 ace_in32(ace, ACE_CFGLBA), ace_in(ace, ACE_FATSTAT));
 }

-void ace_fix_driveid(u16 *id)
+static void ace_fix_driveid(u16 *id)
 {
 #if defined(__BIG_ENDIAN)
 	int i;
@@ -463,7 +463,7 @@ static inline void ace_fsm_yieldirq(struct ace_device *ace)
 }

 /* Get the next read/write request; ending requests that we don't handle */
-struct request *ace_get_next_request(struct request_queue * q)
+static struct request *ace_get_next_request(struct request_queue *q)
 {
 	struct request *req;

--
1.8.2.3


[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH 1/2] xilinx systemace: Fix device name assignment for SystemACE (from "xs`" to "xsa").

[Michal Simek]

[-- Attachment #1: Type: text/plain, Size: 1748 bytes --]

Hi Greg,

do you want to take these two patches through your tree?
Or should I take them through my microblaze tree?

Thanks,
Michal


On 05/23/2013 02:31 PM, Michal Simek wrote:
> From: Graeme Smecher <gsmecher@threespeedlogic.com>
> 
> This fixes a bug introduced in 5d10302f46d, where device trees that don't
> provide the "port-number" attribute are mistakenly assigned the device "xs`".
> The error check that's supposed to assign a default letter can't succeed,
> since it tests an unsigned type against a negative return code.
> 
> Signed-off-by: Graeme Smecher <gsmecher@threespeedlogic.com>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> Acked-by: Grant Likely <grant.likely@secretlab.ca>
> ---
>  drivers/block/xsysace.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
> index f8ef15f..3fd130f 100644
> --- a/drivers/block/xsysace.c
> +++ b/drivers/block/xsysace.c
> @@ -1160,8 +1160,7 @@ static int ace_probe(struct platform_device *dev)
>  	dev_dbg(&dev->dev, "ace_probe(%p)\n", dev);
> 
>  	/* device id and bus width */
> -	of_property_read_u32(dev->dev.of_node, "port-number", &id);
> -	if (id < 0)
> +	if (of_property_read_u32(dev->dev.of_node, "port-number", &id))
>  		id = 0;
>  	if (of_find_property(dev->dev.of_node, "8-bit", NULL))
>  		bus_width = ACE_BUS_WIDTH_8;
> --
> 1.8.2.3
> 


-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]

Re: [PATCH 1/2] xilinx systemace: Fix device name assignment for SystemACE (from "xs`" to "xsa").

[Greg Kroah-Hartman]

On Mon, Jun 03, 2013 at 02:47:36PM +0200, Michal Simek wrote:
> Hi Greg,
> 
> do you want to take these two patches through your tree?

Why would I be sending in drivers/block/* patches?  I don't have a tree
for that, do I?

> Or should I take them through my microblaze tree?

Please do, or send them to the block maintainer.

thanks,

greg k-h

Re: [PATCH 1/2] xilinx systemace: Fix device name assignment for SystemACE (from "xs`" to "xsa").

[Michal Simek]

[-- Attachment #1: Type: text/plain, Size: 957 bytes --]

On 06/03/2013 04:22 PM, Greg Kroah-Hartman wrote:
> On Mon, Jun 03, 2013 at 02:47:36PM +0200, Michal Simek wrote:
>> Hi Greg,
>>
>> do you want to take these two patches through your tree?
> 
> Why would I be sending in drivers/block/* patches?  I don't have a tree
> for that, do I?

Ah ok. I took you because you are 3rd based on get_maintainer patch (50% commit signer)


>> Or should I take them through my microblaze tree?
> 
> Please do, or send them to the block maintainer.

Who is drivers/block maintainer? I can't see anyone in MAINTAINERS file.

I should probably also change systemace record too.

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]

Re: [PATCH 1/2] xilinx systemace: Fix device name assignment for SystemACE (from "xs`" to "xsa").

[Greg Kroah-Hartman]

On Mon, Jun 03, 2013 at 04:33:12PM +0200, Michal Simek wrote:
> On 06/03/2013 04:22 PM, Greg Kroah-Hartman wrote:
> > On Mon, Jun 03, 2013 at 02:47:36PM +0200, Michal Simek wrote:
> >> Hi Greg,
> >>
> >> do you want to take these two patches through your tree?
> > 
> > Why would I be sending in drivers/block/* patches?  I don't have a tree
> > for that, do I?
> 
> Ah ok. I took you because you are 3rd based on get_maintainer patch (50% commit signer)
> 
> 
> >> Or should I take them through my microblaze tree?
> > 
> > Please do, or send them to the block maintainer.
> 
> Who is drivers/block maintainer? I can't see anyone in MAINTAINERS file.

Jens is the block/ maintainer, so I imagine he's also the drivers/block/
maintainer as well.  If not, he would know who.

thanks,

greg k-h

Re: [PATCH 1/2] xilinx systemace: Fix device name assignment for SystemACE (from "xs`" to "xsa").

[Michal Simek]

[-- Attachment #1: Type: text/plain, Size: 2011 bytes --]

On 06/03/2013 04:37 PM, Greg Kroah-Hartman wrote:
> On Mon, Jun 03, 2013 at 04:33:12PM +0200, Michal Simek wrote:
>> On 06/03/2013 04:22 PM, Greg Kroah-Hartman wrote:
>>> On Mon, Jun 03, 2013 at 02:47:36PM +0200, Michal Simek wrote:
>>>> Hi Greg,
>>>>
>>>> do you want to take these two patches through your tree?
>>>
>>> Why would I be sending in drivers/block/* patches?  I don't have a tree
>>> for that, do I?
>>
>> Ah ok. I took you because you are 3rd based on get_maintainer patch (50% commit signer)
>>
>>
>>>> Or should I take them through my microblaze tree?
>>>
>>> Please do, or send them to the block maintainer.
>>
>> Who is drivers/block maintainer? I can't see anyone in MAINTAINERS file.
> 
> Jens is the block/ maintainer, so I imagine he's also the drivers/block/
> maintainer as well.  If not, he would know who.
> 

We have nice follow up on this. It was applied as different patch to Linus tree.

commit 585dc0c2f68981c02a0bb6fc8fe191a3f513959c
Author: Gernot Vormayr <gvormayr@gmail.com>
Date:   Fri May 24 15:55:03 2013 -0700

    drivers/block/xsysace.c: fix id with missing port-number

    If the port number is missing from the device-tree the device gets named
    xs` instead of xsa.  This fixes the check for missing ids.

    Tested on ml507 board.

    Signed-off-by: Gernot Vormayr <gvormayr@gmail.com>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: Jens Axboe <axboe@kernel.dk>
    Cc: Grant Likely <grant.likely@linaro.org>
    Cc: Rob Herring <rob.herring@calxeda.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

M


-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]