From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: [PATCH 12/25] scsi: hisi_sas: add v1 HW initialisation code Date: Mon, 12 Oct 2015 20:46:19 +0200 Message-ID: <147982224.OvBbMyp8ci@wuerfel> References: <1444663237-238302-1-git-send-email-john.garry@huawei.com> <1444663237-238302-13-git-send-email-john.garry@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: In-Reply-To: <1444663237-238302-13-git-send-email-john.garry@huawei.com> Sender: linux-kernel-owner@vger.kernel.org To: John Garry Cc: James.Bottomley@hansenpartnership.com, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linuxarm@huawei.com, zhangfei.gao@linaro.org, linux-scsi@vger.kernel.org, xuwei5@hisilicon.com, john.garry2@mail.dcu.ie, hare@suse.de List-Id: devicetree@vger.kernel.org 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