From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752975AbbJMMou (ORCPT ); Tue, 13 Oct 2015 08:44:50 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:37304 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752605AbbJMMos (ORCPT ); Tue, 13 Oct 2015 08:44:48 -0400 Subject: Re: [PATCH 12/25] scsi: hisi_sas: add v1 HW initialisation code To: Arnd Bergmann References: <1444663237-238302-1-git-send-email-john.garry@huawei.com> <1444663237-238302-13-git-send-email-john.garry@huawei.com> <147982224.OvBbMyp8ci@wuerfel> CC: , , , , , , , , From: John Garry Message-ID: <561CFCAA.8030003@huawei.com> Date: Tue, 13 Oct 2015 13:44:26 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <147982224.OvBbMyp8ci@wuerfel> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.202.137.251] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090204.561CFCBC.006D,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 5c5255ec673436b837f4f1e0d538c5c1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/10/2015 19:46, Arnd Bergmann wrote: > On Monday 12 October 2015 23:20:24 John Garry wrote: >> @@ -387,6 +392,21 @@ static int hisi_sas_probe(struct platform_device *pdev) >> } >> >> hisi_sas_init_add(hisi_hba); >> + >> + rc = hw_init_v1_hw(hisi_hba); >> + if (rc) >> + goto err_out_ha; >> + >> + rc = interrupt_init_v1_hw(hisi_hba); >> + if (rc) >> + goto err_out_ha; >> + >> + rc = interrupt_openall_v1_hw(hisi_hba); >> + if (rc) >> + goto err_out_ha; >> + >> + phys_init_v1_hw(hisi_hba); >> + >> rc = scsi_add_host(shost, &pdev->dev); >> if (rc) >> goto err_out_ha; >> > > As the probe function matches against the "hisilicon,sas-controller-v1" > compatible string and contains mostly code that is specific to v1, I > think it would be cleaner to move that to the hisi_sas_v1_hw.c as well > and make the functions above static but make the common functions > called here (hisi_sas_init_add etc) global. > > That would also include the hisi_sas_driver structure. > > Arnd > > . > Hello, Just to be clear, are you saying that you would prefer hisi_sas_probe() and struct hisi_sas_driver to be relocated to hisi_sas_v1_hw.c? I wanted to keep hisi_sas_v1_hw.c containing only code which accesses HW. I could consoldate the calls of hw_init_v1_hw(), interrupt_init_v1_hw(), interrupt_openall_v1_hw(), and phys_init_v1_hw() to a single function hw init function call. Then most of the code in the probe function will not be specific to v1. Regards, John