redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

scsi: aha152x: rename the PCMCIA define 

We plan to enable building the PCMCIA core and drivers, and the
non-prefixed PCMCIA name clashes with some arch headers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
hifive-unleashed-5.1
Christoph Hellwig 2018-10-19 14:09:44 +02:00 committed by Masahiro Yamada
parent 310c7585e8
commit 3eb2ebcb8e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/scsi/aha152x.c
View File

@ -269,7 +269,7 @@ static LIST_HEAD(aha152x_host_list);
/* DEFINES */ /* DEFINES */
/* For PCMCIA cards, always use AUTOCONF */ /* For PCMCIA cards, always use AUTOCONF */
#if defined(PCMCIA) || defined(MODULE) #if defined(AHA152X_PCMCIA) || defined(MODULE)
#if !defined(AUTOCONF) #if !defined(AUTOCONF)
#define AUTOCONF #define AUTOCONF
#endif #endif
@ -297,7 +297,7 @@ CMD_INC_RESID(struct scsi_cmnd *cmd, int inc)
#define DELAY_DEFAULT 1000 #define DELAY_DEFAULT 1000
#if defined(PCMCIA) #if defined(AHA152X_PCMCIA)
#define IRQ_MIN 0 #define IRQ_MIN 0
#define IRQ_MAX 16 #define IRQ_MAX 16
#else #else
@ -328,7 +328,7 @@ MODULE_AUTHOR("Jürgen Fischer");
MODULE_DESCRIPTION(AHA152X_REVID); MODULE_DESCRIPTION(AHA152X_REVID);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#if !defined(PCMCIA) #if !defined(AHA152X_PCMCIA)
#if defined(MODULE) #if defined(MODULE)
static int io[] = {0, 0}; static int io[] = {0, 0};
module_param_hw_array(io, int, ioport, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
@ -391,7 +391,7 @@ static struct isapnp_device_id id_table[] = {
MODULE_DEVICE_TABLE(isapnp, id_table); MODULE_DEVICE_TABLE(isapnp, id_table);
#endif /* ISAPNP */ #endif /* ISAPNP */
#endif /* !PCMCIA */ #endif /* !AHA152X_PCMCIA */
static struct scsi_host_template aha152x_driver_template; static struct scsi_host_template aha152x_driver_template;
@ -863,7 +863,7 @@ void aha152x_release(struct Scsi_Host *shpnt)
if (shpnt->irq) if (shpnt->irq)
free_irq(shpnt->irq, shpnt); free_irq(shpnt->irq, shpnt);
#if !defined(PCMCIA) #if !defined(AHA152X_PCMCIA)
if (shpnt->io_port) if (shpnt->io_port)
release_region(shpnt->io_port, IO_RANGE); release_region(shpnt->io_port, IO_RANGE);
#endif #endif
@ -2924,7 +2924,7 @@ static struct scsi_host_template aha152x_driver_template = {
.slave_alloc = aha152x_adjust_queue, .slave_alloc = aha152x_adjust_queue,
}; };
#if !defined(PCMCIA) #if !defined(AHA152X_PCMCIA)
static int setup_count; static int setup_count;
static struct aha152x_setup setup[2]; static struct aha152x_setup setup[2];
@ -3392,4 +3392,4 @@ static int __init aha152x_setup(char *str)
__setup("aha152x=", aha152x_setup); __setup("aha152x=", aha152x_setup);
#endif #endif
#endif /* !PCMCIA */ #endif /* !AHA152X_PCMCIA */

2
drivers/scsi/pcmcia/aha152x_core.c
View File

@ -1,3 +1,3 @@
#define PCMCIA 1 #define AHA152X_PCMCIA 1
#define AHA152X_STAT 1 #define AHA152X_STAT 1
#include "aha152x.c" #include "aha152x.c"