From: Adrian Bunk <bunk@stusta.de>
To: tim@cyberelk.net
Cc: linux-parport@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [2.6 patch] drivers/block/paride/ cleanups
Date: Sat, 29 Jan 2005 14:35:16 +0100 [thread overview]
Message-ID: <20050129133516.GU28047@stusta.de> (raw)
The patch below does the following cleanups in each if the five changed
C files:
- #ifndef MODULE: remove unused setup function
- make a needlessly global struct static
- pf.c: pf_init_units can be static and __init
After this cleanup, setup.h is completely unuse and therefore removed.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/block/paride/pcd.c | 22 -----------
drivers/block/paride/pd.c | 23 -----------
drivers/block/paride/pf.c | 25 +-----------
drivers/block/paride/pg.c | 21 ----------
drivers/block/paride/pt.c | 22 -----------
drivers/block/paride/setup.h | 69 -----------------------------------
6 files changed, 6 insertions(+), 176 deletions(-)
--- linux-2.6.11-rc2-mm1-full/drivers/block/paride/pcd.c.old 2005-01-29 14:10:23.000000000 +0100
+++ linux-2.6.11-rc2-mm1-full/drivers/block/paride/pcd.c 2005-01-29 14:10:50.000000000 +0100
@@ -142,26 +142,6 @@
static spinlock_t pcd_lock;
-#ifndef MODULE
-
-#include "setup.h"
-
-static STT pcd_stt[6] = {
- {"drive0", 6, drive0},
- {"drive1", 6, drive1},
- {"drive2", 6, drive2},
- {"drive3", 6, drive3},
- {"disable", 1, &disable},
- {"nice", 1, &nice}
-};
-
-void pcd_setup(char *str, int *ints)
-{
- generic_setup(pcd_stt, 6, str);
-}
-
-#endif
-
module_param(verbose, bool, 0644);
module_param(major, int, 0);
module_param(name, charp, 0);
@@ -218,7 +198,7 @@
struct gendisk *disk;
};
-struct pcd_unit pcd[PCD_UNITS];
+static struct pcd_unit pcd[PCD_UNITS];
static char pcd_scratch[64];
static char pcd_buffer[2048]; /* raw block buffer */
--- linux-2.6.11-rc2-mm1-full/drivers/block/paride/pd.c.old 2005-01-29 14:11:08.000000000 +0100
+++ linux-2.6.11-rc2-mm1-full/drivers/block/paride/pd.c 2005-01-29 14:11:45.000000000 +0100
@@ -157,27 +157,6 @@
static DEFINE_SPINLOCK(pd_lock);
-#ifndef MODULE
-
-#include "setup.h"
-
-static STT pd_stt[7] = {
- {"drive0", 8, drive0},
- {"drive1", 8, drive1},
- {"drive2", 8, drive2},
- {"drive3", 8, drive3},
- {"disable", 1, &disable},
- {"cluster", 1, &cluster},
- {"nice", 1, &nice}
-};
-
-void pd_setup(char *str, int *ints)
-{
- generic_setup(pd_stt, 7, str);
-}
-
-#endif
-
module_param(verbose, bool, 0);
module_param(major, int, 0);
module_param(name, charp, 0);
@@ -255,7 +234,7 @@
struct gendisk *gd;
};
-struct pd_unit pd[PD_UNITS];
+static struct pd_unit pd[PD_UNITS];
static char pd_scratch[512]; /* scratch block buffer */
--- linux-2.6.11-rc2-mm1-full/drivers/block/paride/pf.c.old 2005-01-29 14:11:57.000000000 +0100
+++ linux-2.6.11-rc2-mm1-full/drivers/block/paride/pf.c 2005-01-29 14:13:16.000000000 +0100
@@ -156,27 +156,6 @@
static spinlock_t pf_spin_lock;
-#ifndef MODULE
-
-#include "setup.h"
-
-static STT pf_stt[7] = {
- {"drive0", 7, drive0},
- {"drive1", 7, drive1},
- {"drive2", 7, drive2},
- {"drive3", 7, drive3},
- {"disable", 1, &disable},
- {"cluster", 1, &cluster},
- {"nice", 1, &nice}
-};
-
-void pf_setup(char *str, int *ints)
-{
- generic_setup(pf_stt, 7, str);
-}
-
-#endif
-
module_param(verbose, bool, 0644);
module_param(major, int, 0);
module_param(name, charp, 0);
@@ -256,7 +235,7 @@
struct gendisk *disk;
};
-struct pf_unit units[PF_UNITS];
+static struct pf_unit units[PF_UNITS];
static int pf_identify(struct pf_unit *pf);
static void pf_lock(struct pf_unit *pf, int func);
@@ -290,7 +269,7 @@
.media_changed = pf_check_media,
};
-void pf_init_units(void)
+static void __init pf_init_units(void)
{
struct pf_unit *pf;
int unit;
--- linux-2.6.11-rc2-mm1-full/drivers/block/paride/pg.c.old 2005-01-29 14:13:47.000000000 +0100
+++ linux-2.6.11-rc2-mm1-full/drivers/block/paride/pg.c 2005-01-29 14:14:10.000000000 +0100
@@ -167,25 +167,6 @@
#include <asm/uaccess.h>
-#ifndef MODULE
-
-#include "setup.h"
-
-static STT pg_stt[5] = {
- {"drive0", 6, drive0},
- {"drive1", 6, drive1},
- {"drive2", 6, drive2},
- {"drive3", 6, drive3},
- {"disable", 1, &disable}
-};
-
-void pg_setup(char *str, int *ints)
-{
- generic_setup(pg_stt, 5, str);
-}
-
-#endif
-
module_param(verbose, bool, 0644);
module_param(major, int, 0);
module_param(name, charp, 0);
@@ -237,7 +218,7 @@
char name[PG_NAMELEN]; /* pg0, pg1, ... */
};
-struct pg devices[PG_UNITS];
+static struct pg devices[PG_UNITS];
static int pg_identify(struct pg *dev, int log);
--- linux-2.6.11-rc2-mm1-full/drivers/block/paride/pt.c.old 2005-01-29 14:14:21.000000000 +0100
+++ linux-2.6.11-rc2-mm1-full/drivers/block/paride/pt.c 2005-01-29 14:14:38.000000000 +0100
@@ -150,26 +150,6 @@
#include <asm/uaccess.h>
-#ifndef MODULE
-
-#include "setup.h"
-
-static STT pt_stt[5] = {
- {"drive0", 6, drive0},
- {"drive1", 6, drive1},
- {"drive2", 6, drive2},
- {"drive3", 6, drive3},
- {"disable", 1, &disable}
-};
-
-void
-pt_setup(char *str, int *ints)
-{
- generic_setup(pt_stt, 5, str);
-}
-
-#endif
-
module_param(verbose, bool, 0);
module_param(major, int, 0);
module_param(name, charp, 0);
@@ -247,7 +227,7 @@
static int pt_identify(struct pt_unit *tape);
-struct pt_unit pt[PT_UNITS];
+static struct pt_unit pt[PT_UNITS];
static char pt_scratch[512]; /* scratch block buffer */
--- linux-2.6.11-rc2-mm1-full/drivers/block/paride/setup.h 2004-12-24 22:35:29.000000000 +0100
+++ /dev/null 2004-11-25 03:16:25.000000000 +0100
@@ -1,69 +0,0 @@
-/*
- setup.h (c) 1997-8 Grant R. Guenther <grant@torque.net>
- Under the terms of the GNU General Public License.
-
- This is a table driven setup function for kernel modules
- using the module.variable=val,... command line notation.
-
-*/
-
-/* Changes:
-
- 1.01 GRG 1998.05.05 Allow negative and defaulted values
-
-*/
-
-#include <linux/ctype.h>
-#include <linux/string.h>
-
-struct setup_tab_t {
-
- char *tag; /* variable name */
- int size; /* number of elements in array */
- int *iv; /* pointer to variable */
-};
-
-typedef struct setup_tab_t STT;
-
-/* t is a table that describes the variables that can be set
- by gen_setup
- n is the number of entries in the table
- ss is a string of the form:
-
- <tag>=[<val>,...]<val>
-*/
-
-static void generic_setup( STT t[], int n, char *ss )
-
-{ int j,k, sgn;
-
- k = 0;
- for (j=0;j<n;j++) {
- k = strlen(t[j].tag);
- if (strncmp(ss,t[j].tag,k) == 0) break;
- }
- if (j == n) return;
-
- if (ss[k] == 0) {
- t[j].iv[0] = 1;
- return;
- }
-
- if (ss[k] != '=') return;
- ss += (k+1);
-
- k = 0;
- while (ss && (k < t[j].size)) {
- if (!*ss) break;
- sgn = 1;
- if (*ss == '-') { ss++; sgn = -1; }
- if (!*ss) break;
- if (isdigit(*ss))
- t[j].iv[k] = sgn * simple_strtoul(ss,NULL,0);
- k++;
- if ((ss = strchr(ss,',')) != NULL) ss++;
- }
-}
-
-/* end of setup.h */
-
next reply other threads:[~2005-01-29 13:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-29 13:35 Adrian Bunk [this message]
-- strict thread matches above, loose matches on Subject: below --
2004-11-24 23:10 [2.6 patch] drivers/block/: some cleanups Adrian Bunk
2004-11-25 10:12 ` Christoph Hellwig
2004-11-29 12:26 ` [2.6 patch] drivers/block/paride/ cleanups Adrian Bunk
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=20050129133516.GU28047@stusta.de \
--to=bunk@stusta.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parport@lists.infradead.org \
--cc=tim@cyberelk.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.