From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932582AbbFENJ2 (ORCPT ); Fri, 5 Jun 2015 09:09:28 -0400 Received: from cantor2.suse.de ([195.135.220.15]:50898 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932182AbbFENJX (ORCPT ); Fri, 5 Jun 2015 09:09:23 -0400 Message-ID: <55719F80.8010702@suse.de> Date: Fri, 05 Jun 2015 15:09:20 +0200 From: Hannes Reinecke User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Johannes Thumshirn , Jim Davis , Stephen Rothwell , JBottomley@odin.com CC: linux-scsi , linux-kernel , linux-next Subject: Re: [PATCH] advansys: fix compilation errors and warnings when CONFIG_PCI is not set References: <1433318202-1455-1-git-send-email-jthumshirn@suse.de> In-Reply-To: <1433318202-1455-1-git-send-email-jthumshirn@suse.de> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/03/2015 09:56 AM, Johannes Thumshirn wrote: > Fix compilation errors on forgotten #include and warnings when > CONFIG_PCI is not set. > > Reported-by: Jim Davis > Signed-off-by: Johannes Thumshirn > --- > drivers/scsi/advansys.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c > index 14d3aa5..4305178 100644 > --- a/drivers/scsi/advansys.c > +++ b/drivers/scsi/advansys.c > @@ -37,6 +37,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -9435,6 +9436,7 @@ static int AscInitSetConfig(struct pci_dev *pdev, struct Scsi_Host *shost) > * on big-endian platforms so char fields read as words are actually being > * unswapped on big-endian platforms. > */ > +#ifdef CONFIG_PCI > static ADVEEP_3550_CONFIG Default_3550_EEPROM_Config = { > ADV_EEPROM_BIOS_ENABLE, /* cfg_lsw */ > 0x0000, /* cfg_msw */ > @@ -9771,7 +9773,6 @@ static ADVEEP_38C1600_CONFIG ADVEEP_38C1600_Config_Field_IsChar = { > 0 /* 63 reserved */ > }; > > -#ifdef CONFIG_PCI > /* > * Wait for EEPROM command to complete > */ > @@ -11385,7 +11386,9 @@ static int advansys_board_found(struct Scsi_Host *shost, unsigned int iop, > err_unmap: > if (boardp->ioremap_addr) > iounmap(boardp->ioremap_addr); > +#ifdef CONFIG_PCI > err_shost: > +#endif > return ret; > } > > Reviewed-by: Hannes Reinecke Cheers, Hannes -- Dr. Hannes Reinecke zSeries & Storage hare@suse.de +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG Nürnberg)