From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1760099Ab2ESDif (ORCPT <rfc822;w@1wt.eu>);
	Fri, 18 May 2012 23:38:35 -0400
Received: from mail-pb0-f46.google.com ([209.85.160.46]:56499 "EHLO
	mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753692Ab2ESDic (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 18 May 2012 23:38:32 -0400
Date: Sat, 19 May 2012 11:38:21 +0800
From: Aaron Lu <aaron.lu@amd.com>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>,
        Alan Stern <stern@rowland.harvard.edu>, linux-scsi@vger.kernel.org,
        linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
        Aaron Lu <aaron.lwe@gmail.com>
Subject: Re: [patch] [SCSI] scsi_pm: passing wrong pointer to resume()
Message-ID: <20120519033821.GA2425@localhost.localdomain>
References: <20120518140827.GA1584@elgon.mountain>
 <2FB252790F768E479D722B6F9B6D68C4B03E50@SCYBEXDAG02.amd.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <2FB252790F768E479D722B6F9B6D68C4B03E50@SCYBEXDAG02.amd.com>
User-Agent: Mutt/1.5.20 (2009-12-10)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> From: Dan Carpenter [dan.carpenter@oracle.com]
> To: James E.J. Bottomley; Lu, Aaron
> Cc: linux-scsi@vger.kernel.org; linux-kernel@vger.kernel.org; kernel-janitors@vger.kernel.org; Alan Stern
> Subject: [patch] [SCSI] scsi_pm: passing wrong pointer to resume()
> 
> This gets caught by GCC:
> drivers/scsi/scsi_pm.c:30:5: warning: passing argument 1 of
>         ‘scsi_device_resume’ from incompatible pointer type
>         [enabled by default]

Thanks for pointing this out.
I've posted v2 the other day and James is aware of this already:
http://marc.info/?l=linux-scsi&m=133706440112890&w=2

> 
> It probably would have been caught in testing as well, but it's on an
> error path.

I'm dealing with such error so developed this patch. But there are other
changes too in my code, so I prepared this patch in another clean repo
and made the mistake, sorry for not testing it before submit. 

-Aaron

> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> I haven't tested this.  :/  Sorry for that.
> 
> diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
> index 9bd2c41..d4201de 100644
> --- a/drivers/scsi/scsi_pm.c
> +++ b/drivers/scsi/scsi_pm.c
> @@ -27,7 +27,7 @@ static int scsi_dev_type_suspend(struct device *dev, pm_message_t msg)
>                 if (drv && drv->suspend) {
>                         err = drv->suspend(dev, msg);
>                         if (err)
> -                               scsi_device_resume(dev);
> +                               scsi_device_resume(to_scsi_device(dev));
>                 }
>         }
>         dev_dbg(dev, "scsi suspend: %d\n", err);
>