On 06/03/2015 09:56 AM, Johannes Thumshirn wrote:
> Fix compilation errors on forgotten #include <linux/dmapool.h> and warnings when
> CONFIG_PCI is not set.
>
> Reported-by: Jim Davis <jim.epost@xxxxxxxxx>
> Signed-off-by: Johannes Thumshirn <jthumshirn@xxxxxxx>
> ---
> 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 <linux/spinlock.h>
> #include <linux/dma-mapping.h>
> #include <linux/firmware.h>
> +#include <linux/dmapool.h>
>
> #include <asm/io.h>
> #include <asm/dma.h>
> @@ -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 <hare@xxxxxxx>
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@xxxxxxx +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)
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
