diff options
| author | phk <phk@FreeBSD.org> | 2003-03-02 14:45:05 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-03-02 14:45:05 +0000 |
| commit | c70a5e180c16f279cc751a83080a819faa98cd7b (patch) | |
| tree | 9fcc12fcf04c24cacadd1957c834d74caad33aee | |
| parent | 6b82a4731ba0b7fc1cb9a24eef3505b2e53fc60f (diff) | |
| download | FreeBSD-src-c70a5e180c16f279cc751a83080a819faa98cd7b.zip FreeBSD-src-c70a5e180c16f279cc751a83080a819faa98cd7b.tar.gz | |
NO_GEOM cleanup:
Remove (actually: Obscurely rename) cdevsw->d_psize() to prevent future use.
| -rw-r--r-- | sys/sys/conf.h | 5 | ||||
| -rw-r--r-- | sys/sys/linedisc.h | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 0e001ce..d0f2229 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -149,7 +149,6 @@ typedef int d_close_t(dev_t dev, int fflag, int devtype, struct thread *td); typedef void d_strategy_t(struct bio *bp); typedef int d_ioctl_t(dev_t dev, u_long cmd, caddr_t data, int fflag, struct thread *td); -typedef int d_psize_t(dev_t dev); typedef int d_read_t(dev_t dev, struct uio *uio, int ioflag); typedef int d_write_t(dev_t dev, struct uio *uio, int ioflag); @@ -232,7 +231,7 @@ struct cdevsw { const char *d_name; /* base device name, e.g. 'vn' */ int d_maj; dumper_t *d_dump; - d_psize_t *d_psize; + void *__d_unused_was_psize; u_int d_flags; /* additions below are not binary compatible with 4.2 and below */ d_kqfilter_t *d_kqfilter; @@ -281,7 +280,7 @@ dumper_t nodump; /* * nopsize is little used, so not worth having dummy functions for. */ -#define nopsize ((d_psize_t *)NULL) +#define nopsize (NULL) d_open_t nullopen; d_close_t nullclose; diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h index 0e001ce..d0f2229 100644 --- a/sys/sys/linedisc.h +++ b/sys/sys/linedisc.h @@ -149,7 +149,6 @@ typedef int d_close_t(dev_t dev, int fflag, int devtype, struct thread *td); typedef void d_strategy_t(struct bio *bp); typedef int d_ioctl_t(dev_t dev, u_long cmd, caddr_t data, int fflag, struct thread *td); -typedef int d_psize_t(dev_t dev); typedef int d_read_t(dev_t dev, struct uio *uio, int ioflag); typedef int d_write_t(dev_t dev, struct uio *uio, int ioflag); @@ -232,7 +231,7 @@ struct cdevsw { const char *d_name; /* base device name, e.g. 'vn' */ int d_maj; dumper_t *d_dump; - d_psize_t *d_psize; + void *__d_unused_was_psize; u_int d_flags; /* additions below are not binary compatible with 4.2 and below */ d_kqfilter_t *d_kqfilter; @@ -281,7 +280,7 @@ dumper_t nodump; /* * nopsize is little used, so not worth having dummy functions for. */ -#define nopsize ((d_psize_t *)NULL) +#define nopsize (NULL) d_open_t nullopen; d_close_t nullclose; |
