projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[deliverable/linux.git]
/
drivers
/
char
/
tpm
/
tpm_ibmvtpm.c
diff --git
a/drivers/char/tpm/tpm_ibmvtpm.c
b/drivers/char/tpm/tpm_ibmvtpm.c
index 88a95ea2ba030f80dc38b99c6800c62416b67f83..9978609d93b27ef2bdb92bafb72fdf481f1b089c 100644
(file)
--- a/
drivers/char/tpm/tpm_ibmvtpm.c
+++ b/
drivers/char/tpm/tpm_ibmvtpm.c
@@
-32,7
+32,7
@@
static const char tpm_ibmvtpm_driver_name[] = "tpm_ibmvtpm";
static const char tpm_ibmvtpm_driver_name[] = "tpm_ibmvtpm";
-static struct vio_device_id tpm_ibmvtpm_device_table[]
__devinitdata
= {
+static struct vio_device_id tpm_ibmvtpm_device_table[] = {
{ "IBM,vtpm", "IBM,vtpm"},
{ "", "" }
};
{ "IBM,vtpm", "IBM,vtpm"},
{ "", "" }
};
@@
-267,7
+267,7
@@
static int ibmvtpm_crq_send_init(struct ibmvtpm_dev *ibmvtpm)
* Return value:
* 0
*/
* Return value:
* 0
*/
-static int
__devexit
tpm_ibmvtpm_remove(struct vio_dev *vdev)
+static int tpm_ibmvtpm_remove(struct vio_dev *vdev)
{
struct ibmvtpm_dev *ibmvtpm = ibmvtpm_get_data(&vdev->dev);
int rc = 0;
{
struct ibmvtpm_dev *ibmvtpm = ibmvtpm_get_data(&vdev->dev);
int rc = 0;
@@
-580,7
+580,7
@@
static irqreturn_t ibmvtpm_interrupt(int irq, void *vtpm_instance)
* 0 - Success
* Non-zero - Failure
*/
* 0 - Success
* Non-zero - Failure
*/
-static int
__devinit
tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
+static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
const struct vio_device_id *id)
{
struct ibmvtpm_dev *ibmvtpm;
const struct vio_device_id *id)
{
struct ibmvtpm_dev *ibmvtpm;
This page took
0.024801 seconds
and
5
git commands to generate.