From: Finn Thain <fthain@telegraphics.com.au>
To: "James E.J. Bottomley" <JBottomley@odin.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Michael Schmitz <schmitzmic@gmail.com>,
linux-m68k@vger.kernel.org, linux-scsi@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v4 04/78] ncr5380: Remove more pointless macros
Date: Sun, 03 Jan 2016 16:05:05 +1100 [thread overview]
Message-ID: <20160103050502.112773041@telegraphics.com.au> (raw)
In-Reply-To: 20160103050501.042035135@telegraphics.com.au
[-- Attachment #1: ncr5380-remove-pointless-macros --]
[-- Type: text/plain, Size: 6245 bytes --]
ASM macro is never defined. rtrc in pas16.c is not used.
NCR5380_map_config, do_NCR5380_intr, do_t128_intr and do_pas16_intr
are unused. NCR_NOT_SET harms readability. Remove them.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Tested-by: Ondrej Zary <linux@rainbow-software.org>
---
drivers/scsi/NCR5380.h | 3 ---
drivers/scsi/g_NCR5380.c | 29 ++++++++++++++---------------
drivers/scsi/g_NCR5380.h | 5 -----
drivers/scsi/pas16.c | 16 ----------------
drivers/scsi/pas16.h | 5 -----
drivers/scsi/t128.h | 4 ----
6 files changed, 14 insertions(+), 48 deletions(-)
Index: linux/drivers/scsi/NCR5380.h
===================================================================
--- linux.orig/drivers/scsi/NCR5380.h 2016-01-03 16:02:39.000000000 +1100
+++ linux/drivers/scsi/NCR5380.h 2016-01-03 16:02:54.000000000 +1100
@@ -244,8 +244,6 @@
#define FLAG_LATE_DMA_SETUP 32 /* Setup NCR before DMA H/W */
#define FLAG_TAGGED_QUEUING 64 /* as X3T9.2 spelled it */
-#ifndef ASM
-
#ifdef SUPPORT_TAGS
struct tag_alloc {
DECLARE_BITMAP(allocated, MAX_TAGS);
@@ -443,5 +441,4 @@ static __inline__ int NCR5380_pc_dma_res
#endif /* defined(i386) || defined(__alpha__) */
#endif /* defined(REAL_DMA) */
#endif /* __KERNEL__ */
-#endif /* ndef ASM */
#endif /* NCR5380_H */
Index: linux/drivers/scsi/g_NCR5380.c
===================================================================
--- linux.orig/drivers/scsi/g_NCR5380.c 2016-01-03 16:02:42.000000000 +1100
+++ linux/drivers/scsi/g_NCR5380.c 2016-01-03 16:02:54.000000000 +1100
@@ -82,14 +82,13 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
-#define NCR_NOT_SET 0
-static int ncr_irq = NCR_NOT_SET;
-static int ncr_dma = NCR_NOT_SET;
-static int ncr_addr = NCR_NOT_SET;
-static int ncr_5380 = NCR_NOT_SET;
-static int ncr_53c400 = NCR_NOT_SET;
-static int ncr_53c400a = NCR_NOT_SET;
-static int dtc_3181e = NCR_NOT_SET;
+static int ncr_irq;
+static int ncr_dma;
+static int ncr_addr;
+static int ncr_5380;
+static int ncr_53c400;
+static int ncr_53c400a;
+static int dtc_3181e;
static struct override {
NCR5380_map_type NCR5380_map_name;
@@ -271,19 +270,19 @@ static int __init generic_NCR5380_detect
void __iomem *iomem;
#endif
- if (ncr_irq != NCR_NOT_SET)
+ if (ncr_irq)
overrides[0].irq = ncr_irq;
- if (ncr_dma != NCR_NOT_SET)
+ if (ncr_dma)
overrides[0].dma = ncr_dma;
- if (ncr_addr != NCR_NOT_SET)
+ if (ncr_addr)
overrides[0].NCR5380_map_name = (NCR5380_map_type) ncr_addr;
- if (ncr_5380 != NCR_NOT_SET)
+ if (ncr_5380)
overrides[0].board = BOARD_NCR5380;
- else if (ncr_53c400 != NCR_NOT_SET)
+ else if (ncr_53c400)
overrides[0].board = BOARD_NCR53C400;
- else if (ncr_53c400a != NCR_NOT_SET)
+ else if (ncr_53c400a)
overrides[0].board = BOARD_NCR53C400A;
- else if (dtc_3181e != NCR_NOT_SET)
+ else if (dtc_3181e)
overrides[0].board = BOARD_DTC3181E;
#ifndef SCSI_G_NCR5380_MEM
if (!current_override && isapnp_present()) {
Index: linux/drivers/scsi/g_NCR5380.h
===================================================================
--- linux.orig/drivers/scsi/g_NCR5380.h 2016-01-03 16:02:39.000000000 +1100
+++ linux/drivers/scsi/g_NCR5380.h 2016-01-03 16:02:54.000000000 +1100
@@ -21,8 +21,6 @@
#define NCR5380_BIOSPARAM NULL
#endif
-#ifndef ASM
-
#ifndef CMD_PER_LUN
#define CMD_PER_LUN 2
#endif
@@ -36,7 +34,6 @@
#ifndef SCSI_G_NCR5380_MEM
-#define NCR5380_map_config port
#define NCR5380_map_type int
#define NCR5380_map_name port
#define NCR5380_instance_name io_port
@@ -64,7 +61,6 @@
#else
/* therefore SCSI_G_NCR5380_MEM */
-#define NCR5380_map_config memory
#define NCR5380_map_type unsigned long
#define NCR5380_map_name base
#define NCR5380_instance_name base
@@ -103,6 +99,5 @@
#define BOARD_NCR53C400A 2
#define BOARD_DTC3181E 3
-#endif /* ndef ASM */
#endif /* GENERIC_NCR5380_H */
Index: linux/drivers/scsi/pas16.c
===================================================================
--- linux.orig/drivers/scsi/pas16.c 2016-01-03 16:02:47.000000000 +1100
+++ linux/drivers/scsi/pas16.c 2016-01-03 16:02:54.000000000 +1100
@@ -145,22 +145,6 @@ static const unsigned short pas16_offse
* START_DMA_INITIATOR_RECEIVE_REG wo
*/
};
-/*----------------------------------------------------------------*/
-/* the following will set the monitor border color (useful to find
- where something crashed or gets stuck at */
-/* 1 = blue
- 2 = green
- 3 = cyan
- 4 = red
- 5 = magenta
- 6 = yellow
- 7 = white
-*/
-#if 1
-#define rtrc(i) {inb(0x3da); outb(0x31, 0x3c0); outb((i), 0x3c0);}
-#else
-#define rtrc(i) {}
-#endif
/*
Index: linux/drivers/scsi/pas16.h
===================================================================
--- linux.orig/drivers/scsi/pas16.h 2016-01-03 16:02:47.000000000 +1100
+++ linux/drivers/scsi/pas16.h 2016-01-03 16:02:54.000000000 +1100
@@ -95,9 +95,6 @@
#define OPERATION_MODE_1 0xec03
#define IO_CONFIG_3 0xf002
-
-#ifndef ASM
-
#ifndef CMD_PER_LUN
#define CMD_PER_LUN 2
#endif
@@ -121,7 +118,6 @@
#define NCR5380_write(reg, value) ( outb((value),PAS16_io_port(reg)) )
#define NCR5380_intr pas16_intr
-#define do_NCR5380_intr do_pas16_intr
#define NCR5380_queue_command pas16_queue_command
#define NCR5380_abort pas16_abort
#define NCR5380_bus_reset pas16_bus_reset
@@ -134,5 +130,4 @@
#define PAS16_IRQS 0xd4a8
-#endif /* ndef ASM */
#endif /* PAS16_H */
Index: linux/drivers/scsi/t128.h
===================================================================
--- linux.orig/drivers/scsi/t128.h 2016-01-03 16:02:47.000000000 +1100
+++ linux/drivers/scsi/t128.h 2016-01-03 16:02:54.000000000 +1100
@@ -67,8 +67,6 @@
#define T_DATA_REG_OFFSET 0x1e00 /* rw 512 bytes long */
-#ifndef ASM
-
#ifndef CMD_PER_LUN
#define CMD_PER_LUN 2
#endif
@@ -92,7 +90,6 @@
#define NCR5380_write(reg, value) writeb((value),(T128_address(reg)))
#define NCR5380_intr t128_intr
-#define do_NCR5380_intr do_t128_intr
#define NCR5380_queue_command t128_queue_command
#define NCR5380_abort t128_abort
#define NCR5380_bus_reset t128_bus_reset
@@ -105,5 +102,4 @@
#define T128_IRQS 0xc4a8
-#endif /* ndef ASM */
#endif /* T128_H */
next prev parent reply other threads:[~2016-01-03 5:05 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-03 5:05 [PATCH v4 00/78] More fixes, cleanup and modernization for NCR5380 drivers Finn Thain
2016-01-03 5:05 ` [PATCH v4 01/78] atari_scsi: Fix SCSI host ID setting Finn Thain
2016-01-03 5:05 ` [PATCH v4 02/78] ncr5380: Remove redundant static variable initializers Finn Thain
2016-01-03 5:05 ` [PATCH v4 03/78] ncr5380: Eliminate PDEBUG*, TDEBUG* and DTCDEBUG* macros Finn Thain
2016-01-03 5:05 ` Finn Thain [this message]
2016-01-03 5:05 ` [PATCH v4 05/78] ncr5380: Remove NCR5380_local_declare and NCR5380_setup macros Finn Thain
2016-01-03 5:05 ` [PATCH v4 06/78] ncr5380: Remove NCR5380_instance_name macro Finn Thain
2016-01-03 5:05 ` [PATCH v4 07/78] ncr5380: Split NCR5380_init() into two functions Finn Thain
2016-01-03 5:05 ` [PATCH v4 08/78] ncr5380: Move NCR53C400-specific code Finn Thain
2016-01-03 5:05 ` [PATCH v4 09/78] atari_NCR5380: Reset bus on driver initialization if required Finn Thain
2016-01-03 5:05 ` [PATCH v4 10/78] atari_NCR5380: Remove RESET_BOOT, CONFIG_ATARI_SCSI_TOSHIBA_DELAY and CONFIG_ATARI_SCSI_RESET_BOOT Finn Thain
2016-01-03 5:05 ` [PATCH v4 11/78] ncr5380: Simplify bus reset handlers Finn Thain
2016-01-03 5:05 ` [PATCH v4 12/78] ncr5380: Remove unused hostdata->aborted flag Finn Thain
2016-01-03 5:05 ` [PATCH v4 13/78] ncr5380: Remove redundant register writes Finn Thain
2016-01-03 5:05 ` [PATCH v4 14/78] ncr5380: Use return instead of goto in NCR5380_select() Finn Thain
2016-01-03 5:05 ` [PATCH v4 15/78] ncr5380: Always escalate bad target time-out " Finn Thain
2016-01-03 5:05 ` [PATCH v4 16/78] ncr5380: Proceed with next command after NCR5380_select() calls scsi_done Finn Thain
2016-01-03 5:05 ` [PATCH v4 17/78] ncr5380: Keep BSY asserted when entering SELECTION phase Finn Thain
2016-01-03 5:05 ` [PATCH v4 18/78] ncr5380: Eliminate USLEEP_WAITLONG delay Finn Thain
2016-01-03 5:05 ` [PATCH v4 19/78] ncr5380: Cleanup bogus {request, release}_region() calls Finn Thain
2016-01-03 5:05 ` [PATCH v4 20/78] ncr5380: Introduce unbound workqueue Finn Thain
2016-01-03 5:05 ` [PATCH v4 21/78] ncr5380: Sleep when polling, if possible Finn Thain
2016-01-03 5:05 ` [PATCH v4 22/78] ncr5380: Eliminate selecting state Finn Thain
2016-01-03 5:05 ` [PATCH v4 23/78] ncr5380: Always retry arbitration and selection Finn Thain
2016-01-03 5:05 ` [PATCH v4 24/78] ncr5380: Implement NCR5380_dma_xfer_len and remove LIMIT_TRANSFERSIZE macro Finn Thain
2016-01-03 5:05 ` [PATCH v4 25/78] ncr5380: Rework disconnect versus poll logic Finn Thain
2016-01-03 5:05 ` [PATCH v4 26/78] ncr5380: Fix NCR5380_transfer_pio() result Finn Thain
2016-01-03 5:05 ` [PATCH v4 27/78] ncr5380: Add missing lock in eh_abort_handler Finn Thain
2016-01-03 5:05 ` [PATCH v4 28/78] ncr5380: Drop DEF_SCSI_QCMD macro Finn Thain
2016-01-03 5:05 ` [PATCH v4 29/78] ncr5380: Remove references to linked commands Finn Thain
2016-01-03 5:05 ` [PATCH v4 30/78] ncr5380: Add missing break after case MESSAGE_REJECT Finn Thain
2016-01-03 5:05 ` [PATCH v4 31/78] ncr5380: Fix !REQ timeout in do_abort() Finn Thain
2016-01-03 5:05 ` [PATCH v4 32/78] ncr5380: Fix bus phase " Finn Thain
2016-01-03 5:05 ` [PATCH v4 33/78] atari_NCR5380: Set do_abort() timeouts Finn Thain
2016-01-03 5:05 ` [PATCH v4 34/78] atari_NCR5380: Use arbitration timeout Finn Thain
2016-01-24 10:38 ` Geert Uytterhoeven
2016-01-25 2:45 ` Finn Thain
2016-01-25 8:05 ` Geert Uytterhoeven
2016-01-25 18:28 ` Andreas Schwab
2016-01-25 19:56 ` Michael Schmitz
2016-01-26 0:18 ` Finn Thain
2016-01-26 11:13 ` Geert Uytterhoeven
2016-01-03 5:05 ` [PATCH v4 35/78] ncr5380: Dont wait for BUS FREE after disconnect Finn Thain
2016-01-03 5:05 ` [PATCH v4 36/78] ncr5380: Use work_struct instead of delayed_work Finn Thain
2016-01-03 5:05 ` [PATCH v4 37/78] ncr5380: Standardize work queueing algorithm Finn Thain
2016-01-03 5:05 ` [PATCH v4 38/78] ncr5380: Remove UNSAFE macro Finn Thain
2016-01-03 5:05 ` [PATCH v4 39/78] ncr5380: Standardize interrupt handling Finn Thain
2016-01-03 5:05 ` [PATCH v4 40/78] ncr5380: Introduce NCR5380_poll_politely2 Finn Thain
2016-01-03 5:05 ` [PATCH v4 41/78] ncr5380: Replace redundant flags with FLAG_NO_DMA_FIXUP Finn Thain
2016-01-03 5:05 ` [PATCH v4 42/78] ncr5380: Replace READ_OVERRUNS macro with FLAG_NO_DMA_FIXUPS Finn Thain
2016-01-03 5:05 ` [PATCH v4 43/78] ncr5380: Standardize reselection handling Finn Thain
2016-01-03 5:05 ` [PATCH v4 44/78] ncr5380: Fix off-by-one bug in extended_msg[] bounds check Finn Thain
2016-01-03 5:05 ` [PATCH v4 45/78] ncr5380: Cleanup #include directives Finn Thain
2016-01-03 5:05 ` [PATCH v4 46/78] ncr5380: Fix NDEBUG_NO_DATAOUT flag Finn Thain
2016-01-03 5:05 ` [PATCH v4 47/78] ncr5380: Fix and cleanup scsi_host_template initializers Finn Thain
2016-01-03 5:05 ` [PATCH v4 48/78] atari_NCR5380: Fix queue_size limit Finn Thain
2016-01-03 5:05 ` [PATCH v4 49/78] ncr5380: Remove redundant ICR_ARBITRATION_LOST test and eliminate FLAG_DTC3181E Finn Thain
2016-01-03 5:05 ` [PATCH v4 50/78] ncr5380: Change instance->host_lock to hostdata->lock Finn Thain
2016-01-03 5:05 ` [PATCH v4 51/78] ncr5380: Remove command list debug code Finn Thain
2016-01-03 5:05 ` [PATCH v4 52/78] ncr5380: Remove H_NO macro and introduce dsprintk Finn Thain
2016-01-03 5:05 ` [PATCH v4 53/78] ncr5380: Use shost_priv helper Finn Thain
2016-01-03 5:05 ` [PATCH v4 54/78] ncr5380: Use dsprintk() for queue debugging Finn Thain
2016-01-03 5:05 ` [PATCH v4 55/78] ncr5380: Remove LIST and REMOVE macros Finn Thain
2016-01-03 5:05 ` [PATCH v4 56/78] ncr5380: Remove redundant volatile qualifiers Finn Thain
2016-01-03 5:05 ` [PATCH v4 57/78] ncr5380: Use standard list data structure Finn Thain
2016-01-03 5:05 ` [PATCH v4 58/78] ncr5380: Refactor command completion Finn Thain
2016-01-03 5:06 ` [PATCH v4 59/78] ncr5380: Fix autosense bugs Finn Thain
2016-01-03 5:06 ` [PATCH v4 60/78] ncr5380: Implement new eh_abort_handler Finn Thain
2016-01-03 5:06 ` [PATCH v4 61/78] ncr5380: Fix EH during arbitration and selection Finn Thain
2016-01-03 5:06 ` [PATCH v4 62/78] ncr5380: Implement new eh_bus_reset_handler Finn Thain
2016-01-03 5:06 ` [PATCH v4 63/78] atari_NCR5380: Remove HOSTNO macro from printk() and seq_printf() calls Finn Thain
2016-01-03 5:06 ` [PATCH v4 64/78] atari_NCR5380: Eliminate HOSTNO macro Finn Thain
2016-01-03 5:06 ` [PATCH v4 65/78] atari_scsi, sun3_scsi: Remove global Scsi_Host pointer Finn Thain
2016-01-03 5:06 ` [PATCH v4 66/78] ncr5380: Fix soft lockups Finn Thain
2016-01-03 5:06 ` [PATCH v4 67/78] ncr5380: Cleanup comments Finn Thain
2016-01-03 5:06 ` [PATCH v4 68/78] ncr5380: Fix trailing whitespace using regexp Finn Thain
2016-01-03 5:06 ` [PATCH v4 69/78] ncr5380: Fix whitespace in comments " Finn Thain
2016-01-03 7:54 ` Joe Perches
2016-01-03 8:17 ` Finn Thain
2016-01-03 14:10 ` One Thousand Gnomes
2016-01-03 18:20 ` Joe Perches
2016-01-03 21:29 ` One Thousand Gnomes
2016-01-03 21:46 ` Joe Perches
[not found] ` <20160103220505.7734a879@lxorguk.ukuu.org.uk>
2016-01-03 22:13 ` Joe Perches
2016-01-03 5:06 ` [PATCH v4 70/78] ncr5380: Merge changes from atari_NCR5380.c Finn Thain
2016-01-03 5:06 ` [PATCH v4 71/78] atari_NCR5380: Merge changes from NCR5380.c Finn Thain
2016-01-03 5:06 ` [PATCH v4 72/78] ncr5380: Cleanup whitespace and parentheses Finn Thain
2016-01-03 5:06 ` [PATCH v4 73/78] ncr5380: Fix pseudo DMA transfers on 53C400 Finn Thain
2016-01-03 5:06 ` [PATCH v4 74/78] ncr5380: Use runtime register mapping Finn Thain
2016-01-03 5:06 ` [PATCH v4 75/78] ncr5380: Enable PDMA for NCR53C400A Finn Thain
2016-01-03 5:06 ` [PATCH v4 76/78] ncr5380: Enable PDMA for DTC chips Finn Thain
2016-01-03 5:06 ` [PATCH v4 77/78] ncr5380: Fix wait for 53C80 registers registers after PDMA Finn Thain
2016-01-03 5:06 ` [PATCH v4 78/78] ncr5380: Add support for HP C2502 Finn Thain
2016-01-07 2:53 ` [PATCH v4 00/78] More fixes, cleanup and modernization for NCR5380 drivers Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160103050502.112773041@telegraphics.com.au \
--to=fthain@telegraphics.com.au \
--cc=JBottomley@odin.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=schmitzmic@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).