summaryrefslogtreecommitdiffstats
path: root/sys/dev/ata
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2003-03-03 12:15:54 +0000
committerphk <phk@FreeBSD.org>2003-03-03 12:15:54 +0000
commit0ae911eb0e57eebb61c50c02ddf69aa67ed19599 (patch)
tree4e91d5779ffebe1d75e975aa4450f35f965430eb /sys/dev/ata
parente58d97a666e757e8429a219da05f88a51554c32c (diff)
downloadFreeBSD-src-0ae911eb0e57eebb61c50c02ddf69aa67ed19599.zip
FreeBSD-src-0ae911eb0e57eebb61c50c02ddf69aa67ed19599.tar.gz
Gigacommit to improve device-driver source compatibility between
branches: Initialize struct cdevsw using C99 sparse initializtion and remove all initializations to default values. This patch is automatically generated and has been tested by compiling LINT with all the fields in struct cdevsw in reverse order on alpha, sparc64 and i386. Approved by: re(scottl)
Diffstat (limited to 'sys/dev/ata')
-rw-r--r--sys/dev/ata/ata-all.c18
-rw-r--r--sys/dev/ata/atapi-cd.c22
-rw-r--r--sys/dev/ata/atapi-tape.c22
3 files changed, 23 insertions, 39 deletions
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 34cf1df..fae76a5 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -57,19 +57,11 @@
/* device structures */
static d_ioctl_t ataioctl;
static struct cdevsw ata_cdevsw = {
- /* open */ nullopen,
- /* close */ nullclose,
- /* read */ noread,
- /* write */ nowrite,
- /* ioctl */ ataioctl,
- /* poll */ nopoll,
- /* mmap */ nommap,
- /* strategy */ nostrategy,
- /* name */ "ata",
- /* maj */ 159,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ 0,
+ .d_open = nullopen,
+ .d_close = nullclose,
+ .d_ioctl = ataioctl,
+ .d_name = "ata",
+ .d_maj = 159,
};
/* prototypes */
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 60d2302..e7d98d6 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -55,19 +55,15 @@ static d_close_t acdclose;
static d_ioctl_t acdioctl;
static d_strategy_t acdstrategy;
static struct cdevsw acd_cdevsw = {
- /* open */ acdopen,
- /* close */ acdclose,
- /* read */ physread,
- /* write */ physwrite,
- /* ioctl */ acdioctl,
- /* poll */ nopoll,
- /* mmap */ nommap,
- /* strategy */ acdstrategy,
- /* name */ "acd",
- /* maj */ 117,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ D_DISK | D_TRACKCLOSE,
+ .d_open = acdopen,
+ .d_close = acdclose,
+ .d_read = physread,
+ .d_write = physwrite,
+ .d_ioctl = acdioctl,
+ .d_strategy = acdstrategy,
+ .d_name = "acd",
+ .d_maj = 117,
+ .d_flags = D_DISK | D_TRACKCLOSE,
};
/* prototypes */
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index 76a5c46..b81dd94 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -52,19 +52,15 @@ static d_close_t astclose;
static d_ioctl_t astioctl;
static d_strategy_t aststrategy;
static struct cdevsw ast_cdevsw = {
- /* open */ astopen,
- /* close */ astclose,
- /* read */ physread,
- /* write */ physwrite,
- /* ioctl */ astioctl,
- /* poll */ nopoll,
- /* mmap */ nommap,
- /* strategy */ aststrategy,
- /* name */ "ast",
- /* maj */ 119,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ D_TAPE | D_TRACKCLOSE,
+ .d_open = astopen,
+ .d_close = astclose,
+ .d_read = physread,
+ .d_write = physwrite,
+ .d_ioctl = astioctl,
+ .d_strategy = aststrategy,
+ .d_name = "ast",
+ .d_maj = 119,
+ .d_flags = D_TAPE | D_TRACKCLOSE,
};
/* prototypes */
OpenPOWER on IntegriCloud